Code refactoring

tx0/user/user_profile.go

@@ -9,10 +9,9 @@ func InitUserProfile(usr *User) (usrProfile *UserProfile, done bool) {
 	if usr == nil {
 		return nil, false
 	} else {
+		usrProfile = new(UserProfile)
 		if len(usr.Password) > 0 {
-			var newUsr User
+			newUsr := User(Id: usr.Id, PhoneNumber: usr.PhoneNumber, Username: usr.Username, Firstname: usr.Firstname, Lastname: usr.Lastname, Created: usr.Created, LastLogin: usr.LastLogin)
-			newUsr = *usr
-			newUsr.Password = ""
 			usrProfile.Usr = &newUsr
 
 			return usrProfile, true

tx0/user/user_profile_test.go

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