bump: textsender-models

Reviewed-on: phoenix/textsender-models#2

.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.14"
+          VERSION="0.2.3"
           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,15 @@
 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
+	github.com/stretchr/testify v1.11.1
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,4 +1,14 @@
-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/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+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=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

tx0/config/auxiliary/twilio_config.go

@@ -1,4 +1,4 @@
-package config
+package auxiliary
 
 import (
 	"fmt"

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

@@ -7,12 +7,14 @@ import (
 )
 
 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:"date_created"`
-	LastLogin   *time.Time `json:"last_login,omitempty"`
+	Id          uuid.UUID `json:"id"`
+	PhoneNumber string    `json:"phone_number"`
+	Username    string    `json:"username"`
+	Password    string    `json:"password"`
+	// Firstname is a pointer
+	Firstname *string `json:"first_name,omitempty"`
+	// Lastname is a pointer
+	Lastname  *string    `json:"last_name,omitempty"`
+	Created   time.Time  `json:"created"`
+	LastLogin *time.Time `json:"last_login,omitempty"`
 }

tx0/user/user_profile.go

@@ -0,0 +1,41 @@
+package user
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/google/uuid"
+)
+
+type UserProfile struct {
+	UserId      uuid.UUID  `json:"user_id"`
+	PhoneNumber string     `json:"phone_number"`
+	Username    string     `json:"username"`
+	Firstname   *string    `json:"firstname,omitempty"`
+	Lastname    *string    `json:"lastname,omitempty"`
+	Created     time.Time  `json:"created"`
+	LastLogin   *time.Time `json:"last_login,omitempty"`
+}
+
+func InitUserProfile(usr *User) (usrProfile *UserProfile, err error) {
+	if usr == nil {
+		return nil, fmt.Errorf("User is empty")
+	} else {
+		usrProfile = new(UserProfile)
+		usrProfile.UserId = usr.Id
+		usrProfile.PhoneNumber = usr.PhoneNumber
+		usrProfile.Username = usr.Username
+		if usr.Firstname != nil {
+			usrProfile.Firstname = usr.Firstname
+		}
+		if usr.Lastname != nil {
+			usrProfile.Lastname = usr.Lastname
+		}
+		usrProfile.Created = usr.Created
+		if usr.LastLogin != nil {
+			usrProfile.LastLogin = usr.LastLogin
+		}
+
+		return usrProfile, nil
+	}
+}

tx0/user/user_profile_test.go

@@ -0,0 +1,16 @@
+package user
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestInitUserProfile(t *testing.T) {
+	usr := User{Username: "Bob", PhoneNumber: "+12224572351", Password: "TheNight!"}
+
+	profile, err := InitUserProfile(&usr)
+
+	assert.NoError(t, err, "Error %v", err)
+	assert.NotEmpty(t, profile, "UserProfile is empty")
+}