Removing all FakeApp usages (#14174)
* Removing some other fake apps * More FakeApp removed * Removing entirely FakeApp * Fixing some tests * Fixing get Cluster id from get plugin status * Fixing failing tests * Fixing tests * Fixing test initialization for web * Fixing InitServer for server tests * Fixing InitServer for server tests * Reverting go.sum and go.mod * Removing unneded HTMLTemplates function in App layer * Moving back some functions to its old place to easy the review * Moving back some functions to its old place to easy the review * Using the last struct2interface version * Generating store layers * Fixing merge problems * Addressing PR comments * Small fix * Fixing app tests build * Fixing tests * fixing tests * Fix tests * Fixing tests * Fixing tests * Fixing tests * Moving license to server struct * Adding some fixes to the test compilation * Fixing cluster and some jobs initialization * Fixing some license tests compilation problems * Fixing recursive cache invalidation * Regenerating app layers * Fix test compilation Co-authored-by: mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
f3ac33e6dc
Коммит
f5eab1271b
@@ -33,12 +33,16 @@ func (a *App) GetSchemesPage(scope string, page int, perPage int) ([]*model.Sche
|
||||
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 {
|
||||
func (s *Server) GetSchemes(scope string, offset int, limit int) ([]*model.Scheme, *model.AppError) {
|
||||
if err := s.IsPhase2MigrationCompleted(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return a.Srv().Store.Scheme().GetAllPage(scope, offset, limit)
|
||||
return s.Store.Scheme().GetAllPage(scope, offset, limit)
|
||||
}
|
||||
|
||||
func (a *App) GetSchemes(scope string, offset int, limit int) ([]*model.Scheme, *model.AppError) {
|
||||
return a.Srv().GetSchemes(scope, offset, limit)
|
||||
}
|
||||
|
||||
func (a *App) CreateScheme(scheme *model.Scheme) (*model.Scheme, *model.AppError) {
|
||||
@@ -125,20 +129,24 @@ func (a *App) GetChannelsForScheme(scheme *model.Scheme, offset int, limit int)
|
||||
return a.Srv().Store.Channel().GetChannelsByScheme(scheme.Id, offset, limit)
|
||||
}
|
||||
|
||||
func (a *App) IsPhase2MigrationCompleted() *model.AppError {
|
||||
if a.Srv().phase2PermissionsMigrationComplete {
|
||||
func (s *Server) IsPhase2MigrationCompleted() *model.AppError {
|
||||
if s.phase2PermissionsMigrationComplete {
|
||||
return nil
|
||||
}
|
||||
|
||||
if _, err := a.Srv().Store.System().GetByName(model.MIGRATION_KEY_ADVANCED_PERMISSIONS_PHASE_2); err != nil {
|
||||
if _, err := s.Store.System().GetByName(model.MIGRATION_KEY_ADVANCED_PERMISSIONS_PHASE_2); err != nil {
|
||||
return model.NewAppError("App.IsPhase2MigrationCompleted", "app.schemes.is_phase_2_migration_completed.not_completed.app_error", nil, err.Error(), http.StatusNotImplemented)
|
||||
}
|
||||
|
||||
a.Srv().phase2PermissionsMigrationComplete = true
|
||||
s.phase2PermissionsMigrationComplete = true
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a *App) IsPhase2MigrationCompleted() *model.AppError {
|
||||
return a.Srv().IsPhase2MigrationCompleted()
|
||||
}
|
||||
|
||||
func (a *App) SchemesIterator(scope string, batchSize int) func() []*model.Scheme {
|
||||
offset := 0
|
||||
return func() []*model.Scheme {
|
||||
|
||||
Ссылка в новой задаче
Block a user