go fmt

Reviewed-on: phoenix/textsender-models#43
Co-authored-by: phoenix <mail@kundeng.us>
Co-committed-by: phoenix <mail@kundeng.us>

.gitea/workflows/tag_release.yaml

@@ -18,14 +18,14 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v6
         with:
-          go-version: '1.25.4'
+          go-version: '1.26.2'
 
       - name: Create version
         id: version
         run: |
           echo "Creating version"
 
-          VERSION="0.0.11"
+          VERSION="0.2.1"
           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

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v6
         with:
-          go-version: '1.25.4'
+          go-version: '1.26.2'
       - name: Configure Git for SSH
         run: |
           git config --global url."git@${{ secrets.GIT_HOST_ROOT }}:".insteadOf "https://${{ secrets.GIT_HOST_ROOT }}/"

go.mod

@@ -1,8 +1,8 @@
 module git.kundeng.us/phoenix/textsender-models
 
-go 1.25.4
+go 1.26.2
 
 require (
-	github.com/golang-jwt/jwt/v5 v5.3.0
+	github.com/golang-jwt/jwt/v5 v5.3.1
 	github.com/google/uuid v1.6.0
 )

go.sum

@@ -1,4 +1,4 @@
-github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
-github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
+github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
+github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

tx0/config/auxiliary/twilio_config.go

@@ -1,4 +1,4 @@
-package config
+package auxiliary
 
 import (
 	"fmt"
@@ -7,7 +7,6 @@ import (
 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"`
 }
@@ -16,7 +15,6 @@ func (config *TwilioConfig) PrintConfig() {
 	fmt.Println("Twilio config")
 	fmt.Println("Account SID:", config.AccountSID)
 	fmt.Println("Service SID:", config.ServiceSID)
-	fmt.Println("URI:", config.URI)
 	fmt.Println("Auth Token:", config.AuthToken)
 	fmt.Println("Number:", config.Number)
 }

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"`
-	Content string    `json:"content,omitempty"`
-	UserId  uuid.UUID `json:"user_id"`
+	Id      *uuid.UUID `json:"id,omitempty"`
+	Content string     `json:"content"`
+	UserId  *uuid.UUID `json:"user_id,omitempty"`
 }

tx0/message/message_event_response.go

@@ -1,25 +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"`
-	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/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 {
-	AccessToken string `json:"access_token"`
-	TokenType   string `json:"token_type"`
-	ExpiresIn   int64  `json:"expires_in"`
+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

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

tx0/user/login_history.go

@@ -0,0 +1,18 @@
+package user
+
+import (
+	"github.com/google/uuid"
+	"time"
+)
+
+type UserLoginHistory struct {
+	Id        uuid.UUID `json:"id"`
+	LoginTime time.Time `json:"login_time"`
+	UserId    uuid.UUID `json:"user_id"`
+}
+
+type ServiceUserLoginHistory struct {
+	Id            uuid.UUID `json:"id"`
+	LoginTime     time.Time `json:"login_time"`
+	ServiceUserId uuid.UUID `json:"service_user_id"`
+}

tx0/user/service_user.go

@@ -7,8 +7,10 @@ import (
 )
 
 type ServiceUser struct {
-	Id         uuid.UUID `json:"id"`
-	Username   string    `json:"username,omitempty"`
-	Passphrase string    `json:"passphrase,omitempty"`
-	Created    time.Time `json:"date_created"`
+	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"`
+	LastLogin  *time.Time `json:"last_login,omitempty"`
 }

tx0/user/user.go

@@ -13,6 +13,6 @@ type User struct {
 	Password    string     `json:"password"`
 	Firstname   *string    `json:"first_name,omitempty"`
 	Lastname    *string    `json:"last_name,omitempty"`
-	Created     time.Time  `json:"date_created"`
+	Created     time.Time  `json:"created"`
 	LastLogin   *time.Time `json:"last_login,omitempty"`
 }