Breaking changes (#30)

Reviewed-on: phoenix/textsender-models#30

.gitea/workflows/tag_release.yaml

@@ -25,7 +25,7 @@ jobs:
         run: |
           echo "Creating version"
 
-          VERSION="0.0.11"
+          VERSION="0.1.6"
           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/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/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)
-}

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/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

@@ -5,7 +5,7 @@ import (
 )
 
 type Message struct {
-	Id      uuid.UUID `json:"id"`
+	Id      *uuid.UUID `json:"id,omitempty"`
-	Content string    `json:"content,omitempty"`
+	Content string     `json:"content"`
-	UserId  uuid.UUID `json:"user_id"`
+	UserId  *uuid.UUID `json:"user_id,omitempty"`
 }

tx0/message/message_event_response.go

@@ -1,17 +0,0 @@
-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"`
-	Sent                    time.Time   `json:"sent"`
-}

tx0/message/scheduling/event.go

@@ -8,7 +8,7 @@ import (
 
 type ScheduledMessageEvent struct {
 	Id                 uuid.UUID `json:"id"`
-	RecipientId        uuid.UUID `json:"recipient_id"`
+	ContactId          uuid.UUID `json:"contact_id"`
 	MessageId          uuid.UUID `json:"message_id"`
 	ScheduledMessageId uuid.UUID `json:"scheduled_message_id"`
 	Created            time.Time `json:"created"`

tx0/token/token.go

@@ -11,8 +11,14 @@ 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"`
+	IssuedAt    int64     `json:"issued_at"`
 }
+
+// Alias for LoginResult
+// Will be deprecated at some point
+type Login = LoginResult

tx0/types/jsonb.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 )
 
+// NOTE: Might end up removing this
 type JSONB json.RawMessage
 
 // Scan implements sql.Scanner

tx0/user/service_user.go

@@ -7,8 +7,10 @@ import (
 )
 
 type ServiceUser struct {
-	Id         uuid.UUID  `json:"id"`
+	Id uuid.UUID `json:"id"`
-	Username string `json:"username,omitempty"`
+	// TODO: Remove the omitempty tags at a later point
+	Username   string     `json:"username,omitempty"`
 	Passphrase string     `json:"passphrase,omitempty"`
-	Created    *time.Time `json:"date_created,omitempty"`
+	Created    time.Time  `json:"created"`
+	LastLogin  *time.Time `json:"last_login,omitempty"`
 }

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:"created"`
+	LastLogin   *time.Time `json:"last_login,omitempty"`
 }