mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
add model.NewX funcs for builtin types (#7692)
* add model.NewX funcs for builtin types * whoops, forgot to add the new file
This commit is contained in:
@@ -307,8 +307,7 @@ func testCreatePostWithOutgoingHook(
|
||||
}
|
||||
|
||||
resp := &model.OutgoingWebhookResponse{}
|
||||
resp.Text = new(string)
|
||||
*resp.Text = "some test text"
|
||||
resp.Text = model.NewString("some test text")
|
||||
resp.Username = "testusername"
|
||||
resp.IconURL = "http://www.mattermost.org/wp-content/uploads/2016/04/icon.png"
|
||||
resp.Props = map[string]interface{}{"someprop": "somevalue"}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
9
model/builtin.go
Normal file
9
model/builtin.go
Normal file
@@ -0,0 +1,9 @@
|
||||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
||||
// See License.txt for license information.
|
||||
|
||||
package model
|
||||
|
||||
func NewBool(b bool) *bool { return &b }
|
||||
func NewInt(n int) *int { return &n }
|
||||
func NewInt64(n int64) *int64 { return &n }
|
||||
func NewString(s string) *string { return &s }
|
||||
591
model/config.go
591
model/config.go
File diff suppressed because it is too large
Load Diff
@@ -82,93 +82,75 @@ func (f *Features) ToMap() map[string]interface{} {
|
||||
|
||||
func (f *Features) SetDefaults() {
|
||||
if f.FutureFeatures == nil {
|
||||
f.FutureFeatures = new(bool)
|
||||
*f.FutureFeatures = true
|
||||
f.FutureFeatures = NewBool(true)
|
||||
}
|
||||
|
||||
if f.Users == nil {
|
||||
f.Users = new(int)
|
||||
*f.Users = 0
|
||||
f.Users = NewInt(0)
|
||||
}
|
||||
|
||||
if f.LDAP == nil {
|
||||
f.LDAP = new(bool)
|
||||
*f.LDAP = *f.FutureFeatures
|
||||
f.LDAP = NewBool(*f.FutureFeatures)
|
||||
}
|
||||
|
||||
if f.MFA == nil {
|
||||
f.MFA = new(bool)
|
||||
*f.MFA = *f.FutureFeatures
|
||||
f.MFA = NewBool(*f.FutureFeatures)
|
||||
}
|
||||
|
||||
if f.GoogleOAuth == nil {
|
||||
f.GoogleOAuth = new(bool)
|
||||
*f.GoogleOAuth = *f.FutureFeatures
|
||||
f.GoogleOAuth = NewBool(*f.FutureFeatures)
|
||||
}
|
||||
|
||||
if f.Office365OAuth == nil {
|
||||
f.Office365OAuth = new(bool)
|
||||
*f.Office365OAuth = *f.FutureFeatures
|
||||
f.Office365OAuth = NewBool(*f.FutureFeatures)
|
||||
}
|
||||
|
||||
if f.Compliance == nil {
|
||||
f.Compliance = new(bool)
|
||||
*f.Compliance = *f.FutureFeatures
|
||||
f.Compliance = NewBool(*f.FutureFeatures)
|
||||
}
|
||||
|
||||
if f.Cluster == nil {
|
||||
f.Cluster = new(bool)
|
||||
*f.Cluster = *f.FutureFeatures
|
||||
f.Cluster = NewBool(*f.FutureFeatures)
|
||||
}
|
||||
|
||||
if f.Metrics == nil {
|
||||
f.Metrics = new(bool)
|
||||
*f.Metrics = *f.FutureFeatures
|
||||
f.Metrics = NewBool(*f.FutureFeatures)
|
||||
}
|
||||
|
||||
if f.CustomBrand == nil {
|
||||
f.CustomBrand = new(bool)
|
||||
*f.CustomBrand = *f.FutureFeatures
|
||||
f.CustomBrand = NewBool(*f.FutureFeatures)
|
||||
}
|
||||
|
||||
if f.MHPNS == nil {
|
||||
f.MHPNS = new(bool)
|
||||
*f.MHPNS = *f.FutureFeatures
|
||||
f.MHPNS = NewBool(*f.FutureFeatures)
|
||||
}
|
||||
|
||||
if f.SAML == nil {
|
||||
f.SAML = new(bool)
|
||||
*f.SAML = *f.FutureFeatures
|
||||
f.SAML = NewBool(*f.FutureFeatures)
|
||||
}
|
||||
|
||||
if f.PasswordRequirements == nil {
|
||||
f.PasswordRequirements = new(bool)
|
||||
*f.PasswordRequirements = *f.FutureFeatures
|
||||
f.PasswordRequirements = NewBool(*f.FutureFeatures)
|
||||
}
|
||||
|
||||
if f.Elasticsearch == nil {
|
||||
f.Elasticsearch = new(bool)
|
||||
*f.Elasticsearch = *f.FutureFeatures
|
||||
f.Elasticsearch = NewBool(*f.FutureFeatures)
|
||||
}
|
||||
|
||||
if f.Announcement == nil {
|
||||
f.Announcement = new(bool)
|
||||
*f.Announcement = true
|
||||
f.Announcement = NewBool(true)
|
||||
}
|
||||
|
||||
if f.ThemeManagement == nil {
|
||||
f.ThemeManagement = new(bool)
|
||||
*f.ThemeManagement = true
|
||||
f.ThemeManagement = NewBool(true)
|
||||
}
|
||||
|
||||
if f.EmailNotificationContents == nil {
|
||||
f.EmailNotificationContents = new(bool)
|
||||
*f.EmailNotificationContents = *f.FutureFeatures
|
||||
f.EmailNotificationContents = NewBool(*f.FutureFeatures)
|
||||
}
|
||||
|
||||
if f.DataRetention == nil {
|
||||
f.DataRetention = new(bool)
|
||||
*f.DataRetention = *f.FutureFeatures
|
||||
f.DataRetention = NewBool(*f.FutureFeatures)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -179,8 +179,7 @@ func TestOutgoingWebhookTriggerWordStartsWith(t *testing.T) {
|
||||
|
||||
func TestOutgoingWebhookResponseJson(t *testing.T) {
|
||||
o := OutgoingWebhookResponse{}
|
||||
o.Text = new(string)
|
||||
*o.Text = "some text"
|
||||
o.Text = NewString("some text")
|
||||
|
||||
json := o.ToJson()
|
||||
ro := OutgoingWebhookResponseFromJson(strings.NewReader(json))
|
||||
|
||||
@@ -320,8 +320,7 @@ func (u *User) Etag(showFullName, showEmail bool) string {
|
||||
// Remove any private data from the user object
|
||||
func (u *User) Sanitize(options map[string]bool) {
|
||||
u.Password = ""
|
||||
u.AuthData = new(string)
|
||||
*u.AuthData = ""
|
||||
u.AuthData = NewString("")
|
||||
u.MfaSecret = ""
|
||||
|
||||
if len(options) != 0 && !options["email"] {
|
||||
@@ -341,8 +340,7 @@ func (u *User) Sanitize(options map[string]bool) {
|
||||
|
||||
func (u *User) ClearNonProfileFields() {
|
||||
u.Password = ""
|
||||
u.AuthData = new(string)
|
||||
*u.AuthData = ""
|
||||
u.AuthData = NewString("")
|
||||
u.MfaSecret = ""
|
||||
u.EmailVerified = false
|
||||
u.AllowMarketing = false
|
||||
|
||||
Reference in New Issue
Block a user