Improve FullName helper

essentialkaos · Oct 28, 2024 · 5e38d0f · 5e38d0f
1 parent cbd1be0
commit 5e38d0f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/pachca.go b/pachca.go
@@ -1675,6 +1675,15 @@ func (u *User) FullName() string {
 		return ""
 	}
 
+	switch {
+	case u == nil:
+		return ""
+	case u.FirstName == "" && u.LastName != "":
+		return u.LastName
+	case u.FirstName != "" && u.LastName == "":
+		return u.FirstName
+	}
+
 	return u.FirstName + " " + u.LastName
 }
 

diff --git a/pachca_test.go b/pachca_test.go
@@ -355,6 +355,10 @@ func (s *PachcaSuite) TestUsersHelpers(c *C) {
 	c.Assert(u.FullName(), Equals, "")
 	u = &User{ID: 1234, FirstName: "John", LastName: "Doe", Nickname: "j.doe"}
 	c.Assert(u.FullName(), Equals, "John Doe")
+	u = &User{ID: 1234, LastName: "Doe", Nickname: "j.doe"}
+	c.Assert(u.FullName(), Equals, "Doe")
+	u = &User{ID: 1234, FirstName: "John", Nickname: "j.doe"}
+	c.Assert(u.FullName(), Equals, "John")
 
 	uu := Users{
 		{ID: 1, IsSuspended: true, InviteStatus: INVITE_SENT, IsBot: false, Role: ROLE_USER},