diff options
author | hmhealey <harrisonmhealey@gmail.com> | 2015-07-13 17:47:57 -0400 |
---|---|---|
committer | hmhealey <harrisonmhealey@gmail.com> | 2015-07-17 15:22:57 -0400 |
commit | 098cbcdc21effeebe7e57fbd912a785e85cbfc5d (patch) | |
tree | fca1c712fe315ed49058de974b21efdaa0dd5b9c /model | |
parent | abcb44089c421872de582584049ca4cc6b268f37 (diff) | |
download | chat-098cbcdc21effeebe7e57fbd912a785e85cbfc5d.tar.gz chat-098cbcdc21effeebe7e57fbd912a785e85cbfc5d.tar.bz2 chat-098cbcdc21effeebe7e57fbd912a785e85cbfc5d.zip |
Unify all locations where we determine a user's display named based off of their nickname/username into a helper function
Diffstat (limited to 'model')
-rw-r--r-- | model/user.go | 8 | ||||
-rw-r--r-- | model/user_test.go | 13 |
2 files changed, 21 insertions, 0 deletions
diff --git a/model/user.go b/model/user.go index 5422f68a5..5b603cd92 100644 --- a/model/user.go +++ b/model/user.go @@ -237,6 +237,14 @@ func (u *User) AddNotifyProp(key string, value string) { u.NotifyProps[key] = value } +func (u *User) GetDisplayName() string { + if u.Nickname != "" { + return u.Nickname + } else { + return u.Username + } +} + // UserFromJson will decode the input and return a User func UserFromJson(data io.Reader) *User { decoder := json.NewDecoder(data) diff --git a/model/user_test.go b/model/user_test.go index 4db099f97..a0c62676a 100644 --- a/model/user_test.go +++ b/model/user_test.go @@ -107,3 +107,16 @@ func TestUserIsValid(t *testing.T) { t.Fatal(err) } } + +func TestUserGetDisplayName(t *testing.T) { + user := User{FirstName: "first", LastName: "last", Username: "user"} + + if displayName := user.GetDisplayName(); displayName != "user" { + t.Fatal("Display name should be username") + } + + user.Nickname = "nickname" + if displayName := user.GetDisplayName(); displayName != "nickname" { + t.Fatal("Display name should be nickname") + } +} |