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

PLT-6254: Search not in teams include removed members. (#6020)

Browse Source
This commit is contained in:
George Goldberg
2017-04-07 19:49:02 +01:00
committed by GitHub
parent de3995a1ce
commit ad2ab81ee4
2 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
store/sql_user_store.go
View File

@@ -1298,7 +1298,7 @@ func (us SqlUserStore) SearchNotInTeam(notInTeamId string, term string, options
ON tm.UserId = Users.Id
AND tm.TeamId = :NotInTeamId
WHERE
tm.UserId IS NULL
(tm.UserId IS NULL OR tm.DeleteAt != 0)
SEARCH_CLAUSE
INACTIVE_CLAUSE
ORDER BY Users.Username ASC

38
store/sql_user_store_test.go
View File

@@ -1659,6 +1659,44 @@ func TestUserStoreSearch(t *testing.T) {
t.Fatal("should not have found user")
}
}
// Check SearchNotInTeam finds previously deleted team members.
Must(store.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u4.Id}))
if r1 := <-store.User().SearchNotInTeam(tid, "simo", searchOptions); r1.Err != nil {
t.Fatal(r1.Err)
} else {
profiles := r1.Data.([]*model.User)
found := false
for _, profile := range profiles {
if profile.Id == u4.Id {
found = true
break
}
}
if found {
t.Fatal("should not have found user")
}
}
Must(store.Team().UpdateMember(&model.TeamMember{TeamId: tid, UserId: u4.Id, DeleteAt: model.GetMillis() - 1000}))
if r1 := <-store.User().SearchNotInTeam(tid, "simo", searchOptions); r1.Err != nil {
t.Fatal(r1.Err)
} else {
profiles := r1.Data.([]*model.User)
found := false
for _, profile := range profiles {
if profile.Id == u4.Id {
found = true
break
}
}
if !found {
t.Fatal("should have found user")
}
}
}
func TestUserStoreSearchWithoutTeam(t *testing.T) {