Fix

Reviewed-on: phoenix/textsender-models#2

.gitea/workflows/tag_release.yaml

@@ -25,7 +25,7 @@ jobs:
         run: |
           echo "Creating version"
 
-          VERSION="0.2.1"
+          VERSION="0.2.2"
           PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
           BRANCH_REF="${{ gitea.ref }}"
           BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)

go.mod

@@ -5,4 +5,11 @@ go 1.26.2
 require (
 	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/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/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/user.go

@@ -11,7 +11,9 @@ type User struct {
 	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

@@ -1,37 +1,42 @@
 package user
 
 import (
-	"testing"
+	"fmt"
+	"time"
+
+	"github.com/google/uuid"
 )
 
-
+// TODO: Replace Usr with all the fields from User, except Password and other sensitive fields
 type UserProfile struct {
-	Usr *User `json:"user"`
+	UserId uuid.UUID `json:"user_id"`
+	PhoneNumber string `json:"phone_number"`
+	Username string `json:"username"`
+	Firstname string `json:"firstname"`
+	Lastname string `json:"lastname"`
+	Created time.Time `json:"created"`
+	LastLogin *time.Time `json:"last_login,omitempty"`
 }
 
-func InitUserProfile(usr *User) (usrProfile *UserProfile, done bool) {
+func InitUserProfile(usr *User) (usrProfile *UserProfile, err error) {
 	if usr == nil {
-		return nil, false
+		return nil, fmt.Errorf("User is empty")
 	} else {
-		if len(usr.Password) > 0 {
+		 usrProfile = new(UserProfile)
-			var newUsr User
+			usrProfile.UserId = usr.Id
-			newUsr = *usr
+			usrProfile.PhoneNumber = usr.PhoneNumber
-			newUsr.Password = ""
+			usrProfile.Username = usr.Username
-			usrProfile.Usr = &newUsr
+			if usr.Firstname != nil {
-
+				usrProfile.Firstname = *usr.Firstname
-			return usrProfile, true
-		} else {
-			usrProfile.Usr = usr
-			return usrProfile, true
 			}
+			if usr.Lastname != nil {
+				usrProfile.Lastname = *usr.Lastname
 			}
+			usrProfile.Created = usr.Created
+			if usr.LastLogin != nil {
+				usrProfile.LastLogin = usr.LastLogin
 			}
 
-func TestInitUserProfile(t *testing.T) {
+			return usrProfile, nil
-	usr := User{}
+	}
-	usr.username = "Bob"
-	usr.Phone = "+12224572351"
-	usr.Password = "TheNight!"
-	profile, done := InitUserProfile(&usr)
-	t.Assert(done, true, "Error")
 }

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