summaryrefslogtreecommitdiffstats
path: root/api4
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2017-10-23 09:40:35 -0700
committerGitHub <noreply@github.com>2017-10-23 09:40:35 -0700
commit78a9774147c91407be3fb925b52336174854e632 (patch)
tree13ed08851c2bb6510310878e18384ea1dd85a2f0 /api4
parent08b7b1c4144f18a9dbf52bfe0eb9182f2b4eba4a (diff)
downloadchat-78a9774147c91407be3fb925b52336174854e632.tar.gz
chat-78a9774147c91407be3fb925b52336174854e632.tar.bz2
chat-78a9774147c91407be3fb925b52336174854e632.zip
add model.NewX funcs for builtin types (#7692)
* add model.NewX funcs for builtin types * whoops, forgot to add the new file
Diffstat (limited to 'api4')
-rw-r--r--api4/post.go3
-rw-r--r--api4/post_test.go9
-rw-r--r--api4/team_test.go15
-rw-r--r--api4/user_test.go15
4 files changed, 14 insertions, 28 deletions
diff --git a/api4/post.go b/api4/post.go
index 3a957a26f..feb6de8f9 100644
--- a/api4/post.go
+++ b/api4/post.go
@@ -400,8 +400,7 @@ func saveIsPinnedPost(c *Context, w http.ResponseWriter, r *http.Request, isPinn
}
patch := &model.PostPatch{}
- patch.IsPinned = new(bool)
- *patch.IsPinned = isPinned
+ patch.IsPinned = model.NewBool(isPinned)
_, err := c.App.PatchPost(c.Params.PostId, patch)
if err != nil {
diff --git a/api4/post_test.go b/api4/post_test.go
index 05c5c3d97..054c9fc06 100644
--- a/api4/post_test.go
+++ b/api4/post_test.go
@@ -561,16 +561,13 @@ func TestPatchPost(t *testing.T) {
patch := &model.PostPatch{}
- patch.IsPinned = new(bool)
- *patch.IsPinned = false
- patch.Message = new(string)
- *patch.Message = "#otherhashtag other message"
+ patch.IsPinned = model.NewBool(false)
+ patch.Message = model.NewString("#otherhashtag other message")
patch.Props = new(model.StringInterface)
*patch.Props = model.StringInterface{"channel_header": "new_header"}
patch.FileIds = new(model.StringArray)
*patch.FileIds = model.StringArray{"file1", "otherfile2", "otherfile3"}
- patch.HasReactions = new(bool)
- *patch.HasReactions = false
+ patch.HasReactions = model.NewBool(false)
rpost, resp := Client.PatchPost(post.Id, patch)
CheckNoError(t, resp)
diff --git a/api4/team_test.go b/api4/team_test.go
index f0668d9ac..544fa6157 100644
--- a/api4/team_test.go
+++ b/api4/team_test.go
@@ -398,16 +398,11 @@ func TestPatchTeam(t *testing.T) {
patch := &model.TeamPatch{}
- patch.DisplayName = new(string)
- *patch.DisplayName = "Other name"
- patch.Description = new(string)
- *patch.Description = "Other description"
- patch.CompanyName = new(string)
- *patch.CompanyName = "Other company name"
- patch.InviteId = new(string)
- *patch.InviteId = "inviteid1"
- patch.AllowOpenInvite = new(bool)
- *patch.AllowOpenInvite = true
+ patch.DisplayName = model.NewString("Other name")
+ patch.Description = model.NewString("Other description")
+ patch.CompanyName = model.NewString("Other company name")
+ patch.InviteId = model.NewString("inviteid1")
+ patch.AllowOpenInvite = model.NewBool(true)
rteam, resp := Client.PatchTeam(team.Id, patch)
CheckNoError(t, resp)
diff --git a/api4/user_test.go b/api4/user_test.go
index 664b7375a..974156ae5 100644
--- a/api4/user_test.go
+++ b/api4/user_test.go
@@ -990,12 +990,9 @@ func TestPatchUser(t *testing.T) {
patch := &model.UserPatch{}
- patch.Nickname = new(string)
- *patch.Nickname = "Joram Wilander"
- patch.FirstName = new(string)
- *patch.FirstName = "Joram"
- patch.LastName = new(string)
- *patch.LastName = "Wilander"
+ patch.Nickname = model.NewString("Joram Wilander")
+ patch.FirstName = model.NewString("Joram")
+ patch.LastName = model.NewString("Wilander")
patch.Position = new(string)
patch.NotifyProps = model.StringMap{}
patch.NotifyProps["comment"] = "somethingrandom"
@@ -1023,8 +1020,7 @@ func TestPatchUser(t *testing.T) {
t.Fatal("NotifyProps did not update properly")
}
- patch.Username = new(string)
- *patch.Username = th.BasicUser2.Username
+ patch.Username = model.NewString(th.BasicUser2.Username)
_, resp = Client.PatchUser(user.Id, patch)
CheckBadRequestStatus(t, resp)
@@ -1051,8 +1047,7 @@ func TestPatchUser(t *testing.T) {
session.IsOAuth = true
app.AddSessionToCache(session)
- patch.Email = new(string)
- *patch.Email = GenerateTestEmail()
+ patch.Email = model.NewString(GenerateTestEmail())
_, resp = Client.PatchUser(user.Id, patch)
CheckForbiddenStatus(t, resp)