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)

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,25 +1,42 @@
 package user
 
+import (
+	"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 {
-			var newUsr User
-			newUsr = *usr
-			newUsr.Password = ""
-			usrProfile.Usr = &newUsr
+		 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, true
-		} else {
-			usrProfile.Usr = usr
-			return usrProfile, true
-		}
+			return usrProfile, nil
 	}
 }
-

tx0/user/user_profile_test.go

@@ -9,8 +9,8 @@ import (
 func TestInitUserProfile(t *testing.T) {
 	usr := User{Username: "Bob", PhoneNumber: "+12224572351", Password: "TheNight!"}
 
-	profile, done := InitUserProfile(&usr)
+	profile, err := InitUserProfile(&usr)
 
-	assert.Equal(t, done, true, "Error")
+	assert.NoError(t, err, "Error %v", err)
 	assert.NotEmpty(t, profile, "UserProfile is empty")
 }