IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

MM-14768: Switches field type from sql.NullBool to a bool pointer. (#10526)

Browse Source
This commit is contained in:
Martin Kraft
2019-03-29 09:42:25 -04:00
committed by GitHub
parent a186592257
commit 020ba82cdb
4 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
model/channel.go
View File

@@ -5,7 +5,6 @@ package model
import (
"crypto/sha1"
"database/sql"
"encoding/hex"
"encoding/json"
"io"
@@ -52,7 +51,7 @@ type Channel struct {
CreatorId string `json:"creator_id"`
SchemeId *string `json:"scheme_id"`
Props map[string]interface{} `json:"props" db:"-"`
GroupConstrained sql.NullBool `json:"group_constrained"`
GroupConstrained *bool `json:"group_constrained"`
}
type ChannelWithTeamData struct {
@@ -191,7 +190,7 @@ func (o *Channel) Patch(patch *ChannelPatch) {
}
if patch.GroupConstrained != nil {
o.GroupConstrained.Bool = *patch.GroupConstrained
o.GroupConstrained = patch.GroupConstrained
}
}

4
model/channel_test.go
View File

@@ -59,8 +59,8 @@ func TestChannelPatch(t *testing.T) {
if *p.Purpose != o.Purpose {
t.Fatal("do not match")
}
if *p.GroupConstrained != o.GroupConstrained.Bool {
t.Fatalf("expected %v got %v", *p.GroupConstrained, o.GroupConstrained.Bool)
if *p.GroupConstrained != *o.GroupConstrained {
t.Fatalf("expected %v got %v", *p.GroupConstrained, *o.GroupConstrained)
}
}

35
model/team.go
View File

@@ -4,7 +4,6 @@
package model
import (
"database/sql"
"encoding/json"
"fmt"
"io"
@@ -27,22 +26,22 @@ const (
)
type Team struct {
Id string `json:"id"`
CreateAt int64 `json:"create_at"`
UpdateAt int64 `json:"update_at"`
DeleteAt int64 `json:"delete_at"`
DisplayName string `json:"display_name"`
Name string `json:"name"`
Description string `json:"description"`
Email string `json:"email"`
Type string `json:"type"`
CompanyName string `json:"company_name"`
AllowedDomains string `json:"allowed_domains"`
InviteId string `json:"invite_id"`
AllowOpenInvite bool `json:"allow_open_invite"`
LastTeamIconUpdate int64 `json:"last_team_icon_update,omitempty"`
SchemeId *string `json:"scheme_id"`
GroupConstrained sql.NullBool `json:"group_constrained"`
Id string `json:"id"`
CreateAt int64 `json:"create_at"`
UpdateAt int64 `json:"update_at"`
DeleteAt int64 `json:"delete_at"`
DisplayName string `json:"display_name"`
Name string `json:"name"`
Description string `json:"description"`
Email string `json:"email"`
Type string `json:"type"`
CompanyName string `json:"company_name"`
AllowedDomains string `json:"allowed_domains"`
InviteId string `json:"invite_id"`
AllowOpenInvite bool `json:"allow_open_invite"`
LastTeamIconUpdate int64 `json:"last_team_icon_update,omitempty"`
SchemeId *string `json:"scheme_id"`
GroupConstrained *bool `json:"group_constrained"`
}
type TeamPatch struct {
@@ -278,7 +277,7 @@ func (t *Team) Patch(patch *TeamPatch) {
}
if patch.GroupConstrained != nil {
t.GroupConstrained.Bool = *patch.GroupConstrained
t.GroupConstrained = patch.GroupConstrained
}
}

4
model/team_test.go
View File

@@ -171,7 +171,7 @@ func TestTeamPatch(t *testing.T) {
if *p.AllowOpenInvite != o.AllowOpenInvite {
t.Fatal("AllowOpenInvite did not update")
}
if *p.GroupConstrained != o.GroupConstrained.Bool {
t.Fatalf("expected %v got %v", *p.GroupConstrained, o.GroupConstrained.Bool)
if *p.GroupConstrained != *o.GroupConstrained {
t.Fatalf("expected %v got %v", *p.GroupConstrained, *o.GroupConstrained)
}
}