go fmt

tx0/user/user_profile.go

@@ -1,24 +1,27 @@
 package user
 
+import (
+	"fmt"
+)
 
+// TODO: Replace Usr with all the fields from User, except Password and other sensitive fields
 type UserProfile struct {
 	Usr *User `json:"user"`
 }
 
-func InitUserProfile(usr *User) (usrProfile *UserProfile, done bool) {
+func InitUserProfile(usr *User) (usrProfile *UserProfile, err error) {
 	if usr == nil {
-		return nil, false
+		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)
+			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, true
+			return usrProfile, nil
 		} else {
 			usrProfile.Usr = usr
-			return usrProfile, true
+			return usrProfile, nil
 		}
 	}
 }
-

tx0/user/user_profile_test.go

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