Code refactoring

tx0/user/user_profile.go

@@ -1,11 +1,5 @@
 package user
 
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
 
 type UserProfile struct {
 	Usr *User `json:"user"`
@@ -15,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
@@ -29,12 +22,3 @@ func InitUserProfile(usr *User) (usrProfile *UserProfile, done bool) {
 	}
 }
 
-func TestInitUserProfile(t *testing.T) {
-	usr := User{}
-	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")
-}

tx0/user/user_profile_test.go

@@ -0,0 +1,18 @@
+package user
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestInitUserProfile(t *testing.T) {
+	usr := User{Username: "Bob", PhoneNumber: "+12224572351", 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")
+}