Fixed issue

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

@@ -14,8 +14,8 @@ type UserProfile struct {
 	Username string `json:"username"`
 	Firstname string `json:"firstname"`
 	Lastname string `json:"lastname"`
-	Created time `json:"created"`
+	Created time.Time `json:"created"`
-	LastLogin *time `json:"last_login,omitempty"`
+	LastLogin *time.Time `json:"last_login,omitempty"`
 }
 
 func InitUserProfile(usr *User) (usrProfile *UserProfile, err error) {
@@ -23,9 +23,6 @@ func InitUserProfile(usr *User) (usrProfile *UserProfile, err error) {
 		return nil, fmt.Errorf("User is empty")
 	} else {
 		 usrProfile = new(UserProfile)
-		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
 			usrProfile.UserId = usr.Id
 			usrProfile.PhoneNumber = usr.PhoneNumber
 			usrProfile.Username = usr.Username
@@ -37,9 +34,5 @@ func InitUserProfile(usr *User) (usrProfile *UserProfile, err error) {
 			}
 
 			return usrProfile, nil
-		} else {
-			usrProfile.Usr = usr
-			return usrProfile, nil
-		}
 	}
 }

tx0/user/user_profile_test.go

@@ -13,6 +13,4 @@ func TestInitUserProfile(t *testing.T) {
 
 	assert.NoError(t, err, "Error %v", err)
 	assert.NotEmpty(t, profile, "UserProfile is empty")
-
-	assert.Empty(t, profile.Usr.Password, "Password should be empty")
 }