diff --git a/i18n/en.json b/i18n/en.json index 22515d394d..a32deb6b4f 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -6374,10 +6374,6 @@ "id": "store.sql_preference.insert.save.app_error", "translation": "Unable to save the preference" }, - { - "id": "store.sql_preference.is_feature_enabled.app_error", - "translation": "We encountered an error while finding a pre release feature preference" - }, { "id": "store.sql_preference.permanent_delete_by_user.app_error", "translation": "We encountered an error while deleteing preferences" @@ -6610,18 +6606,6 @@ "id": "store.sql_status.get.missing.app_error", "translation": "No entry for that status exists" }, - { - "id": "store.sql_status.get_online.app_error", - "translation": "Encountered an error retrieving all the online statuses" - }, - { - "id": "store.sql_status.get_online_away.app_error", - "translation": "Encountered an error retrieving all the online/away statuses" - }, - { - "id": "store.sql_status.get_team_statuses.app_error", - "translation": "Encountered an error retrieving all statuses from the team members" - }, { "id": "store.sql_status.get_total_active_users_count.app_error", "translation": "We could not count the active users" @@ -6830,10 +6814,6 @@ "id": "store.sql_team.update.updating.app_error", "translation": "We encountered an error updating the team" }, - { - "id": "store.sql_team.update_display_name.app_error", - "translation": "Unable to update the team name" - }, { "id": "store.sql_team.update_last_team_icon_update.app_error", "translation": "Unable to update the date of the last team icon update" diff --git a/store/sqlstore/preference_store.go b/store/sqlstore/preference_store.go index 8265fec696..36604f116a 100644 --- a/store/sqlstore/preference_store.go +++ b/store/sqlstore/preference_store.go @@ -210,21 +210,6 @@ func (s SqlPreferenceStore) PermanentDeleteByUser(userId string) *model.AppError return nil } -func (s SqlPreferenceStore) IsFeatureEnabled(feature, userId string) (bool, *model.AppError) { - query := - `SELECT value FROM Preferences - WHERE - UserId = :UserId - AND Category = :Category - AND Name = :Name` - - value, err := s.GetReplica().SelectStr(query, map[string]interface{}{"UserId": userId, "Category": model.PREFERENCE_CATEGORY_ADVANCED_SETTINGS, "Name": store.FEATURE_TOGGLE_PREFIX + feature}) - if err != nil { - return false, model.NewAppError("SqlPreferenceStore.IsFeatureEnabled", "store.sql_preference.is_feature_enabled.app_error", nil, err.Error(), http.StatusInternalServerError) - } - return value == "true", nil -} - func (s SqlPreferenceStore) Delete(userId, category, name string) *model.AppError { query := `DELETE FROM Preferences diff --git a/store/sqlstore/status_store.go b/store/sqlstore/status_store.go index 2f1946ab97..e4fe8e0b1b 100644 --- a/store/sqlstore/status_store.go +++ b/store/sqlstore/status_store.go @@ -92,32 +92,6 @@ func (s SqlStatusStore) GetByIds(userIds []string) ([]*model.Status, *model.AppE return statuses, nil } -func (s SqlStatusStore) GetOnlineAway() ([]*model.Status, *model.AppError) { - var statuses []*model.Status - if _, err := s.GetReplica().Select(&statuses, "SELECT * FROM Status WHERE Status = :Online OR Status = :Away LIMIT 300", map[string]interface{}{"Online": model.STATUS_ONLINE, "Away": model.STATUS_AWAY}); err != nil { - return nil, model.NewAppError("SqlStatusStore.GetOnlineAway", "store.sql_status.get_online_away.app_error", nil, err.Error(), http.StatusInternalServerError) - } - return statuses, nil -} - -func (s SqlStatusStore) GetOnline() ([]*model.Status, *model.AppError) { - var statuses []*model.Status - if _, err := s.GetReplica().Select(&statuses, "SELECT * FROM Status WHERE Status = :Online", map[string]interface{}{"Online": model.STATUS_ONLINE}); err != nil { - return nil, model.NewAppError("SqlStatusStore.GetOnline", "store.sql_status.get_online.app_error", nil, err.Error(), http.StatusInternalServerError) - } - return statuses, nil -} - -func (s SqlStatusStore) GetAllFromTeam(teamId string) ([]*model.Status, *model.AppError) { - var statuses []*model.Status - if _, err := s.GetReplica().Select(&statuses, - `SELECT s.* FROM Status AS s INNER JOIN - TeamMembers AS tm ON tm.TeamId=:TeamId AND s.UserId=tm.UserId`, map[string]interface{}{"TeamId": teamId}); err != nil { - return nil, model.NewAppError("SqlStatusStore.GetAllFromTeam", "store.sql_status.get_team_statuses.app_error", nil, err.Error(), http.StatusInternalServerError) - } - return statuses, nil -} - func (s SqlStatusStore) ResetAll() *model.AppError { if _, err := s.GetMaster().Exec("UPDATE Status SET Status = :Status WHERE Manual = false", map[string]interface{}{"Status": model.STATUS_OFFLINE}); err != nil { return model.NewAppError("SqlStatusStore.ResetAll", "store.sql_status.reset_all.app_error", nil, "", http.StatusInternalServerError) diff --git a/store/sqlstore/team_store.go b/store/sqlstore/team_store.go index d676b908c0..aac9ef78da 100644 --- a/store/sqlstore/team_store.go +++ b/store/sqlstore/team_store.go @@ -253,14 +253,6 @@ func (s SqlTeamStore) Update(team *model.Team) (*model.Team, *model.AppError) { return team, nil } -func (s SqlTeamStore) UpdateDisplayName(name string, teamId string) *model.AppError { - if _, err := s.GetMaster().Exec("UPDATE Teams SET DisplayName = :Name WHERE Id = :Id", map[string]interface{}{"Name": name, "Id": teamId}); err != nil { - return model.NewAppError("SqlTeamStore.UpdateName", "store.sql_team.update_display_name.app_error", nil, "team_id="+teamId, http.StatusInternalServerError) - } - - return nil -} - func (s SqlTeamStore) Get(id string) (*model.Team, *model.AppError) { obj, err := s.GetReplica().Get(model.Team{}, id) if err != nil { @@ -298,16 +290,6 @@ func (s SqlTeamStore) GetByName(name string) (*model.Team, *model.AppError) { return &team, nil } -func (s SqlTeamStore) SearchByName(name string) ([]*model.Team, *model.AppError) { - var teams []*model.Team - - if _, err := s.GetReplica().Select(&teams, "SELECT * FROM Teams WHERE Name LIKE :Name", map[string]interface{}{"Name": name + "%"}); err != nil { - return nil, model.NewAppError("SqlTeamStore.SearchByName", "store.sql_team.get_by_name.app_error", nil, "name="+name+", "+err.Error(), http.StatusInternalServerError) - } - - return teams, nil -} - func (s SqlTeamStore) SearchAll(term string) ([]*model.Team, *model.AppError) { var teams []*model.Team diff --git a/store/store.go b/store/store.go index 671aafc8f3..cbdb33e061 100644 --- a/store/store.go +++ b/store/store.go @@ -57,10 +57,8 @@ type Store interface { type TeamStore interface { Save(team *model.Team) (*model.Team, *model.AppError) Update(team *model.Team) (*model.Team, *model.AppError) - UpdateDisplayName(name string, teamId string) *model.AppError Get(id string) (*model.Team, *model.AppError) GetByName(name string) (*model.Team, *model.AppError) - SearchByName(name string) ([]*model.Team, *model.AppError) SearchAll(term string) ([]*model.Team, *model.AppError) SearchOpen(term string) ([]*model.Team, *model.AppError) SearchPrivate(term string) ([]*model.Team, *model.AppError) @@ -429,7 +427,6 @@ type PreferenceStore interface { DeleteCategory(userId string, category string) *model.AppError DeleteCategoryAndName(category string, name string) *model.AppError PermanentDeleteByUser(userId string) *model.AppError - IsFeatureEnabled(feature, userId string) (bool, *model.AppError) CleanupFlagsBatch(limit int64) (int64, *model.AppError) } @@ -460,9 +457,6 @@ type StatusStore interface { SaveOrUpdate(status *model.Status) *model.AppError Get(userId string) (*model.Status, *model.AppError) GetByIds(userIds []string) ([]*model.Status, *model.AppError) - GetOnlineAway() ([]*model.Status, *model.AppError) - GetOnline() ([]*model.Status, *model.AppError) - GetAllFromTeam(teamId string) ([]*model.Status, *model.AppError) ResetAll() *model.AppError GetTotalActiveUsersCount() (int64, *model.AppError) UpdateLastActivityAt(userId string, lastActivityAt int64) *model.AppError diff --git a/store/storetest/mocks/PreferenceStore.go b/store/storetest/mocks/PreferenceStore.go index ca15ce385d..293979210a 100644 --- a/store/storetest/mocks/PreferenceStore.go +++ b/store/storetest/mocks/PreferenceStore.go @@ -158,29 +158,6 @@ func (_m *PreferenceStore) GetCategory(userId string, category string) (model.Pr return r0, r1 } -// IsFeatureEnabled provides a mock function with given fields: feature, userId -func (_m *PreferenceStore) IsFeatureEnabled(feature string, userId string) (bool, *model.AppError) { - ret := _m.Called(feature, userId) - - var r0 bool - if rf, ok := ret.Get(0).(func(string, string) bool); ok { - r0 = rf(feature, userId) - } else { - r0 = ret.Get(0).(bool) - } - - var r1 *model.AppError - if rf, ok := ret.Get(1).(func(string, string) *model.AppError); ok { - r1 = rf(feature, userId) - } else { - if ret.Get(1) != nil { - r1 = ret.Get(1).(*model.AppError) - } - } - - return r0, r1 -} - // PermanentDeleteByUser provides a mock function with given fields: userId func (_m *PreferenceStore) PermanentDeleteByUser(userId string) *model.AppError { ret := _m.Called(userId) diff --git a/store/storetest/mocks/StatusStore.go b/store/storetest/mocks/StatusStore.go index 5faaa2a40b..48d4e9a67f 100644 --- a/store/storetest/mocks/StatusStore.go +++ b/store/storetest/mocks/StatusStore.go @@ -37,31 +37,6 @@ func (_m *StatusStore) Get(userId string) (*model.Status, *model.AppError) { return r0, r1 } -// GetAllFromTeam provides a mock function with given fields: teamId -func (_m *StatusStore) GetAllFromTeam(teamId string) ([]*model.Status, *model.AppError) { - ret := _m.Called(teamId) - - var r0 []*model.Status - if rf, ok := ret.Get(0).(func(string) []*model.Status); ok { - r0 = rf(teamId) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).([]*model.Status) - } - } - - var r1 *model.AppError - if rf, ok := ret.Get(1).(func(string) *model.AppError); ok { - r1 = rf(teamId) - } else { - if ret.Get(1) != nil { - r1 = ret.Get(1).(*model.AppError) - } - } - - return r0, r1 -} - // GetByIds provides a mock function with given fields: userIds func (_m *StatusStore) GetByIds(userIds []string) ([]*model.Status, *model.AppError) { ret := _m.Called(userIds) @@ -87,56 +62,6 @@ func (_m *StatusStore) GetByIds(userIds []string) ([]*model.Status, *model.AppEr return r0, r1 } -// GetOnline provides a mock function with given fields: -func (_m *StatusStore) GetOnline() ([]*model.Status, *model.AppError) { - ret := _m.Called() - - var r0 []*model.Status - if rf, ok := ret.Get(0).(func() []*model.Status); ok { - r0 = rf() - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).([]*model.Status) - } - } - - var r1 *model.AppError - if rf, ok := ret.Get(1).(func() *model.AppError); ok { - r1 = rf() - } else { - if ret.Get(1) != nil { - r1 = ret.Get(1).(*model.AppError) - } - } - - return r0, r1 -} - -// GetOnlineAway provides a mock function with given fields: -func (_m *StatusStore) GetOnlineAway() ([]*model.Status, *model.AppError) { - ret := _m.Called() - - var r0 []*model.Status - if rf, ok := ret.Get(0).(func() []*model.Status); ok { - r0 = rf() - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).([]*model.Status) - } - } - - var r1 *model.AppError - if rf, ok := ret.Get(1).(func() *model.AppError); ok { - r1 = rf() - } else { - if ret.Get(1) != nil { - r1 = ret.Get(1).(*model.AppError) - } - } - - return r0, r1 -} - // GetTotalActiveUsersCount provides a mock function with given fields: func (_m *StatusStore) GetTotalActiveUsersCount() (int64, *model.AppError) { ret := _m.Called() diff --git a/store/storetest/mocks/TeamStore.go b/store/storetest/mocks/TeamStore.go index 4e2eedaa5f..a5c11b817c 100644 --- a/store/storetest/mocks/TeamStore.go +++ b/store/storetest/mocks/TeamStore.go @@ -835,31 +835,6 @@ func (_m *TeamStore) SearchAll(term string) ([]*model.Team, *model.AppError) { return r0, r1 } -// SearchByName provides a mock function with given fields: name -func (_m *TeamStore) SearchByName(name string) ([]*model.Team, *model.AppError) { - ret := _m.Called(name) - - var r0 []*model.Team - if rf, ok := ret.Get(0).(func(string) []*model.Team); ok { - r0 = rf(name) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).([]*model.Team) - } - } - - var r1 *model.AppError - if rf, ok := ret.Get(1).(func(string) *model.AppError); ok { - r1 = rf(name) - } else { - if ret.Get(1) != nil { - r1 = ret.Get(1).(*model.AppError) - } - } - - return r0, r1 -} - // SearchOpen provides a mock function with given fields: term func (_m *TeamStore) SearchOpen(term string) ([]*model.Team, *model.AppError) { ret := _m.Called(term) @@ -935,22 +910,6 @@ func (_m *TeamStore) Update(team *model.Team) (*model.Team, *model.AppError) { return r0, r1 } -// UpdateDisplayName provides a mock function with given fields: name, teamId -func (_m *TeamStore) UpdateDisplayName(name string, teamId string) *model.AppError { - ret := _m.Called(name, teamId) - - var r0 *model.AppError - if rf, ok := ret.Get(0).(func(string, string) *model.AppError); ok { - r0 = rf(name, teamId) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*model.AppError) - } - } - - return r0 -} - // UpdateLastTeamIconUpdate provides a mock function with given fields: teamId, curTime func (_m *TeamStore) UpdateLastTeamIconUpdate(teamId string, curTime int64) *model.AppError { ret := _m.Called(teamId, curTime) diff --git a/store/storetest/preference_store.go b/store/storetest/preference_store.go index a071bc0010..3456ce2f33 100644 --- a/store/storetest/preference_store.go +++ b/store/storetest/preference_store.go @@ -19,7 +19,6 @@ func TestPreferenceStore(t *testing.T, ss store.Store) { t.Run("PreferenceGetCategory", func(t *testing.T) { testPreferenceGetCategory(t, ss) }) t.Run("PreferenceGetAll", func(t *testing.T) { testPreferenceGetAll(t, ss) }) t.Run("PreferenceDeleteByUser", func(t *testing.T) { testPreferenceDeleteByUser(t, ss) }) - t.Run("IsFeatureEnabled", func(t *testing.T) { testIsFeatureEnabled(t, ss) }) t.Run("PreferenceDelete", func(t *testing.T) { testPreferenceDelete(t, ss) }) t.Run("PreferenceDeleteCategory", func(t *testing.T) { testPreferenceDeleteCategory(t, ss) }) t.Run("PreferenceDeleteCategoryAndName", func(t *testing.T) { testPreferenceDeleteCategoryAndName(t, ss) }) @@ -245,77 +244,6 @@ func testPreferenceDeleteByUser(t *testing.T, ss store.Store) { } } -func testIsFeatureEnabled(t *testing.T, ss store.Store) { - feature1 := "testFeat1" - feature2 := "testFeat2" - feature3 := "testFeat3" - - userId := model.NewId() - category := model.PREFERENCE_CATEGORY_ADVANCED_SETTINGS - - features := model.Preferences{ - { - UserId: userId, - Category: category, - Name: store.FEATURE_TOGGLE_PREFIX + feature1, - Value: "true", - }, - { - UserId: userId, - Category: category, - Name: model.NewId(), - Value: "false", - }, - { - UserId: userId, - Category: model.NewId(), - Name: store.FEATURE_TOGGLE_PREFIX + feature1, - Value: "false", - }, - { - UserId: model.NewId(), - Category: category, - Name: store.FEATURE_TOGGLE_PREFIX + feature2, - Value: "false", - }, - { - UserId: model.NewId(), - Category: category, - Name: store.FEATURE_TOGGLE_PREFIX + feature3, - Value: "foobar", - }, - } - - err := ss.Preference().Save(&features) - require.Nil(t, err) - - if data, err := ss.Preference().IsFeatureEnabled(feature1, userId); err != nil { - t.Fatal(err) - } else if !data { - t.Fatalf("got incorrect setting for feature1, %v=%v", true, data) - } - - if data, err := ss.Preference().IsFeatureEnabled(feature2, userId); err != nil { - t.Fatal(err) - } else if data { - t.Fatalf("got incorrect setting for feature2, %v=%v", false, data) - } - - // make sure we get false if something different than "true" or "false" has been saved to database - if data, err := ss.Preference().IsFeatureEnabled(feature3, userId); err != nil { - t.Fatal(err) - } else if data { - t.Fatalf("got incorrect setting for feature3, %v=%v", false, data) - } - - // make sure false is returned if a non-existent feature is queried - if data, err := ss.Preference().IsFeatureEnabled("someOtherFeature", userId); err != nil { - t.Fatal(err) - } else if data { - t.Fatalf("got incorrect setting for non-existent feature 'someOtherFeature', %v=%v", false, data) - } -} - func testPreferenceDelete(t *testing.T, ss store.Store) { preference := model.Preference{ UserId: model.NewId(), diff --git a/store/storetest/status_store.go b/store/storetest/status_store.go index 5b92507178..e93489f166 100644 --- a/store/storetest/status_store.go +++ b/store/storetest/status_store.go @@ -4,10 +4,8 @@ package storetest import ( - "sort" "testing" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/mattermost/mattermost-server/model" @@ -17,7 +15,6 @@ import ( func TestStatusStore(t *testing.T, ss store.Store) { t.Run("", func(t *testing.T) { testStatusStore(t, ss) }) t.Run("ActiveUserCount", func(t *testing.T) { testActiveUserCount(t, ss) }) - t.Run("GetAllFromTeam", func(t *testing.T) { testGetAllFromTeam(t, ss) }) } func testStatusStore(t *testing.T, ss store.Store) { @@ -36,26 +33,6 @@ func testStatusStore(t *testing.T, ss store.Store) { status3 := &model.Status{UserId: model.NewId(), Status: model.STATUS_OFFLINE, Manual: false, LastActivityAt: 0, ActiveChannel: ""} require.Nil(t, ss.Status().SaveOrUpdate(status3)) - if statuses, err := ss.Status().GetOnlineAway(); err != nil { - t.Fatal(err) - } else { - for _, status := range statuses { - if status.Status == model.STATUS_OFFLINE { - t.Fatal("should not have returned offline statuses") - } - } - } - - if statuses, err := ss.Status().GetOnline(); err != nil { - t.Fatal(err) - } else { - for _, status := range statuses { - if status.Status != model.STATUS_ONLINE { - t.Fatal("should not have returned offline statuses") - } - } - } - if statuses, err := ss.Status().GetByIds([]string{status.UserId, "junk"}); err != nil { t.Fatal(err) } else { @@ -97,78 +74,3 @@ type ByUserId []*model.Status func (s ByUserId) Len() int { return len(s) } func (s ByUserId) Swap(i, j int) { s[i], s[j] = s[j], s[i] } func (s ByUserId) Less(i, j int) bool { return s[i].UserId < s[j].UserId } - -func testGetAllFromTeam(t *testing.T, ss store.Store) { - assertStatuses := func(expected, actual []*model.Status) { - sort.Sort(ByUserId(expected)) - sort.Sort(ByUserId(actual)) - assert.Equal(t, expected, actual) - } - - team1 := model.Team{} - team1.DisplayName = model.NewId() - team1.Name = "zz" + model.NewId() - team1.Email = MakeEmail() - team1.Type = model.TEAM_OPEN - - if _, err := ss.Team().Save(&team1); err != nil { - t.Fatal("couldn't save team", err) - } - - team2 := model.Team{} - team2.DisplayName = model.NewId() - team2.Name = "zz" + model.NewId() - team2.Email = MakeEmail() - team2.Type = model.TEAM_OPEN - - if _, err := ss.Team().Save(&team2); err != nil { - t.Fatal("couldn't save team", err) - } - - team1Member1 := &model.TeamMember{TeamId: team1.Id, UserId: model.NewId()} - if _, err := ss.Team().SaveMember(team1Member1, -1); err != nil { - t.Fatal(err) - } - team1Member2 := &model.TeamMember{TeamId: team1.Id, UserId: model.NewId()} - if _, err := ss.Team().SaveMember(team1Member2, -1); err != nil { - t.Fatal(err) - } - team2Member1 := &model.TeamMember{TeamId: team2.Id, UserId: model.NewId()} - if _, err := ss.Team().SaveMember(team2Member1, -1); err != nil { - t.Fatal(err) - } - team2Member2 := &model.TeamMember{TeamId: team2.Id, UserId: model.NewId()} - if _, err := ss.Team().SaveMember(team2Member2, -1); err != nil { - t.Fatal(err) - } - - team1Member1Status := &model.Status{UserId: team1Member1.UserId, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: 0, ActiveChannel: ""} - require.Nil(t, ss.Status().SaveOrUpdate(team1Member1Status)) - - team1Member2Status := &model.Status{UserId: team1Member2.UserId, Status: model.STATUS_OFFLINE, Manual: false, LastActivityAt: model.GetMillis(), ActiveChannel: ""} - require.Nil(t, ss.Status().SaveOrUpdate(team1Member2Status)) - - team2Member1Status := &model.Status{UserId: team2Member1.UserId, Status: model.STATUS_ONLINE, Manual: true, LastActivityAt: model.GetMillis(), ActiveChannel: ""} - require.Nil(t, ss.Status().SaveOrUpdate(team2Member1Status)) - - team2Member2Status := &model.Status{UserId: team2Member2.UserId, Status: model.STATUS_OFFLINE, Manual: true, LastActivityAt: model.GetMillis(), ActiveChannel: ""} - require.Nil(t, ss.Status().SaveOrUpdate(team2Member2Status)) - - if statuses, err := ss.Status().GetAllFromTeam(team1.Id); err != nil { - t.Fatal(err) - } else { - assertStatuses([]*model.Status{ - team1Member1Status, - team1Member2Status, - }, statuses) - } - - if statuses, err := ss.Status().GetAllFromTeam(team2.Id); err != nil { - t.Fatal(err) - } else { - assertStatuses([]*model.Status{ - team2Member1Status, - team2Member2Status, - }, statuses) - } -} diff --git a/store/storetest/team_store.go b/store/storetest/team_store.go index 491547f1ba..11b9b4229c 100644 --- a/store/storetest/team_store.go +++ b/store/storetest/team_store.go @@ -20,10 +20,8 @@ func TestTeamStore(t *testing.T, ss store.Store) { t.Run("Save", func(t *testing.T) { testTeamStoreSave(t, ss) }) t.Run("Update", func(t *testing.T) { testTeamStoreUpdate(t, ss) }) - t.Run("UpdateDisplayName", func(t *testing.T) { testTeamStoreUpdateDisplayName(t, ss) }) t.Run("Get", func(t *testing.T) { testTeamStoreGet(t, ss) }) t.Run("GetByName", func(t *testing.T) { testTeamStoreGetByName(t, ss) }) - t.Run("SearchByName", func(t *testing.T) { testTeamStoreSearchByName(t, ss) }) t.Run("SearchAll", func(t *testing.T) { testTeamStoreSearchAll(t, ss) }) t.Run("SearchOpen", func(t *testing.T) { testTeamStoreSearchOpen(t, ss) }) t.Run("SearchPrivate", func(t *testing.T) { testTeamStoreSearchPrivate(t, ss) }) @@ -101,26 +99,6 @@ func testTeamStoreUpdate(t *testing.T, ss store.Store) { } } -func testTeamStoreUpdateDisplayName(t *testing.T, ss store.Store) { - o1 := &model.Team{} - o1.DisplayName = "Display Name" - o1.Name = "z-z-z" + model.NewId() + "b" - o1.Email = MakeEmail() - o1.Type = model.TEAM_OPEN - o1, err := ss.Team().Save(o1) - require.Nil(t, err) - - newDisplayName := "NewDisplayName" - - if err = ss.Team().UpdateDisplayName(newDisplayName, o1.Id); err != nil { - t.Fatal(err) - } - - ro1, err := ss.Team().Get(o1.Id) - require.Nil(t, err) - require.Equal(t, newDisplayName, ro1.DisplayName, "DisplayName not updated") -} - func testTeamStoreGet(t *testing.T, ss store.Store) { o1 := model.Team{} o1.DisplayName = "DisplayName" @@ -162,27 +140,6 @@ func testTeamStoreGetByName(t *testing.T, ss store.Store) { } } -func testTeamStoreSearchByName(t *testing.T, ss store.Store) { - o1 := model.Team{} - o1.DisplayName = "DisplayName" - var name = "zzz" + model.NewId() - o1.Name = name + "b" - o1.Email = MakeEmail() - o1.Type = model.TEAM_OPEN - - if _, err := ss.Team().Save(&o1); err != nil { - t.Fatal(err) - } - - if r1, err := ss.Team().SearchByName(name); err != nil { - t.Fatal(err) - } else { - if r1[0].ToJson() != o1.ToJson() { - t.Fatal("invalid returned team") - } - } -} - func testTeamStoreSearchAll(t *testing.T, ss store.Store) { o := model.Team{} o.DisplayName = "ADisplayName" + model.NewId()