Migrating compliance store to sync by default (#10660)
* Migrating compliance store to sync by default * Addressing PR review comments
Этот коммит содержится в:
коммит произвёл
Miguel de la Cruz
родитель
4ae38d00a8
Коммит
7c7ff93d97
@@ -16,11 +16,7 @@ func (a *App) GetComplianceReports(page, perPage int) (model.Compliances, *model
|
||||
return nil, model.NewAppError("GetComplianceReports", "ent.compliance.licence_disable.app_error", nil, "", http.StatusNotImplemented)
|
||||
}
|
||||
|
||||
result := <-a.Srv.Store.Compliance().GetAll(page*perPage, perPage)
|
||||
if result.Err != nil {
|
||||
return nil, result.Err
|
||||
}
|
||||
return result.Data.(model.Compliances), nil
|
||||
return a.Srv.Store.Compliance().GetAll(page*perPage, perPage)
|
||||
}
|
||||
|
||||
func (a *App) SaveComplianceReport(job *model.Compliance) (*model.Compliance, *model.AppError) {
|
||||
@@ -30,12 +26,11 @@ func (a *App) SaveComplianceReport(job *model.Compliance) (*model.Compliance, *m
|
||||
|
||||
job.Type = model.COMPLIANCE_TYPE_ADHOC
|
||||
|
||||
result := <-a.Srv.Store.Compliance().Save(job)
|
||||
if result.Err != nil {
|
||||
return nil, result.Err
|
||||
job, err := a.Srv.Store.Compliance().Save(job)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
job = result.Data.(*model.Compliance)
|
||||
a.Srv.Go(func() {
|
||||
a.Compliance.RunComplianceJob(job)
|
||||
})
|
||||
@@ -48,11 +43,7 @@ func (a *App) GetComplianceReport(reportId string) (*model.Compliance, *model.Ap
|
||||
return nil, model.NewAppError("downloadComplianceReport", "ent.compliance.licence_disable.app_error", nil, "", http.StatusNotImplemented)
|
||||
}
|
||||
|
||||
result := <-a.Srv.Store.Compliance().Get(reportId)
|
||||
if result.Err != nil {
|
||||
return nil, result.Err
|
||||
}
|
||||
return result.Data.(*model.Compliance), nil
|
||||
return a.Srv.Store.Compliance().Get(reportId)
|
||||
}
|
||||
|
||||
func (a *App) GetComplianceFile(job *model.Compliance) ([]byte, *model.AppError) {
|
||||
|
||||
Ссылка в новой задаче
Block a user