Whoops

tx0/user/user_profile.go

@@ -7,13 +7,13 @@ import (
 	"github.com/google/uuid"
 )
 
-// TODO: Replace Usr with all the fields from User, except Password and other sensitive fields
+
 type UserProfile struct {
 	UserId uuid.UUID `json:"user_id"`
 	PhoneNumber string `json:"phone_number"`
 	Username string `json:"username"`
-	Firstname string `json:"firstname"`
+	Firstname *string `json:"firstname,omitempty"`
-	Lastname string `json:"lastname"`
+	Lastname *string `json:"lastname,omitempty"`
 	Created time.Time `json:"created"`
 	LastLogin *time.Time `json:"last_login,omitempty"`
 }
@@ -26,8 +26,12 @@ func InitUserProfile(usr *User) (usrProfile *UserProfile, err error) {
 			usrProfile.UserId = usr.Id
 			usrProfile.PhoneNumber = usr.PhoneNumber
 			usrProfile.Username = usr.Username
-			usrProfile.Firstname = *usr.Firstname
+			if usr.Firstname != nil {
-			usrProfile.Lastname = *usr.Lastname
+				usrProfile.Firstname = usr.Firstname
+			}
+			if usr.Lastname != nil {
+				usrProfile.Lastname = usr.Lastname
+			}
 			usrProfile.Created = usr.Created
 			if usr.LastLogin != nil {
 				usrProfile.LastLogin = usr.LastLogin