This commit is contained in:
2026-05-27 22:56:52 -04:00
parent 446583d705
commit dc2eeb3bf8
2 changed files with 30 additions and 31 deletions
+8 -8
View File
@@ -7,14 +7,14 @@ import (
) )
type User struct { type User struct {
Id uuid.UUID `json:"id"` Id uuid.UUID `json:"id"`
PhoneNumber string `json:"phone_number"` PhoneNumber string `json:"phone_number"`
Username string `json:"username"` Username string `json:"username"`
Password string `json:"password"` Password string `json:"password"`
// Firstname is a pointer // Firstname is a pointer
Firstname *string `json:"first_name,omitempty"` Firstname *string `json:"first_name,omitempty"`
// Lastname is a pointer // Lastname is a pointer
Lastname *string `json:"last_name,omitempty"` Lastname *string `json:"last_name,omitempty"`
Created time.Time `json:"created"` Created time.Time `json:"created"`
LastLogin *time.Time `json:"last_login,omitempty"` LastLogin *time.Time `json:"last_login,omitempty"`
} }
+22 -23
View File
@@ -7,36 +7,35 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
) )
type UserProfile struct { type UserProfile struct {
UserId uuid.UUID `json:"user_id"` UserId uuid.UUID `json:"user_id"`
PhoneNumber string `json:"phone_number"` PhoneNumber string `json:"phone_number"`
Username string `json:"username"` Username string `json:"username"`
Firstname *string `json:"firstname,omitempty"` Firstname *string `json:"firstname,omitempty"`
Lastname *string `json:"lastname,omitempty"` Lastname *string `json:"lastname,omitempty"`
Created time.Time `json:"created"` Created time.Time `json:"created"`
LastLogin *time.Time `json:"last_login,omitempty"` LastLogin *time.Time `json:"last_login,omitempty"`
} }
func InitUserProfile(usr *User) (usrProfile *UserProfile, err error) { func InitUserProfile(usr *User) (usrProfile *UserProfile, err error) {
if usr == nil { if usr == nil {
return nil, fmt.Errorf("User is empty") return nil, fmt.Errorf("User is empty")
} else { } else {
usrProfile = new(UserProfile) usrProfile = new(UserProfile)
usrProfile.UserId = usr.Id usrProfile.UserId = usr.Id
usrProfile.PhoneNumber = usr.PhoneNumber usrProfile.PhoneNumber = usr.PhoneNumber
usrProfile.Username = usr.Username usrProfile.Username = usr.Username
if usr.Firstname != nil { if usr.Firstname != nil {
usrProfile.Firstname = usr.Firstname usrProfile.Firstname = usr.Firstname
} }
if usr.Lastname != nil { if usr.Lastname != nil {
usrProfile.Lastname = usr.Lastname usrProfile.Lastname = usr.Lastname
} }
usrProfile.Created = usr.Created usrProfile.Created = usr.Created
if usr.LastLogin != nil { if usr.LastLogin != nil {
usrProfile.LastLogin = usr.LastLogin usrProfile.LastLogin = usr.LastLogin
} }
return usrProfile, nil return usrProfile, nil
} }
} }