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

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

Browse Source 
* Generate and use an interface instead of *App
This commit is contained in:
Eli Yukelzon
2020-02-13 13:26:58 +01:00
committed by GitHub
parent 66fc096768
commit 17523fa5d9
200 changed files with 4553 additions and 2361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/syncables.go
View File

@@ -38,7 +38,7 @@ func (a *App) createDefaultChannelMemberships(since int64, channelID *string) er
if err != nil {
return err
}
a.Log.Info("added teammember",
a.Log().Info("added teammember",
mlog.String("user_id", userChannel.UserID),
mlog.String("team_id", channel.TeamId),
)
@@ -47,7 +47,7 @@ func (a *App) createDefaultChannelMemberships(since int64, channelID *string) er
_, err = a.AddChannelMember(userChannel.UserID, channel, "", "")
if err != nil {
if err.Id == "api.channel.add_user.to.channel.failed.deleted.app_error" {
a.Log.Info("Not adding user to channel because they have already left the team",
a.Log().Info("Not adding user to channel because they have already left the team",
mlog.String("user_id", userChannel.UserID),
mlog.String("channel_id", userChannel.ChannelID),
)
@@ -56,7 +56,7 @@ func (a *App) createDefaultChannelMemberships(since int64, channelID *string) er
}
}
a.Log.Info("added channelmember",
a.Log().Info("added channelmember",
mlog.String("user_id", userChannel.UserID),
mlog.String("channel_id", userChannel.ChannelID),
)
@@ -80,7 +80,7 @@ func (a *App) createDefaultTeamMemberships(since int64, teamID *string) error {
return err
}
a.Log.Info("added teammember",
a.Log().Info("added teammember",
mlog.String("user_id", userTeam.UserID),
mlog.String("team_id", userTeam.TeamID),
)
@@ -136,7 +136,7 @@ func (a *App) deleteGroupConstrainedTeamMemberships(teamID *string) error {
return err
}
a.Log.Info("removed teammember",
a.Log().Info("removed teammember",
mlog.String("user_id", userTeam.UserId),
mlog.String("team_id", userTeam.TeamId),
)
@@ -165,7 +165,7 @@ func (a *App) deleteGroupConstrainedChannelMemberships(channelID *string) error
return err
}
a.Log.Info("removed channelmember",
a.Log().Info("removed channelmember",
mlog.String("user_id", userChannel.UserId),
mlog.String("channel_id", channel.Id),
)
@@ -178,12 +178,12 @@ func (a *App) deleteGroupConstrainedChannelMemberships(channelID *string) error
// the member's group memberships and the configuration of those groups to the syncable. This method should only
// be invoked on group-synced (aka group-constrained) syncables.
func (a *App) SyncSyncableRoles(syncableID string, syncableType model.GroupSyncableType) *model.AppError {
permittedAdmins, err := a.Srv.Store.Group().PermittedSyncableAdmins(syncableID, syncableType)
permittedAdmins, err := a.Srv().Store.Group().PermittedSyncableAdmins(syncableID, syncableType)
if err != nil {
return err
}
a.Log.Info(
a.Log().Info(
fmt.Sprintf("Permitted admins for %s", syncableType),
mlog.String(strings.ToLower(fmt.Sprintf("%s_id", syncableType)), syncableID),
mlog.Any("permitted_admins", permittedAdmins),
@@ -193,9 +193,9 @@ func (a *App) SyncSyncableRoles(syncableID string, syncableType model.GroupSynca
switch syncableType {
case model.GroupSyncableTypeTeam:
updateFunc = a.Srv.Store.Team().UpdateMembersRole
updateFunc = a.Srv().Store.Team().UpdateMembersRole
case model.GroupSyncableTypeChannel:
updateFunc = a.Srv.Store.Channel().UpdateMembersRole
updateFunc = a.Srv().Store.Channel().UpdateMembersRole
default:
return model.NewAppError("App.SyncSyncableRoles", "groups.unsupported_syncable_type", map[string]interface{}{"Value": syncableType}, "", http.StatusInternalServerError)
}
@@ -213,7 +213,7 @@ func (a *App) SyncSyncableRoles(syncableID string, syncableType model.GroupSynca
func (a *App) SyncRolesAndMembership(syncableID string, syncableType model.GroupSyncableType) {
a.SyncSyncableRoles(syncableID, syncableType)
lastJob, _ := a.Srv.Store.Job().GetNewestJobByStatusAndType(model.JOB_STATUS_SUCCESS, model.JOB_TYPE_LDAP_SYNC)
lastJob, _ := a.Srv().Store.Job().GetNewestJobByStatusAndType(model.JOB_STATUS_SUCCESS, model.JOB_TYPE_LDAP_SYNC)
var since int64
if lastJob != nil {
since = lastJob.StartAt