tsk-22: Remove URI from config.TwilioConfig (#27)

Closes #22

Reviewed-on: phoenix/textsender-models#27
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.10"
+          VERSION="0.0.13"
           PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
           BRANCH_REF="${{ gitea.ref }}"
           BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)

tx0/config/twilio_config.go

@@ -4,18 +4,17 @@ import (
 	"fmt"
 )
 
-type TwiloConfig struct {
+type TwilioConfig 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() {
+func (config *TwilioConfig) PrintConfig() {
-	fmt.Printf("Account SID: %s\n", config.AccountSID)
+	fmt.Println("Twilio config")
-	fmt.Printf("Service SID: %s\n", config.ServiceSID)
+	fmt.Println("Account SID:", config.AccountSID)
-	fmt.Println("URI:", config.URI)
+	fmt.Println("Service SID:", config.ServiceSID)
-	fmt.Printf("Auth Token: %s\n", config.AuthToken)
+	fmt.Println("Auth Token:", config.AuthToken)
-	fmt.Printf("Number: %s\n", config.Number)
+	fmt.Println("Number:", config.Number)
 }

tx0/contact/contact.go

@@ -5,7 +5,10 @@ import (
 )
 
 type Contact struct {
-	Id          uuid.UUID `json:"id,omitempty"`
+	Id          *uuid.UUID `json:"id,omitempty"`
-	PhoneNumber string    `json:"phone_number,omitempty"`
+	Firstname   *string    `json:"first_name,omitempty"`
-	UserId      uuid.UUID `json:"user_id,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/token/token.go

@@ -11,8 +11,13 @@ type Claims struct {
 	jwt.RegisteredClaims
 }
 
-type Login struct {
+type LoginResult struct {
-	AccessToken string `json:"access_token"`
+	UserId      uuid.UUID `json:"user_id"`
-	TokenType   string `json:"token_type"`
+	AccessToken string    `json:"access_token"`
-	ExpiresIn   int64  `json:"expires_in"`
+	TokenType   string    `json:"token_type"`
+	ExpiresIn   int64     `json:"expires_in"`
 }
+
+// Alias for LoginResult
+// Will be deprecated at some point
+type Login = LoginResult

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
+	}
+}

tx0/user/service_user.go

@@ -7,8 +7,8 @@ import (
 )
 
 type ServiceUser struct {
-	Id         uuid.UUID  `json:"id"`
+	Id         uuid.UUID `json:"id"`
-	Username string `json:"username,omitempty"`
+	Username   string    `json:"username,omitempty"`
-	Passphrase string     `json:"passphrase,omitempty"`
+	Passphrase string    `json:"passphrase,omitempty"`
-	Created    *time.Time `json:"date_created,omitempty"`
+	Created    time.Time `json:"date_created"`
 }

tx0/user/user.go

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