Code refactoring

.gitea/workflows/tag_release.yaml

@@ -25,7 +25,7 @@ jobs:
         run: |
           echo "Creating version"
 
-          VERSION="0.2.3"
+          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)

tx0/user/login_history.go

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

@@ -1,13 +0,0 @@
-package user
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-)
-
-type Organization struct {
-	Id      uuid.UUID  `json:"id"`
-	Name    string     `json:"name"`
-	Created *time.Time `json:"created,omitempty"`
-}

tx0/user/user.go

@@ -7,14 +7,12 @@ import (
 )
 
 type User struct {
-	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"`
+	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,41 +1,24 @@
 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"`
+	Usr *User `json:"user"`
 }
 
-func InitUserProfile(usr *User) (usrProfile *UserProfile, err error) {
+func InitUserProfile(usr *User) (usrProfile *UserProfile, done bool) {
 	if usr == nil {
-		return nil, fmt.Errorf("User is empty")
+		return nil, false
 	} 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
-		}
+		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
+			return usrProfile, true
+		} else {
+			usrProfile.Usr = usr
+			return usrProfile, true
+		}
 	}
 }
+

tx0/user/user_profile_test.go

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