mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

MM-21898 - Part 1: Generate and use an interface instead of *A… (#13840)

Просмотр исходного кода 
* Generate and use an interface instead of *App
Этот коммит содержится в:
Eli Yukelzon
2020-02-13 13:26:58 +01:00
коммит произвёл GitHub
родитель 66fc096768
Коммит 17523fa5d9
200 изменённых файлов: 4553 добавлений и 2361 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

170
app/team.go
Просмотреть файл

@@ -24,7 +24,7 @@ import (
func (a *App) CreateTeam(team *model.Team) (*model.Team, *model.AppError) {
team.InviteId = ""
rteam, err := a.Srv.Store.Team().Save(team)
rteam, err := a.Srv().Store.Team().Save(team)
if err != nil {
return nil, err
}
@@ -145,7 +145,7 @@ func (a *App) UpdateTeam(team *model.Team) (*model.Team, *model.AppError) {
}
func (a *App) updateTeamUnsanitized(team *model.Team) (*model.Team, *model.AppError) {
return a.Srv.Store.Team().Update(team)
return a.Srv().Store.Team().Update(team)
}
// RenameTeam is used to rename the team Name and the DisplayName fields
@@ -184,7 +184,7 @@ func (a *App) UpdateTeamScheme(team *model.Team) (*model.Team, *model.AppError)
oldTeam.SchemeId = team.SchemeId
if oldTeam, err = a.Srv.Store.Team().Update(oldTeam); err != nil {
if oldTeam, err = a.Srv().Store.Team().Update(oldTeam); err != nil {
return nil, err
}
@@ -202,7 +202,7 @@ func (a *App) UpdateTeamPrivacy(teamId string, teamType string, allowOpenInvite
oldTeam.Type = teamType
oldTeam.AllowOpenInvite = allowOpenInvite
if oldTeam, err = a.Srv.Store.Team().Update(oldTeam); err != nil {
if oldTeam, err = a.Srv().Store.Team().Update(oldTeam); err != nil {
return err
}
@@ -237,7 +237,7 @@ func (a *App) RegenerateTeamInviteId(teamId string) (*model.Team, *model.AppErro
team.InviteId = model.NewId()
updatedTeam, err := a.Srv.Store.Team().Update(team)
updatedTeam, err := a.Srv().Store.Team().Update(team)
if err != nil {
return nil, err
}
@@ -280,7 +280,7 @@ func (a *App) GetSchemeRolesForTeam(teamId string) (string, string, string, *mod
}
func (a *App) UpdateTeamMemberRoles(teamId string, userId string, newRoles string) (*model.TeamMember, *model.AppError) {
member, err := a.Srv.Store.Team().GetMember(teamId, userId)
member, err := a.Srv().Store.Team().GetMember(teamId, userId)
if err != nil {
return nil, err
}
@@ -338,7 +338,7 @@ func (a *App) UpdateTeamMemberRoles(teamId string, userId string, newRoles strin
member.ExplicitRoles = strings.Join(newExplicitRoles, " ")
member, err = a.Srv.Store.Team().UpdateMember(member)
member, err = a.Srv().Store.Team().UpdateMember(member)
if err != nil {
return nil, err
}
@@ -369,7 +369,7 @@ func (a *App) UpdateTeamMemberSchemeRoles(teamId string, userId string, isScheme
member.ExplicitRoles = RemoveRoles([]string{model.TEAM_GUEST_ROLE_ID, model.TEAM_USER_ROLE_ID, model.TEAM_ADMIN_ROLE_ID}, member.ExplicitRoles)
}
member, err = a.Srv.Store.Team().UpdateMember(member)
member, err = a.Srv().Store.Team().UpdateMember(member)
if err != nil {
return nil, err
}
@@ -390,14 +390,14 @@ func (a *App) sendUpdatedMemberRoleEvent(userId string, member *model.TeamMember
func (a *App) AddUserToTeam(teamId string, userId string, userRequestorId string) (*model.Team, *model.AppError) {
tchan := make(chan store.StoreResult, 1)
go func() {
team, err := a.Srv.Store.Team().Get(teamId)
team, err := a.Srv().Store.Team().Get(teamId)
tchan <- store.StoreResult{Data: team, Err: err}
close(tchan)
}()
uchan := make(chan store.StoreResult, 1)
go func() {
user, err := a.Srv.Store.User().Get(userId)
user, err := a.Srv().Store.User().Get(userId)
uchan <- store.StoreResult{Data: user, Err: err}
close(uchan)
}()
@@ -422,7 +422,7 @@ func (a *App) AddUserToTeam(teamId string, userId string, userRequestorId string
}
func (a *App) AddUserToTeamByTeamId(teamId string, user *model.User) *model.AppError {
team, err := a.Srv.Store.Team().Get(teamId)
team, err := a.Srv().Store.Team().Get(teamId)
if err != nil {
return err
}
@@ -431,7 +431,7 @@ func (a *App) AddUserToTeamByTeamId(teamId string, user *model.User) *model.AppE
}
func (a *App) AddUserToTeamByToken(userId string, tokenId string) (*model.Team, *model.AppError) {
token, err := a.Srv.Store.Token().GetByToken(tokenId)
token, err := a.Srv().Store.Token().GetByToken(tokenId)
if err != nil {
return nil, model.NewAppError("AddUserToTeamByToken", "api.user.create_user.signup_link_invalid.app_error", nil, err.Error(), http.StatusBadRequest)
}
@@ -449,14 +449,14 @@ func (a *App) AddUserToTeamByToken(userId string, tokenId string) (*model.Team,
tchan := make(chan store.StoreResult, 1)
go func() {
team, err := a.Srv.Store.Team().Get(tokenData["teamId"])
team, err := a.Srv().Store.Team().Get(tokenData["teamId"])
tchan <- store.StoreResult{Data: team, Err: err}
close(tchan)
}()
uchan := make(chan store.StoreResult, 1)
go func() {
user, err := a.Srv.Store.User().Get(userId)
user, err := a.Srv().Store.User().Get(userId)
uchan <- store.StoreResult{Data: user, Err: err}
close(uchan)
}()
@@ -489,7 +489,7 @@ func (a *App) AddUserToTeamByToken(userId string, tokenId string) (*model.Team,
}
if token.Type == TOKEN_TYPE_GUEST_INVITATION {
channels, err := a.Srv.Store.Channel().GetChannelsByIds(strings.Split(tokenData["channels"], " "))
channels, err := a.Srv().Store.Channel().GetChannelsByIds(strings.Split(tokenData["channels"], " "))
if err != nil {
return nil, err
}
@@ -512,14 +512,14 @@ func (a *App) AddUserToTeamByToken(userId string, tokenId string) (*model.Team,
func (a *App) AddUserToTeamByInviteId(inviteId string, userId string) (*model.Team, *model.AppError) {
tchan := make(chan store.StoreResult, 1)
go func() {
team, err := a.Srv.Store.Team().GetByInviteId(inviteId)
team, err := a.Srv().Store.Team().GetByInviteId(inviteId)
tchan <- store.StoreResult{Data: team, Err: err}
close(tchan)
}()
uchan := make(chan store.StoreResult, 1)
go func() {
user, err := a.Srv.Store.User().Get(userId)
user, err := a.Srv().Store.User().Get(userId)
uchan <- store.StoreResult{Data: user, Err: err}
close(uchan)
}()
@@ -567,11 +567,11 @@ func (a *App) joinUserToTeam(team *model.Team, user *model.User) (*model.TeamMem
tm.SchemeAdmin = true
}
rtm, err := a.Srv.Store.Team().GetMember(team.Id, user.Id)
rtm, err := a.Srv().Store.Team().GetMember(team.Id, user.Id)
if err != nil {
// Membership appears to be missing. Lets try to add.
var tmr *model.TeamMember
tmr, err = a.Srv.Store.Team().SaveMember(tm, *a.Config().TeamSettings.MaxUsersPerTeam)
tmr, err = a.Srv().Store.Team().SaveMember(tm, *a.Config().TeamSettings.MaxUsersPerTeam)
if err != nil {
return nil, false, err
}
@@ -584,7 +584,7 @@ func (a *App) joinUserToTeam(team *model.Team, user *model.User) (*model.TeamMem
return rtm, true, nil
}
membersCount, err := a.Srv.Store.Team().GetActiveMemberCount(tm.TeamId, nil)
membersCount, err := a.Srv().Store.Team().GetActiveMemberCount(tm.TeamId, nil)
if err != nil {
return nil, false, err
}
@@ -593,7 +593,7 @@ func (a *App) joinUserToTeam(team *model.Team, user *model.User) (*model.TeamMem
return nil, false, model.NewAppError("joinUserToTeam", "app.team.join_user_to_team.max_accounts.app_error", nil, "teamId="+tm.TeamId, http.StatusBadRequest)
}
member, err := a.Srv.Store.Team().UpdateMember(tm)
member, err := a.Srv().Store.Team().UpdateMember(tm)
if err != nil {
return nil, false, err
}
@@ -619,7 +619,7 @@ func (a *App) JoinUserToTeam(team *model.Team, user *model.User, userRequestorId
actor, _ = a.GetUser(userRequestorId)
}
a.Srv.Go(func() {
a.Srv().Go(func() {
pluginContext := a.PluginContext()
pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool {
hooks.UserHasJoinedTeam(pluginContext, tm, actor)
@@ -628,7 +628,7 @@ func (a *App) JoinUserToTeam(team *model.Team, user *model.User, userRequestorId
})
}
if _, err := a.Srv.Store.User().UpdateUpdateAt(user.Id); err != nil {
if _, err := a.Srv().Store.User().UpdateUpdateAt(user.Id); err != nil {
return err
}
@@ -659,31 +659,31 @@ func (a *App) JoinUserToTeam(team *model.Team, user *model.User, userRequestorId
}
func (a *App) GetTeam(teamId string) (*model.Team, *model.AppError) {
return a.Srv.Store.Team().Get(teamId)
return a.Srv().Store.Team().Get(teamId)
}
func (a *App) GetTeamByName(name string) (*model.Team, *model.AppError) {
return a.Srv.Store.Team().GetByName(name)
return a.Srv().Store.Team().GetByName(name)
}
func (a *App) GetTeamByInviteId(inviteId string) (*model.Team, *model.AppError) {
return a.Srv.Store.Team().GetByInviteId(inviteId)
return a.Srv().Store.Team().GetByInviteId(inviteId)
}
func (a *App) GetAllTeams() ([]*model.Team, *model.AppError) {
return a.Srv.Store.Team().GetAll()
return a.Srv().Store.Team().GetAll()
}
func (a *App) GetAllTeamsPage(offset int, limit int) ([]*model.Team, *model.AppError) {
return a.Srv.Store.Team().GetAllPage(offset, limit)
return a.Srv().Store.Team().GetAllPage(offset, limit)
}
func (a *App) GetAllTeamsPageWithCount(offset int, limit int) (*model.TeamsWithCount, *model.AppError) {
totalCount, err := a.Srv.Store.Team().AnalyticsTeamCount(true)
totalCount, err := a.Srv().Store.Team().AnalyticsTeamCount(true)
if err != nil {
return nil, err
}
teams, err := a.Srv.Store.Team().GetAllPage(offset, limit)
teams, err := a.Srv().Store.Team().GetAllPage(offset, limit)
if err != nil {
return nil, err
}
@@ -691,19 +691,19 @@ func (a *App) GetAllTeamsPageWithCount(offset int, limit int) (*model.TeamsWithC
}
func (a *App) GetAllPrivateTeams() ([]*model.Team, *model.AppError) {
return a.Srv.Store.Team().GetAllPrivateTeamListing()
return a.Srv().Store.Team().GetAllPrivateTeamListing()
}
func (a *App) GetAllPrivateTeamsPage(offset int, limit int) ([]*model.Team, *model.AppError) {
return a.Srv.Store.Team().GetAllPrivateTeamPageListing(offset, limit)
return a.Srv().Store.Team().GetAllPrivateTeamPageListing(offset, limit)
}
func (a *App) GetAllPrivateTeamsPageWithCount(offset int, limit int) (*model.TeamsWithCount, *model.AppError) {
totalCount, err := a.Srv.Store.Team().AnalyticsPrivateTeamCount()
totalCount, err := a.Srv().Store.Team().AnalyticsPrivateTeamCount()
if err != nil {
return nil, err
}
teams, err := a.Srv.Store.Team().GetAllPrivateTeamPageListing(offset, limit)
teams, err := a.Srv().Store.Team().GetAllPrivateTeamPageListing(offset, limit)
if err != nil {
return nil, err
}
@@ -711,19 +711,19 @@ func (a *App) GetAllPrivateTeamsPageWithCount(offset int, limit int) (*model.Tea
}
func (a *App) GetAllPublicTeams() ([]*model.Team, *model.AppError) {
return a.Srv.Store.Team().GetAllTeamListing()
return a.Srv().Store.Team().GetAllTeamListing()
}
func (a *App) GetAllPublicTeamsPage(offset int, limit int) ([]*model.Team, *model.AppError) {
return a.Srv.Store.Team().GetAllTeamPageListing(offset, limit)
return a.Srv().Store.Team().GetAllTeamPageListing(offset, limit)
}
func (a *App) GetAllPublicTeamsPageWithCount(offset int, limit int) (*model.TeamsWithCount, *model.AppError) {
totalCount, err := a.Srv.Store.Team().AnalyticsPublicTeamCount()
totalCount, err := a.Srv().Store.Team().AnalyticsPublicTeamCount()
if err != nil {
return nil, err
}
teams, err := a.Srv.Store.Team().GetAllPublicTeamPageListing(offset, limit)
teams, err := a.Srv().Store.Team().GetAllPublicTeamPageListing(offset, limit)
if err != nil {
return nil, err
}
@@ -733,42 +733,42 @@ func (a *App) GetAllPublicTeamsPageWithCount(offset int, limit int) (*model.Team
// SearchAllTeams returns a team list and the total count of the results
func (a *App) SearchAllTeams(searchOpts *model.TeamSearch) ([]*model.Team, int64, *model.AppError) {
if searchOpts.IsPaginated() {
return a.Srv.Store.Team().SearchAllPaged(searchOpts.Term, *searchOpts.Page, *searchOpts.PerPage)
return a.Srv().Store.Team().SearchAllPaged(searchOpts.Term, *searchOpts.Page, *searchOpts.PerPage)
}
results, err := a.Srv.Store.Team().SearchAll(searchOpts.Term)
results, err := a.Srv().Store.Team().SearchAll(searchOpts.Term)
return results, int64(len(results)), err
}
func (a *App) SearchPublicTeams(term string) ([]*model.Team, *model.AppError) {
return a.Srv.Store.Team().SearchOpen(term)
return a.Srv().Store.Team().SearchOpen(term)
}
func (a *App) SearchPrivateTeams(term string) ([]*model.Team, *model.AppError) {
return a.Srv.Store.Team().SearchPrivate(term)
return a.Srv().Store.Team().SearchPrivate(term)
}
func (a *App) GetTeamsForUser(userId string) ([]*model.Team, *model.AppError) {
return a.Srv.Store.Team().GetTeamsByUserId(userId)
return a.Srv().Store.Team().GetTeamsByUserId(userId)
}
func (a *App) GetTeamMember(teamId, userId string) (*model.TeamMember, *model.AppError) {
return a.Srv.Store.Team().GetMember(teamId, userId)
return a.Srv().Store.Team().GetMember(teamId, userId)
}
func (a *App) GetTeamMembersForUser(userId string) ([]*model.TeamMember, *model.AppError) {
return a.Srv.Store.Team().GetTeamsForUser(userId)
return a.Srv().Store.Team().GetTeamsForUser(userId)
}
func (a *App) GetTeamMembersForUserWithPagination(userId string, page, perPage int) ([]*model.TeamMember, *model.AppError) {
return a.Srv.Store.Team().GetTeamsForUserWithPagination(userId, page, perPage)
return a.Srv().Store.Team().GetTeamsForUserWithPagination(userId, page, perPage)
}
func (a *App) GetTeamMembers(teamId string, offset int, limit int, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError) {
return a.Srv.Store.Team().GetMembers(teamId, offset, limit, restrictions)
return a.Srv().Store.Team().GetMembers(teamId, offset, limit, restrictions)
}
func (a *App) GetTeamMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError) {
return a.Srv.Store.Team().GetMembersByIds(teamId, userIds, restrictions)
return a.Srv().Store.Team().GetMembersByIds(teamId, userIds, restrictions)
}
func (a *App) AddTeamMember(teamId, userId string) (*model.TeamMember, *model.AppError) {
@@ -854,7 +854,7 @@ func (a *App) AddTeamMemberByInviteId(inviteId, userId string) (*model.TeamMembe
}
func (a *App) GetTeamUnread(teamId, userId string) (*model.TeamUnread, *model.AppError) {
channelUnreads, err := a.Srv.Store.Team().GetChannelUnreadsForTeam(teamId, userId)
channelUnreads, err := a.Srv().Store.Team().GetChannelUnreadsForTeam(teamId, userId)
if err != nil {
return nil, err
}
@@ -879,14 +879,14 @@ func (a *App) GetTeamUnread(teamId, userId string) (*model.TeamUnread, *model.Ap
func (a *App) RemoveUserFromTeam(teamId string, userId string, requestorId string) *model.AppError {
tchan := make(chan store.StoreResult, 1)
go func() {
team, err := a.Srv.Store.Team().Get(teamId)
team, err := a.Srv().Store.Team().Get(teamId)
tchan <- store.StoreResult{Data: team, Err: err}
close(tchan)
}()
uchan := make(chan store.StoreResult, 1)
go func() {
user, err := a.Srv.Store.User().Get(userId)
user, err := a.Srv().Store.User().Get(userId)
uchan <- store.StoreResult{Data: user, Err: err}
close(uchan)
}()
@@ -917,7 +917,7 @@ func (a *App) RemoveTeamMemberFromTeam(teamMember *model.TeamMember, requestorId
message.Add("team_id", teamMember.TeamId)
a.Publish(message)
user, err := a.Srv.Store.User().Get(teamMember.UserId)
user, err := a.Srv().Store.User().Get(teamMember.UserId)
if err != nil {
return err
}
@@ -925,7 +925,7 @@ func (a *App) RemoveTeamMemberFromTeam(teamMember *model.TeamMember, requestorId
teamMember.Roles = ""
teamMember.DeleteAt = model.GetMillis()
if _, err := a.Srv.Store.Team().UpdateMember(teamMember); err != nil {
if _, err := a.Srv().Store.Team().UpdateMember(teamMember); err != nil {
return err
}
@@ -935,7 +935,7 @@ func (a *App) RemoveTeamMemberFromTeam(teamMember *model.TeamMember, requestorId
actor, _ = a.GetUser(requestorId)
}
a.Srv.Go(func() {
a.Srv().Go(func() {
pluginContext := a.PluginContext()
pluginsEnvironment.RunMultiPluginHook(func(hooks plugin.Hooks) bool {
hooks.UserHasLeftTeam(pluginContext, teamMember, actor)
@@ -944,21 +944,21 @@ func (a *App) RemoveTeamMemberFromTeam(teamMember *model.TeamMember, requestorId
})
}
esInterface := a.Elasticsearch
esInterface := a.Elasticsearch()
if esInterface != nil && *a.Config().ElasticsearchSettings.EnableIndexing {
a.Srv.Go(func() {
a.Srv().Go(func() {
if err := a.indexUser(user); err != nil {
mlog.Error("Encountered error indexing user", mlog.String("user_id", user.Id), mlog.Err(err))
}
})
}
if _, err := a.Srv.Store.User().UpdateUpdateAt(user.Id); err != nil {
if _, err := a.Srv().Store.User().UpdateUpdateAt(user.Id); err != nil {
return err
}
// delete the preferences that set the last channel used in the team and other team specific preferences
if err := a.Srv.Store.Preference().DeleteCategory(user.Id, teamMember.TeamId); err != nil {
if err := a.Srv().Store.Preference().DeleteCategory(user.Id, teamMember.TeamId); err != nil {
return err
}
@@ -977,7 +977,7 @@ func (a *App) LeaveTeam(team *model.Team, user *model.User, requestorId string)
var channelList *model.ChannelList
if channelList, err = a.Srv.Store.Channel().GetChannels(team.Id, user.Id, true); err != nil {
if channelList, err = a.Srv().Store.Channel().GetChannels(team.Id, user.Id, true); err != nil {
if err.Id == "store.sql_channel.get_channels.not_found.app_error" {
channelList = &model.ChannelList{}
} else {
@@ -988,13 +988,13 @@ func (a *App) LeaveTeam(team *model.Team, user *model.User, requestorId string)
for _, channel := range *channelList {
if !channel.IsGroupOrDirect() {
a.InvalidateCacheForChannelMembers(channel.Id)
if err = a.Srv.Store.Channel().RemoveMember(channel.Id, user.Id); err != nil {
if err = a.Srv().Store.Channel().RemoveMember(channel.Id, user.Id); err != nil {
return err
}
}
}
channel, err := a.Srv.Store.Channel().GetByName(team.Id, model.DEFAULT_CHANNEL, false)
channel, err := a.Srv().Store.Channel().GetByName(team.Id, model.DEFAULT_CHANNEL, false)
if err != nil {
return err
}
@@ -1058,14 +1058,14 @@ func (a *App) postRemoveFromTeamMessage(user *model.User, channel *model.Channel
func (a *App) prepareInviteNewUsersToTeam(teamId, senderId string) (*model.User, *model.Team, *model.AppError) {
tchan := make(chan store.StoreResult, 1)
go func() {
team, err := a.Srv.Store.Team().Get(teamId)
team, err := a.Srv().Store.Team().Get(teamId)
tchan <- store.StoreResult{Data: team, Err: err}
close(tchan)
}()
uchan := make(chan store.StoreResult, 1)
go func() {
user, err := a.Srv.Store.User().Get(senderId)
user, err := a.Srv().Store.User().Get(senderId)
uchan <- store.StoreResult{Data: user, Err: err}
close(uchan)
}()
@@ -1129,19 +1129,19 @@ func (a *App) prepareInviteGuestsToChannels(teamId string, guestsInvite *model.G
tchan := make(chan store.StoreResult, 1)
go func() {
team, err := a.Srv.Store.Team().Get(teamId)
team, err := a.Srv().Store.Team().Get(teamId)
tchan <- store.StoreResult{Data: team, Err: err}
close(tchan)
}()
cchan := make(chan store.StoreResult, 1)
go func() {
channels, err := a.Srv.Store.Channel().GetChannelsByIds(guestsInvite.Channels)
channels, err := a.Srv().Store.Channel().GetChannelsByIds(guestsInvite.Channels)
cchan <- store.StoreResult{Data: channels, Err: err}
close(cchan)
}()
uchan := make(chan store.StoreResult, 1)
go func() {
user, err := a.Srv.Store.User().Get(senderId)
user, err := a.Srv().Store.User().Get(senderId)
uchan <- store.StoreResult{Data: user, Err: err}
close(uchan)
}()
@@ -1271,14 +1271,14 @@ func (a *App) InviteGuestsToChannels(teamId string, guestsInvite *model.GuestsIn
}
func (a *App) FindTeamByName(name string) bool {
if _, err := a.Srv.Store.Team().GetByName(name); err != nil {
if _, err := a.Srv().Store.Team().GetByName(name); err != nil {
return false
}
return true
}
func (a *App) GetTeamsUnreadForUser(excludeTeamId string, userId string) ([]*model.TeamUnread, *model.AppError) {
data, err := a.Srv.Store.Team().GetChannelUnreadsForAllTeams(excludeTeamId, userId)
data, err := a.Srv().Store.Team().GetChannelUnreadsForAllTeams(excludeTeamId, userId)
if err != nil {
return nil, err
}
@@ -1326,11 +1326,11 @@ func (a *App) PermanentDeleteTeamId(teamId string) *model.AppError {
func (a *App) PermanentDeleteTeam(team *model.Team) *model.AppError {
team.DeleteAt = model.GetMillis()
if _, err := a.Srv.Store.Team().Update(team); err != nil {
if _, err := a.Srv().Store.Team().Update(team); err != nil {
return err
}
if channels, err := a.Srv.Store.Channel().GetTeamChannels(team.Id); err != nil {
if channels, err := a.Srv().Store.Channel().GetTeamChannels(team.Id); err != nil {
if err.Id != "store.sql_channel.get_channels.not_found.app_error" {
return err
}
@@ -1340,15 +1340,15 @@ func (a *App) PermanentDeleteTeam(team *model.Team) *model.AppError {
}
}
if err := a.Srv.Store.Team().RemoveAllMembersByTeam(team.Id); err != nil {
if err := a.Srv().Store.Team().RemoveAllMembersByTeam(team.Id); err != nil {
return err
}
if err := a.Srv.Store.Command().PermanentDeleteByTeam(team.Id); err != nil {
if err := a.Srv().Store.Command().PermanentDeleteByTeam(team.Id); err != nil {
return err
}
if err := a.Srv.Store.Team().PermanentDelete(team.Id); err != nil {
if err := a.Srv().Store.Team().PermanentDelete(team.Id); err != nil {
return err
}
@@ -1364,7 +1364,7 @@ func (a *App) SoftDeleteTeam(teamId string) *model.AppError {
}
team.DeleteAt = model.GetMillis()
if team, err = a.Srv.Store.Team().Update(team); err != nil {
if team, err = a.Srv().Store.Team().Update(team); err != nil {
return err
}
@@ -1380,7 +1380,7 @@ func (a *App) RestoreTeam(teamId string) *model.AppError {
}
team.DeleteAt = 0
if team, err = a.Srv.Store.Team().Update(team); err != nil {
if team, err = a.Srv().Store.Team().Update(team); err != nil {
return err
}
@@ -1391,13 +1391,13 @@ func (a *App) RestoreTeam(teamId string) *model.AppError {
func (a *App) GetTeamStats(teamId string, restrictions *model.ViewUsersRestrictions) (*model.TeamStats, *model.AppError) {
tchan := make(chan store.StoreResult, 1)
go func() {
totalMemberCount, err := a.Srv.Store.Team().GetTotalMemberCount(teamId, restrictions)
totalMemberCount, err := a.Srv().Store.Team().GetTotalMemberCount(teamId, restrictions)
tchan <- store.StoreResult{Data: totalMemberCount, Err: err}
close(tchan)
}()
achan := make(chan store.StoreResult, 1)
go func() {
memberCount, err := a.Srv.Store.Team().GetActiveMemberCount(teamId, restrictions)
memberCount, err := a.Srv().Store.Team().GetActiveMemberCount(teamId, restrictions)
achan <- store.StoreResult{Data: memberCount, Err: err}
close(achan)
}()
@@ -1425,7 +1425,7 @@ func (a *App) GetTeamIdFromQuery(query url.Values) (string, *model.AppError) {
inviteId := query.Get("id")
if len(tokenId) > 0 {
token, err := a.Srv.Store.Token().GetByToken(tokenId)
token, err := a.Srv().Store.Token().GetByToken(tokenId)
if err != nil {
return "", model.NewAppError("GetTeamIdFromQuery", "api.oauth.singup_with_oauth.invalid_link.app_error", nil, "", http.StatusBadRequest)
}
@@ -1444,7 +1444,7 @@ func (a *App) GetTeamIdFromQuery(query url.Values) (string, *model.AppError) {
return tokenData["teamId"], nil
}
if len(inviteId) > 0 {
team, err := a.Srv.Store.Team().GetByInviteId(inviteId)
team, err := a.Srv().Store.Team().GetByInviteId(inviteId)
if err == nil {
return team.Id, nil
}
@@ -1556,7 +1556,7 @@ func (a *App) SetTeamIconFromFile(team *model.Team, file io.Reader) *model.AppEr
curTime := model.GetMillis()
if err := a.Srv.Store.Team().UpdateLastTeamIconUpdate(team.Id, curTime); err != nil {
if err := a.Srv().Store.Team().UpdateLastTeamIconUpdate(team.Id, curTime); err != nil {
return model.NewAppError("SetTeamIcon", "api.team.team_icon.update.app_error", nil, err.Error(), http.StatusBadRequest)
}
@@ -1574,7 +1574,7 @@ func (a *App) RemoveTeamIcon(teamId string) *model.AppError {
return model.NewAppError("RemoveTeamIcon", "api.team.remove_team_icon.get_team.app_error", nil, err.Error(), http.StatusBadRequest)
}
if err := a.Srv.Store.Team().UpdateLastTeamIconUpdate(teamId, 0); err != nil {
if err := a.Srv().Store.Team().UpdateLastTeamIconUpdate(teamId, 0); err != nil {
return model.NewAppError("RemoveTeamIcon", "api.team.team_icon.update.app_error", nil, err.Error(), http.StatusBadRequest)
}
@@ -1586,10 +1586,10 @@ func (a *App) RemoveTeamIcon(teamId string) *model.AppError {
}
func (a *App) InvalidateAllEmailInvites() *model.AppError {
if err := a.Srv.Store.Token().RemoveAllTokensByType(TOKEN_TYPE_TEAM_INVITATION); err != nil {
if err := a.Srv().Store.Token().RemoveAllTokensByType(TOKEN_TYPE_TEAM_INVITATION); err != nil {
return model.NewAppError("InvalidateAllEmailInvites", "api.team.invalidate_all_email_invites.app_error", nil, err.Error(), http.StatusBadRequest)
}
if err := a.Srv.Store.Token().RemoveAllTokensByType(TOKEN_TYPE_GUEST_INVITATION); err != nil {
if err := a.Srv().Store.Token().RemoveAllTokensByType(TOKEN_TYPE_GUEST_INVITATION); err != nil {
return model.NewAppError("InvalidateAllEmailInvites", "api.team.invalidate_all_email_invites.app_error", nil, err.Error(), http.StatusBadRequest)
}
return nil
@@ -1600,9 +1600,9 @@ func (a *App) ClearTeamMembersCache(teamID string) {
page := 0
for {
teamMembers, err := a.Srv.Store.Team().GetMembers(teamID, page, perPage, &model.ViewUsersRestrictions{})
teamMembers, err := a.Srv().Store.Team().GetMembers(teamID, page, perPage, &model.ViewUsersRestrictions{})
if err != nil {
a.Log.Warn("error clearing cache for team members", mlog.String("team_id", teamID))
a.Log().Warn("error clearing cache for team members", mlog.String("team_id", teamID))
break
}