diff options
author | =Corey Hulen <corey@hulen.com> | 2016-01-20 08:33:26 -0600 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-01-20 08:33:26 -0600 |
commit | 5b2ec623473abeb44577fbfc9122b792a94a5184 (patch) | |
tree | e79a434a7fe9e91f2f7b6a3a0fc4d90cf470c306 /store | |
parent | ca33812cb5b83dba0babc244fdf101c78abc046a (diff) | |
download | chat-5b2ec623473abeb44577fbfc9122b792a94a5184.tar.gz chat-5b2ec623473abeb44577fbfc9122b792a94a5184.tar.bz2 chat-5b2ec623473abeb44577fbfc9122b792a94a5184.zip |
PLT-7 adding loc db calls for team table
Diffstat (limited to 'store')
-rw-r--r-- | store/sql_post_store_test.go | 4 | ||||
-rw-r--r-- | store/sql_team_store.go | 21 | ||||
-rw-r--r-- | store/sql_team_store_test.go | 63 | ||||
-rw-r--r-- | store/store.go | 20 |
4 files changed, 55 insertions, 53 deletions
diff --git a/store/sql_post_store_test.go b/store/sql_post_store_test.go index a3e3e10dd..07f152dc4 100644 --- a/store/sql_post_store_test.go +++ b/store/sql_post_store_test.go @@ -765,7 +765,7 @@ func TestUserCountsWithPostsByDay(t *testing.T) { t1.Name = "a" + model.NewId() + "b" t1.Email = model.NewId() + "@nowhere.com" t1.Type = model.TEAM_OPEN - t1 = Must(store.Team().Save(t1)).(*model.Team) + t1 = Must(store.Team().Save(utils.T, t1)).(*model.Team) c1 := &model.Channel{} c1.TeamId = t1.Id @@ -825,7 +825,7 @@ func TestPostCountsByDay(t *testing.T) { t1.Name = "a" + model.NewId() + "b" t1.Email = model.NewId() + "@nowhere.com" t1.Type = model.TEAM_OPEN - t1 = Must(store.Team().Save(t1)).(*model.Team) + t1 = Must(store.Team().Save(utils.T, t1)).(*model.Team) c1 := &model.Channel{} c1.TeamId = t1.Id diff --git a/store/sql_team_store.go b/store/sql_team_store.go index 9578549ca..6c2eb6a21 100644 --- a/store/sql_team_store.go +++ b/store/sql_team_store.go @@ -6,6 +6,7 @@ package store import ( "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" + goi18n "github.com/nicksnyder/go-i18n/i18n" ) type SqlTeamStore struct { @@ -37,7 +38,7 @@ func (s SqlTeamStore) CreateIndexesIfNotExists() { s.CreateIndexIfNotExists("idx_teams_invite_id", "Teams", "InviteId") } -func (s SqlTeamStore) Save(team *model.Team) StoreChannel { +func (s SqlTeamStore) Save(T goi18n.TranslateFunc, team *model.Team) StoreChannel { storeChannel := make(StoreChannel) go func() { @@ -76,7 +77,7 @@ func (s SqlTeamStore) Save(team *model.Team) StoreChannel { return storeChannel } -func (s SqlTeamStore) Update(team *model.Team) StoreChannel { +func (s SqlTeamStore) Update(T goi18n.TranslateFunc, team *model.Team) StoreChannel { storeChannel := make(StoreChannel) @@ -117,7 +118,7 @@ func (s SqlTeamStore) Update(team *model.Team) StoreChannel { return storeChannel } -func (s SqlTeamStore) UpdateDisplayName(name string, teamId string) StoreChannel { +func (s SqlTeamStore) UpdateDisplayName(T goi18n.TranslateFunc, name string, teamId string) StoreChannel { storeChannel := make(StoreChannel) @@ -137,7 +138,7 @@ func (s SqlTeamStore) UpdateDisplayName(name string, teamId string) StoreChannel return storeChannel } -func (s SqlTeamStore) Get(id string) StoreChannel { +func (s SqlTeamStore) Get(T goi18n.TranslateFunc, id string) StoreChannel { storeChannel := make(StoreChannel) go func() { @@ -163,7 +164,7 @@ func (s SqlTeamStore) Get(id string) StoreChannel { return storeChannel } -func (s SqlTeamStore) GetByInviteId(inviteId string) StoreChannel { +func (s SqlTeamStore) GetByInviteId(T goi18n.TranslateFunc, inviteId string) StoreChannel { storeChannel := make(StoreChannel) go func() { @@ -192,7 +193,7 @@ func (s SqlTeamStore) GetByInviteId(inviteId string) StoreChannel { return storeChannel } -func (s SqlTeamStore) GetByName(name string) StoreChannel { +func (s SqlTeamStore) GetByName(T goi18n.TranslateFunc, name string) StoreChannel { storeChannel := make(StoreChannel) go func() { @@ -217,7 +218,7 @@ func (s SqlTeamStore) GetByName(name string) StoreChannel { return storeChannel } -func (s SqlTeamStore) GetTeamsForEmail(email string) StoreChannel { +func (s SqlTeamStore) GetTeamsForEmail(T goi18n.TranslateFunc, email string) StoreChannel { storeChannel := make(StoreChannel) go func() { @@ -243,7 +244,7 @@ func (s SqlTeamStore) GetTeamsForEmail(email string) StoreChannel { return storeChannel } -func (s SqlTeamStore) GetAll() StoreChannel { +func (s SqlTeamStore) GetAll(T goi18n.TranslateFunc) StoreChannel { storeChannel := make(StoreChannel) go func() { @@ -269,7 +270,7 @@ func (s SqlTeamStore) GetAll() StoreChannel { return storeChannel } -func (s SqlTeamStore) GetAllTeamListing() StoreChannel { +func (s SqlTeamStore) GetAllTeamListing(T goi18n.TranslateFunc) StoreChannel { storeChannel := make(StoreChannel) go func() { @@ -301,7 +302,7 @@ func (s SqlTeamStore) GetAllTeamListing() StoreChannel { return storeChannel } -func (s SqlTeamStore) PermanentDelete(teamId string) StoreChannel { +func (s SqlTeamStore) PermanentDelete(T goi18n.TranslateFunc, teamId string) StoreChannel { storeChannel := make(StoreChannel) go func() { diff --git a/store/sql_team_store_test.go b/store/sql_team_store_test.go index 7dc31cbe2..47708777c 100644 --- a/store/sql_team_store_test.go +++ b/store/sql_team_store_test.go @@ -5,6 +5,7 @@ package store import ( "github.com/mattermost/platform/model" + "github.com/mattermost/platform/utils" "testing" "time" ) @@ -18,16 +19,16 @@ func TestTeamStoreSave(t *testing.T) { o1.Email = model.NewId() + "@nowhere.com" o1.Type = model.TEAM_OPEN - if err := (<-store.Team().Save(&o1)).Err; err != nil { + if err := (<-store.Team().Save(utils.T, &o1)).Err; err != nil { t.Fatal("couldn't save item", err) } - if err := (<-store.Team().Save(&o1)).Err; err == nil { + if err := (<-store.Team().Save(utils.T, &o1)).Err; err == nil { t.Fatal("shouldn't be able to update from save") } o1.Id = "" - if err := (<-store.Team().Save(&o1)).Err; err == nil { + if err := (<-store.Team().Save(utils.T, &o1)).Err; err == nil { t.Fatal("should be unique domain") } } @@ -40,23 +41,23 @@ func TestTeamStoreUpdate(t *testing.T) { o1.Name = "a" + model.NewId() + "b" o1.Email = model.NewId() + "@nowhere.com" o1.Type = model.TEAM_OPEN - if err := (<-store.Team().Save(&o1)).Err; err != nil { + if err := (<-store.Team().Save(utils.T, &o1)).Err; err != nil { t.Fatal(err) } time.Sleep(100 * time.Millisecond) - if err := (<-store.Team().Update(&o1)).Err; err != nil { + if err := (<-store.Team().Update(utils.T, &o1)).Err; err != nil { t.Fatal(err) } o1.Id = "missing" - if err := (<-store.Team().Update(&o1)).Err; err == nil { + if err := (<-store.Team().Update(utils.T, &o1)).Err; err == nil { t.Fatal("Update should have failed because of missing key") } o1.Id = model.NewId() - if err := (<-store.Team().Update(&o1)).Err; err == nil { + if err := (<-store.Team().Update(utils.T, &o1)).Err; err == nil { t.Fatal("Update should have faile because id change") } } @@ -69,15 +70,15 @@ func TestTeamStoreUpdateDisplayName(t *testing.T) { o1.Name = "a" + model.NewId() + "b" o1.Email = model.NewId() + "@nowhere.com" o1.Type = model.TEAM_OPEN - o1 = (<-store.Team().Save(o1)).Data.(*model.Team) + o1 = (<-store.Team().Save(utils.T, o1)).Data.(*model.Team) newDisplayName := "NewDisplayName" - if err := (<-store.Team().UpdateDisplayName(newDisplayName, o1.Id)).Err; err != nil { + if err := (<-store.Team().UpdateDisplayName(utils.T, newDisplayName, o1.Id)).Err; err != nil { t.Fatal(err) } - ro1 := (<-store.Team().Get(o1.Id)).Data.(*model.Team) + ro1 := (<-store.Team().Get(utils.T, o1.Id)).Data.(*model.Team) if ro1.DisplayName != newDisplayName { t.Fatal("DisplayName not updated") } @@ -91,9 +92,9 @@ func TestTeamStoreGet(t *testing.T) { o1.Name = "a" + model.NewId() + "b" o1.Email = model.NewId() + "@nowhere.com" o1.Type = model.TEAM_OPEN - Must(store.Team().Save(&o1)) + Must(store.Team().Save(utils.T, &o1)) - if r1 := <-store.Team().Get(o1.Id); r1.Err != nil { + if r1 := <-store.Team().Get(utils.T, o1.Id); r1.Err != nil { t.Fatal(r1.Err) } else { if r1.Data.(*model.Team).ToJson() != o1.ToJson() { @@ -101,7 +102,7 @@ func TestTeamStoreGet(t *testing.T) { } } - if err := (<-store.Team().Get("")).Err; err == nil { + if err := (<-store.Team().Get(utils.T, "")).Err; err == nil { t.Fatal("Missing id should have failed") } } @@ -115,11 +116,11 @@ func TestTeamStoreGetByName(t *testing.T) { o1.Email = model.NewId() + "@nowhere.com" o1.Type = model.TEAM_OPEN - if err := (<-store.Team().Save(&o1)).Err; err != nil { + if err := (<-store.Team().Save(utils.T, &o1)).Err; err != nil { t.Fatal(err) } - if r1 := <-store.Team().GetByName(o1.Name); r1.Err != nil { + if r1 := <-store.Team().GetByName(utils.T, o1.Name); r1.Err != nil { t.Fatal(r1.Err) } else { if r1.Data.(*model.Team).ToJson() != o1.ToJson() { @@ -127,7 +128,7 @@ func TestTeamStoreGetByName(t *testing.T) { } } - if err := (<-store.Team().GetByName("")).Err; err == nil { + if err := (<-store.Team().GetByName(utils.T, "")).Err; err == nil { t.Fatal("Missing id should have failed") } } @@ -142,7 +143,7 @@ func TestTeamStoreGetByIniviteId(t *testing.T) { o1.Type = model.TEAM_OPEN o1.InviteId = model.NewId() - if err := (<-store.Team().Save(&o1)).Err; err != nil { + if err := (<-store.Team().Save(utils.T, &o1)).Err; err != nil { t.Fatal(err) } @@ -152,11 +153,11 @@ func TestTeamStoreGetByIniviteId(t *testing.T) { o2.Email = model.NewId() + "@nowhere.com" o2.Type = model.TEAM_OPEN - if err := (<-store.Team().Save(&o2)).Err; err != nil { + if err := (<-store.Team().Save(utils.T, &o2)).Err; err != nil { t.Fatal(err) } - if r1 := <-store.Team().GetByInviteId(o1.InviteId); r1.Err != nil { + if r1 := <-store.Team().GetByInviteId(utils.T, o1.InviteId); r1.Err != nil { t.Fatal(r1.Err) } else { if r1.Data.(*model.Team).ToJson() != o1.ToJson() { @@ -165,9 +166,9 @@ func TestTeamStoreGetByIniviteId(t *testing.T) { } o2.InviteId = "" - <-store.Team().Update(&o2) + <-store.Team().Update(utils.T, &o2) - if r1 := <-store.Team().GetByInviteId(o2.Id); r1.Err != nil { + if r1 := <-store.Team().GetByInviteId(utils.T, o2.Id); r1.Err != nil { t.Fatal(r1.Err) } else { if r1.Data.(*model.Team).Id != o2.Id { @@ -175,7 +176,7 @@ func TestTeamStoreGetByIniviteId(t *testing.T) { } } - if err := (<-store.Team().GetByInviteId("")).Err; err == nil { + if err := (<-store.Team().GetByInviteId(utils.T, "")).Err; err == nil { t.Fatal("Missing id should have failed") } } @@ -188,14 +189,14 @@ func TestTeamStoreGetForEmail(t *testing.T) { o1.Name = "a" + model.NewId() + "b" o1.Email = model.NewId() + "@nowhere.com" o1.Type = model.TEAM_OPEN - Must(store.Team().Save(&o1)) + Must(store.Team().Save(utils.T, &o1)) u1 := model.User{} u1.TeamId = o1.Id u1.Email = model.NewId() Must(store.User().Save(&u1)) - if r1 := <-store.Team().GetTeamsForEmail(u1.Email); r1.Err != nil { + if r1 := <-store.Team().GetTeamsForEmail(utils.T, u1.Email); r1.Err != nil { t.Fatal(r1.Err) } else { teams := r1.Data.([]*model.Team) @@ -205,7 +206,7 @@ func TestTeamStoreGetForEmail(t *testing.T) { } } - if r1 := <-store.Team().GetTeamsForEmail("missing"); r1.Err != nil { + if r1 := <-store.Team().GetTeamsForEmail(utils.T, "missing"); r1.Err != nil { t.Fatal(r1.Err) } } @@ -219,16 +220,16 @@ func TestAllTeamListing(t *testing.T) { o1.Email = model.NewId() + "@nowhere.com" o1.Type = model.TEAM_OPEN o1.AllowTeamListing = true - Must(store.Team().Save(&o1)) + Must(store.Team().Save(utils.T, &o1)) o2 := model.Team{} o2.DisplayName = "DisplayName" o2.Name = "a" + model.NewId() + "b" o2.Email = model.NewId() + "@nowhere.com" o2.Type = model.TEAM_OPEN - Must(store.Team().Save(&o2)) + Must(store.Team().Save(utils.T, &o2)) - if r1 := <-store.Team().GetAllTeamListing(); r1.Err != nil { + if r1 := <-store.Team().GetAllTeamListing(utils.T); r1.Err != nil { t.Fatal(r1.Err) } else { teams := r1.Data.([]*model.Team) @@ -248,16 +249,16 @@ func TestDelete(t *testing.T) { o1.Email = model.NewId() + "@nowhere.com" o1.Type = model.TEAM_OPEN o1.AllowTeamListing = true - Must(store.Team().Save(&o1)) + Must(store.Team().Save(utils.T, &o1)) o2 := model.Team{} o2.DisplayName = "DisplayName" o2.Name = "a" + model.NewId() + "b" o2.Email = model.NewId() + "@nowhere.com" o2.Type = model.TEAM_OPEN - Must(store.Team().Save(&o2)) + Must(store.Team().Save(utils.T, &o2)) - if r1 := <-store.Team().PermanentDelete(o1.Id); r1.Err != nil { + if r1 := <-store.Team().PermanentDelete(utils.T, o1.Id); r1.Err != nil { t.Fatal(r1.Err) } } diff --git a/store/store.go b/store/store.go index 8f9897857..58a9e0478 100644 --- a/store/store.go +++ b/store/store.go @@ -45,16 +45,16 @@ type Store interface { } type TeamStore interface { - Save(team *model.Team) StoreChannel - Update(team *model.Team) StoreChannel - UpdateDisplayName(name string, teamId string) StoreChannel - Get(id string) StoreChannel - GetByName(name string) StoreChannel - GetTeamsForEmail(domain string) StoreChannel - GetAll() StoreChannel - GetAllTeamListing() StoreChannel - GetByInviteId(inviteId string) StoreChannel - PermanentDelete(teamId string) StoreChannel + Save(T goi18n.TranslateFunc, team *model.Team) StoreChannel + Update(T goi18n.TranslateFunc, team *model.Team) StoreChannel + UpdateDisplayName(T goi18n.TranslateFunc, name string, teamId string) StoreChannel + Get(T goi18n.TranslateFunc, id string) StoreChannel + GetByName(T goi18n.TranslateFunc, name string) StoreChannel + GetTeamsForEmail(T goi18n.TranslateFunc, domain string) StoreChannel + GetAll(T goi18n.TranslateFunc) StoreChannel + GetAllTeamListing(T goi18n.TranslateFunc) StoreChannel + GetByInviteId(T goi18n.TranslateFunc, inviteId string) StoreChannel + PermanentDelete(T goi18n.TranslateFunc, teamId string) StoreChannel } type ChannelStore interface { |