[MM-16179] Migrate Team.GetTotalMemberCount to Sync by default #11120 (#11149)

+ GetTotalMemberCount returns (int64, *model.AppError) now instead of StoreChannel.
+ Updated store mock.
+ Updated code that referenced GetTotalMemberCount to handle the sync result.
Этот коммит содержится в:
Kyle Reczek
2019-06-12 23:56:22 -06:00
коммит произвёл Jesús Espino
родитель 784a34318f
Коммит cbfd68ee1f
5 изменённых файлов: 50 добавлений и 42 удалений

Просмотреть файл

@@ -644,9 +644,8 @@ func (s SqlTeamStore) GetMembers(teamId string, offset int, limit int, restricti
return dbMembers.ToModel(), nil
}
func (s SqlTeamStore) GetTotalMemberCount(teamId string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
count, err := s.GetReplica().SelectInt(`
func (s SqlTeamStore) GetTotalMemberCount(teamId string) (int64, *model.AppError) {
count, err := s.GetReplica().SelectInt(`
SELECT
count(*)
FROM
@@ -656,13 +655,10 @@ func (s SqlTeamStore) GetTotalMemberCount(teamId string) store.StoreChannel {
TeamMembers.UserId = Users.Id
AND TeamMembers.TeamId = :TeamId
AND TeamMembers.DeleteAt = 0`, map[string]interface{}{"TeamId": teamId})
if err != nil {
result.Err = model.NewAppError("SqlTeamStore.GetTotalMemberCount", "store.sql_team.get_member_count.app_error", nil, "teamId="+teamId+" "+err.Error(), http.StatusInternalServerError)
return
}
result.Data = count
})
if err != nil {
return int64(0), model.NewAppError("SqlTeamStore.GetTotalMemberCount", "store.sql_team.get_member_count.app_error", nil, "teamId="+teamId+" "+err.Error(), http.StatusInternalServerError)
}
return count, nil
}
func (s SqlTeamStore) GetActiveMemberCount(teamId string) store.StoreChannel {