Changed name of struct

.gitea/workflows/tag_release.yaml

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

.gitea/workflows/workflow.yaml

@@ -11,13 +11,13 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v4
         with:
-          go-version: '1.26.2'
+          go-version: '1.25.3'
       - name: Configure Git for SSH
         run: |
-          git config --global url."git@${{ secrets.GIT_HOST_ROOT }}:".insteadOf "https://${{ secrets.GIT_HOST_ROOT }}/"
+          git config --global url."git@git.kundeng.us:".insteadOf "https://git.kundeng.us/"
-          go env -w GOPRIVATE=${{ secrets.GIT_HOST_ROOT }}/phoenix/*
+          go env -w GOPRIVATE=git.kundeng.us/phoenix/*
 
       - name: Download dependencies
         run: |
@@ -25,3 +25,9 @@ jobs:
 
       - name: Run tests
         run: go test -v ./... # Runs all tests in the project
+
+      - name: Run linter
+        uses: https://github.com/golangci/golangci-lint-action@v8
+        with:
+          go-version: '1.25.3'
+          version: latest

go.mod

@@ -1,15 +1,8 @@
 module git.kundeng.us/phoenix/textsender-models
 
-go 1.26.2
+go 1.25.3
 
 require (
-	github.com/golang-jwt/jwt/v5 v5.3.1
+	github.com/golang-jwt/jwt/v5 v5.3.0
 	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,14 +1,4 @@
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+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=
-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=

pkg/contact/contact.go

@@ -0,0 +1,11 @@
+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

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

pkg/message/scheduling/event.go

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

pkg/token/token.go

@@ -0,0 +1,18 @@
+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/user.go

@@ -0,0 +1,12 @@
+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

@@ -1,20 +0,0 @@
-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

@@ -1,14 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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

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

tx0/message/message.go

@@ -1,11 +0,0 @@
-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

@@ -1,24 +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 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

@@ -1,42 +0,0 @@
-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

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

tx0/user/user.go

@@ -1,18 +0,0 @@
-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"`
-}

tx0/user/user_profile.go

@@ -1,27 +0,0 @@
-package user
-
-import (
-	"fmt"
-)
-
-type UserProfile struct {
-	Usr *User `json:"user"`
-}
-
-func InitUserProfile(usr *User) (usrProfile *UserProfile, err error) {
-	if usr == nil {
-		return nil, fmt.Errof("User is empty")
-	} else {
-		usrProfile = new(UserProfile)
-		if len(usr.Password) > 0 {
-			newUsr := User{Id: usr.Id, PhoneNumber: usr.PhoneNumber, Username: usr.Username, Firstname: usr.Firstname, Lastname: usr.Lastname, Created: usr.Created, LastLogin: usr.LastLogin,}
-			usrProfile.Usr = &newUsr
-
-			return usrProfile, nil
-		} else {
-			usrProfile.Usr = usr
-			return usrProfile, nil
-		}
-	}
-}
-

tx0/user/user_profile_test.go

@@ -1,18 +0,0 @@
-package user
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestInitUserProfile(t *testing.T) {
-	usr := User{Username: "Bob", PhoneNumber: "+12224572351", Password: "TheNight!"}
-
-	profile, done := InitUserProfile(&usr)
-
-	assert.Equal(t, done, true, "Error")
-	assert.NotEmpty(t, profile, "UserProfile is empty")
-
-	assert.Empty(t, profile.Usr.Password, "Password should be empty")
-}