Migrate Team.GetActiveMembersCount to Sync by default (#11146)
* Migrate Team.GetActiveMembersCount to Sync by default * Requested change * Requested change * Fix merge * Added a new key to i18n: store.sql_team.get_active_member_count.app_error
Этот коммит содержится в:
коммит произвёл
Jesús Espino
родитель
bd8e047458
Коммит
b13c5eabff
@@ -652,26 +652,23 @@ func (s SqlTeamStore) GetTotalMemberCount(teamId string) (int64, *model.AppError
|
||||
return count, nil
|
||||
}
|
||||
|
||||
func (s SqlTeamStore) GetActiveMemberCount(teamId string) store.StoreChannel {
|
||||
return store.Do(func(result *store.StoreResult) {
|
||||
count, err := s.GetReplica().SelectInt(`
|
||||
SELECT
|
||||
count(*)
|
||||
FROM
|
||||
TeamMembers,
|
||||
Users
|
||||
WHERE
|
||||
TeamMembers.UserId = Users.Id
|
||||
AND TeamMembers.TeamId = :TeamId
|
||||
AND TeamMembers.DeleteAt = 0
|
||||
AND Users.DeleteAt = 0`, map[string]interface{}{"TeamId": teamId})
|
||||
if err != nil {
|
||||
result.Err = model.NewAppError("SqlTeamStore.GetActiveMemberCount", "store.sql_team.get_member_count.app_error", nil, "teamId="+teamId+" "+err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
func (s SqlTeamStore) GetActiveMemberCount(teamId string) (int64, *model.AppError) {
|
||||
count, err := s.GetReplica().SelectInt(`
|
||||
SELECT
|
||||
count(*)
|
||||
FROM
|
||||
TeamMembers,
|
||||
Users
|
||||
WHERE
|
||||
TeamMembers.UserId = Users.Id
|
||||
AND TeamMembers.TeamId = :TeamId
|
||||
AND TeamMembers.DeleteAt = 0
|
||||
AND Users.DeleteAt = 0`, map[string]interface{}{"TeamId": teamId})
|
||||
if err != nil {
|
||||
return 0, model.NewAppError("SqlTeamStore.GetActiveMemberCount", "store.sql_team.get_active_member_count.app_error", nil, "teamId="+teamId+" "+err.Error(), http.StatusInternalServerError)
|
||||
}
|
||||
|
||||
result.Data = count
|
||||
})
|
||||
return count, nil
|
||||
}
|
||||
|
||||
func (s SqlTeamStore) GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError) {
|
||||
|
||||
Ссылка в новой задаче
Block a user