diff options
author | George Goldberg <george@gberg.me> | 2018-05-17 12:48:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-17 12:48:18 +0100 |
commit | c2ab85e0a36af24ee804c1d140cfe216022a4e45 (patch) | |
tree | 184c7e5c90518d1581f13fc18d10a42481114d4d /app | |
parent | b9b76b275ac4670dc400357795cd1a45e425eba1 (diff) | |
download | chat-c2ab85e0a36af24ee804c1d140cfe216022a4e45.tar.gz chat-c2ab85e0a36af24ee804c1d140cfe216022a4e45.tar.bz2 chat-c2ab85e0a36af24ee804c1d140cfe216022a4e45.zip |
MM-10591: Well known error for all scheme endpoints pre-migration. (#8812)
Diffstat (limited to 'app')
-rw-r--r-- | app/scheme.go | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/app/scheme.go b/app/scheme.go index a8eb9ef46..f1dc256b2 100644 --- a/app/scheme.go +++ b/app/scheme.go @@ -5,9 +5,14 @@ package app import ( "github.com/mattermost/mattermost-server/model" + "net/http" ) func (a *App) GetScheme(id string) (*model.Scheme, *model.AppError) { + if err := a.IsPhase2MigrationCompleted(); err != nil { + return nil, err + } + if result := <-a.Srv.Store.Scheme().Get(id); result.Err != nil { return nil, result.Err } else { @@ -16,10 +21,18 @@ func (a *App) GetScheme(id string) (*model.Scheme, *model.AppError) { } func (a *App) GetSchemesPage(scope string, page int, perPage int) ([]*model.Scheme, *model.AppError) { + if err := a.IsPhase2MigrationCompleted(); err != nil { + return nil, err + } + return a.GetSchemes(scope, page*perPage, perPage) } func (a *App) GetSchemes(scope string, offset int, limit int) ([]*model.Scheme, *model.AppError) { + if err := a.IsPhase2MigrationCompleted(); err != nil { + return nil, err + } + if result := <-a.Srv.Store.Scheme().GetAllPage(scope, offset, limit); result.Err != nil { return nil, result.Err } else { @@ -87,10 +100,18 @@ func (a *App) DeleteScheme(schemeId string) (*model.Scheme, *model.AppError) { } func (a *App) GetTeamsForSchemePage(scheme *model.Scheme, page int, perPage int) ([]*model.Team, *model.AppError) { + if err := a.IsPhase2MigrationCompleted(); err != nil { + return nil, err + } + return a.GetTeamsForScheme(scheme, page*perPage, perPage) } func (a *App) GetTeamsForScheme(scheme *model.Scheme, offset int, limit int) ([]*model.Team, *model.AppError) { + if err := a.IsPhase2MigrationCompleted(); err != nil { + return nil, err + } + if result := <-a.Srv.Store.Team().GetTeamsByScheme(scheme.Id, offset, limit); result.Err != nil { return nil, result.Err } else { @@ -99,10 +120,18 @@ func (a *App) GetTeamsForScheme(scheme *model.Scheme, offset int, limit int) ([] } func (a *App) GetChannelsForSchemePage(scheme *model.Scheme, page int, perPage int) (model.ChannelList, *model.AppError) { + if err := a.IsPhase2MigrationCompleted(); err != nil { + return nil, err + } + return a.GetChannelsForScheme(scheme, page*perPage, perPage) } func (a *App) GetChannelsForScheme(scheme *model.Scheme, offset int, limit int) (model.ChannelList, *model.AppError) { + if err := a.IsPhase2MigrationCompleted(); err != nil { + return nil, err + } + if result := <-a.Srv.Store.Channel().GetChannelsByScheme(scheme.Id, offset, limit); result.Err != nil { return nil, result.Err } else { @@ -112,7 +141,7 @@ func (a *App) GetChannelsForScheme(scheme *model.Scheme, offset int, limit int) func (a *App) IsPhase2MigrationCompleted() *model.AppError { if result := <-a.Srv.Store.System().GetByName(model.MIGRATION_KEY_ADVANCED_PERMISSIONS_PHASE_2); result.Err != nil { - return result.Err + return model.NewAppError("App.IsPhase2MigrationCompleted", "app.schemes.is_phase_2_migration_completed.not_completed.app_error", nil, result.Err.Error(), http.StatusNotImplemented) } return nil |