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

Migrate "Team.RemoveAllMembersByUser" to Sync by default (#11560)

Browse Source 
* Migrate "Team.RemoveAllMembersByUser" to Sync by default

* fixing merge problem
This commit is contained in:
Alejandro Sánchez Medina
2019-07-08 20:31:18 +02:00
committed by Jesús Espino
parent 2149e3dd2f
commit d15c2c4e69
5 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
store/sqlstore/team_store.go
View File

@@ -785,13 +785,12 @@ func (s SqlTeamStore) RemoveAllMembersByTeam(teamId string) store.StoreChannel {
})
}
func (s SqlTeamStore) RemoveAllMembersByUser(userId string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
_, err := s.GetMaster().Exec("DELETE FROM TeamMembers WHERE UserId = :UserId", map[string]interface{}{"UserId": userId})
if err != nil {
result.Err = model.NewAppError("SqlTeamStore.RemoveMember", "store.sql_team.remove_member.app_error", nil, "user_id="+userId+", "+err.Error(), http.StatusInternalServerError)
}
})
func (s SqlTeamStore) RemoveAllMembersByUser(userId string) *model.AppError {
_, err := s.GetMaster().Exec("DELETE FROM TeamMembers WHERE UserId = :UserId", map[string]interface{}{"UserId": userId})
if err != nil {
return model.NewAppError("SqlTeamStore.RemoveMember", "store.sql_team.remove_member.app_error", nil, "user_id="+userId+", "+err.Error(), http.StatusInternalServerError)
}
return nil
}
func (us SqlTeamStore) UpdateLastTeamIconUpdate(teamId string, curTime int64) *model.AppError {

2
store/store.go
View File

@@ -113,7 +113,7 @@ type TeamStore interface {
GetChannelUnreadsForTeam(teamId, userId string) ([]*model.ChannelUnread, *model.AppError)
RemoveMember(teamId string, userId string) StoreChannel
RemoveAllMembersByTeam(teamId string) StoreChannel
RemoveAllMembersByUser(userId string) StoreChannel
RemoveAllMembersByUser(userId string) *model.AppError
UpdateLastTeamIconUpdate(teamId string, curTime int64) *model.AppError
GetTeamsByScheme(schemeId string, offset int, limit int) StoreChannel
MigrateTeamMembers(fromTeamId string, fromUserId string) StoreChannel

8
store/storetest/mocks/TeamStore.go
View File

@@ -662,15 +662,15 @@ func (_m *TeamStore) RemoveAllMembersByTeam(teamId string) store.StoreChannel {
}
// RemoveAllMembersByUser provides a mock function with given fields: userId
func (_m *TeamStore) RemoveAllMembersByUser(userId string) store.StoreChannel {
func (_m *TeamStore) RemoveAllMembersByUser(userId string) *model.AppError {
ret := _m.Called(userId)
var r0 store.StoreChannel
if rf, ok := ret.Get(0).(func(string) store.StoreChannel); ok {
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string) *model.AppError); ok {
r0 = rf(userId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(store.StoreChannel)
r0 = ret.Get(0).(*model.AppError)
}
}

12
store/storetest/team_store.go
View File

@@ -842,8 +842,8 @@ func testTeamMembers(t *testing.T, ss store.Store) {
require.Len(t, ms, 2)
}
if r1 := <-ss.Team().RemoveAllMembersByUser(uid); r1.Err != nil {
t.Fatal(r1.Err)
if err := ss.Team().RemoveAllMembersByUser(uid); err != nil {
t.Fatal(err)
}
if ms, err := ss.Team().GetTeamsForUser(m1.UserId); err != nil {
@@ -898,8 +898,8 @@ func testTeamMembersWithPagination(t *testing.T, ss store.Store) {
require.Nil(t, err)
require.Len(t, result, 1)
r1 = <-ss.Team().RemoveAllMembersByUser(uid)
require.Nil(t, r1.Err)
err = ss.Team().RemoveAllMembersByUser(uid)
require.Nil(t, err)
result, err = ss.Team().GetTeamsForUserWithPagination(uid, 1, 1)
require.Nil(t, err)
@@ -1237,8 +1237,8 @@ func testGetChannelUnreadsForAllTeams(t *testing.T, ss store.Store) {
}
}
if r1 := <-ss.Team().RemoveAllMembersByUser(uid); r1.Err != nil {
t.Fatal(r1.Err)
if err := ss.Team().RemoveAllMembersByUser(uid); err != nil {
t.Fatal(err)
}
}