tsk-12: Contact improvements (#18)

Closes #12

Reviewed-on: phoenix/textsender-models#18
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>

.gitea/workflows/tag_release.yaml

@@ -25,7 +25,7 @@ jobs:
         run: |
           echo "Creating version"
 
-          VERSION="0.0.9"
+          VERSION="0.0.11"
           PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
           BRANCH_REF="${{ gitea.ref }}"
           BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)

.gitea/workflows/workflow.yaml

@@ -11,13 +11,13 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v6
         with:
           go-version: '1.25.4'
       - name: Configure Git for SSH
         run: |
-          git config --global url."git@git.kundeng.us:".insteadOf "https://git.kundeng.us/"
-          go env -w GOPRIVATE=git.kundeng.us/phoenix/*
+          git config --global url."git@${{ secrets.GIT_HOST_ROOT }}:".insteadOf "https://${{ secrets.GIT_HOST_ROOT }}/"
+          go env -w GOPRIVATE=${{ secrets.GIT_HOST_ROOT }}/phoenix/*
 
       - name: Download dependencies
         run: |

pkg/contact/contact.go

@@ -1,11 +0,0 @@
-package contact
-
-import (
-	"github.com/google/uuid"
-)
-
-type Contact struct {
-	Id          uuid.UUID `json:"id,omitempty"`
-	PhoneNumber string    `json:"phone_number,omitempty"`
-	UserId      uuid.UUID `json:"user_id,omitempty"`
-}

tx0/contact/contact.go

@@ -0,0 +1,14 @@
+package contact
+
+import (
+	"github.com/google/uuid"
+)
+
+type Contact struct {
+	Id          *uuid.UUID `json:"id,omitempty"`
+	Firstname   *string    `json:"first_name,omitempty"`
+	Lastname    *string    `json:"last_name,omitempty"`
+	Nickname    *string    `json:"nickname,omitempty"`
+	PhoneNumber string     `json:"phone_number"`
+	UserId      *uuid.UUID `json:"user_id,omitempty"`
+}

tx0/message/message_event_response.go

@@ -0,0 +1,25 @@
+package message
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+
+	"git.kundeng.us/phoenix/textsender-models/tx0/types"
+)
+
+type MessageEventResponse struct {
+	Id                      uuid.UUID   `json:"id,omitempty"`
+	ScheduledMessageEventId uuid.UUID   `json:"scheduled_message_event_id,omitempty"`
+	Response                types.JSONB `json:"response"`
+	UserId                  uuid.UUID   `json:"user_id,omitempty"`
+	ContactId               *uuid.UUID  `json:"contact_id,omitempty"`
+	MessageId               *uuid.UUID  `json:"message_id,omitempty"`
+	Status                  *string     `json:"status"`
+	Sent                    time.Time   `json:"sent"`
+}
+
+const (
+	Message_Event_Response_Status_Instant   = "Instant"
+	Message_Event_Response_Status_Scheduled = "Scheduled"
+)

tx0/types/jsonb.go

@@ -0,0 +1,41 @@
+package types
+
+import (
+	"database/sql/driver"
+	"encoding/json"
+	"fmt"
+)
+
+type JSONB json.RawMessage
+
+// Scan implements sql.Scanner
+func (j *JSONB) Scan(value interface{}) error {
+	if value == nil {
+		*j = nil
+		return nil
+	}
+
+	var data []byte
+	switch v := value.(type) {
+	case []byte:
+		// pgx may pass data as []byte in binary format
+		data = v
+	case string:
+		// pgx may pass data as string in text format
+		data = []byte(v)
+	default:
+		return fmt.Errorf("unsupported type: %T", v)
+	}
+
+	*j = JSONB(data)
+	return nil
+}
+
+// Value implements driver.Valuer
+func (j JSONB) Value() (driver.Value, error) {
+	if j == nil {
+		return nil, nil
+	} else {
+		return []byte(j), nil
+	}
+}