tsk-33: Put TwilioConfig in its own package (#36)

Closes #33

Reviewed-on: phoenix/textsender-models#36
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.1.4"
           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/config/twilio_config.go

@@ -1,21 +0,0 @@
-package config
-
-import (
-	"fmt"
-)
-
-type TwiloConfig struct {
-	AccountSID string `json:"auth_sid"`
-	ServiceSID string `json:"service_sid"`
-	URI        string `json:"uri"`
-	AuthToken  string `json:"auth_token"`
-	Number     string `json:"phone_number"`
-}
-
-func (config *TwiloConfig) PrintConfig() {
-	fmt.Printf("Account SID: %s\n", config.AccountSID)
-	fmt.Printf("Service SID: %s\n", config.ServiceSID)
-	fmt.Println("URI:", config.URI)
-	fmt.Printf("Auth Token: %s\n", config.AuthToken)
-	fmt.Printf("Number: %s\n", config.Number)
-}

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"`
-}

pkg/message/message.go

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

pkg/token/token.go

@@ -1,18 +0,0 @@
-package token
-
-import (
-	"github.com/golang-jwt/jwt/v5"
-	"github.com/google/uuid"
-)
-
-type Claims struct {
-	UserId uuid.UUID `json:"user_id"`
-	Role   string    `json:"role"`
-	jwt.RegisteredClaims
-}
-
-type Login struct {
-	AccessToken string `json:"access_token"`
-	TokenType   string `json:"token_type"`
-	ExpiresIn   int64  `json:"expires_in"`
-}

pkg/user/service_user.go

@@ -1,14 +0,0 @@
-package user
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-)
-
-type ServiceUser struct {
-	Id         uuid.UUID  `json:"id"`
-	Username string `json:"username,omitempty"`
-	Passphrase string     `json:"passphrase,omitempty"`
-	Created    *time.Time `json:"date_created,omitempty"`
-}

pkg/user/user.go

@@ -1,12 +0,0 @@
-package user
-
-import (
-	"github.com/google/uuid"
-)
-
-type User struct {
-	Id          uuid.UUID `json:"id"`
-	PhoneNumber string    `json:"phone_number"`
-	Username    string    `json:"username"`
-	Password    string    `json:"password"`
-}

tx0/config/auxiliary/twilio_config.go

@@ -0,0 +1,20 @@
+package auxiliary
+
+import (
+	"fmt"
+)
+
+type TwilioConfig struct {
+	AccountSID string `json:"auth_sid"`
+	ServiceSID string `json:"service_sid"`
+	AuthToken  string `json:"auth_token"`
+	Number     string `json:"phone_number"`
+}
+
+func (config *TwilioConfig) PrintConfig() {
+	fmt.Println("Twilio config")
+	fmt.Println("Account SID:", config.AccountSID)
+	fmt.Println("Service SID:", config.ServiceSID)
+	fmt.Println("Auth Token:", config.AuthToken)
+	fmt.Println("Number:", config.Number)
+}

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/event/response.go

@@ -0,0 +1,18 @@
+package event
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+)
+
+type MessageEventResponse struct {
+	Id                      uuid.UUID      `json:"id,omitempty"`
+	ScheduledMessageEventId uuid.UUID      `json:"scheduled_message_event_id,omitempty"`
+	Response                map[string]any `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"`
+}

tx0/message/event/status.go

@@ -0,0 +1,6 @@
+package event
+
+const (
+	Message_Event_Response_Status_Instant   = "INSTANT"
+	Message_Event_Response_Status_Scheduled = "SCHEDULED"
+)

tx0/message/message.go

@@ -0,0 +1,11 @@
+package message
+
+import (
+	"github.com/google/uuid"
+)
+
+type Message struct {
+	Id      *uuid.UUID `json:"id,omitempty"`
+	Content string     `json:"content"`
+	UserId  *uuid.UUID `json:"user_id,omitempty"`
+}

tx0/token/token.go

@@ -0,0 +1,24 @@
+package token
+
+import (
+	"github.com/golang-jwt/jwt/v5"
+	"github.com/google/uuid"
+)
+
+type Claims struct {
+	UserId uuid.UUID `json:"user_id"`
+	Role   string    `json:"role"`
+	jwt.RegisteredClaims
+}
+
+type LoginResult struct {
+	UserId      uuid.UUID `json:"user_id"`
+	AccessToken string    `json:"access_token"`
+	TokenType   string    `json:"token_type"`
+	ExpiresIn   int64     `json:"expires_in"`
+	IssuedAt    int64     `json:"issued_at"`
+}
+
+// Alias for LoginResult
+// Will be deprecated at some point
+type Login = LoginResult

tx0/types/jsonb.go

@@ -0,0 +1,42 @@
+package types
+
+import (
+	"database/sql/driver"
+	"encoding/json"
+	"fmt"
+)
+
+// NOTE: Might end up removing this
+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
+	}
+}

tx0/user/service_user.go

@@ -0,0 +1,15 @@
+package user
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+)
+
+type ServiceUser struct {
+	Id uuid.UUID `json:"id"`
+	// TODO: Remove the omitempty tags at a later point
+	Username   string    `json:"username,omitempty"`
+	Passphrase string    `json:"passphrase,omitempty"`
+	Created    time.Time `json:"created"`
+}

tx0/user/user.go

@@ -0,0 +1,18 @@
+package user
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+)
+
+type User struct {
+	Id          uuid.UUID  `json:"id"`
+	PhoneNumber string     `json:"phone_number"`
+	Username    string     `json:"username"`
+	Password    string     `json:"password"`
+	Firstname   *string    `json:"first_name,omitempty"`
+	Lastname    *string    `json:"last_name,omitempty"`
+	Created     time.Time  `json:"created"`
+	LastLogin   *time.Time `json:"last_login,omitempty"`
+}