From 1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 6 Sep 2017 17:12:54 -0500 Subject: app type transition (#7167) --- app/compliance.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'app/compliance.go') diff --git a/app/compliance.go b/app/compliance.go index 9c6d8985b..b6317fa1e 100644 --- a/app/compliance.go +++ b/app/compliance.go @@ -6,32 +6,33 @@ package app import ( "io/ioutil" + "net/http" + "github.com/mattermost/platform/einterfaces" "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" - "net/http" ) -func GetComplianceReports(page, perPage int) (model.Compliances, *model.AppError) { +func (a *App) GetComplianceReports(page, perPage int) (model.Compliances, *model.AppError) { if !*utils.Cfg.ComplianceSettings.Enable || !utils.IsLicensed() || !*utils.License().Features.Compliance { return nil, model.NewAppError("GetComplianceReports", "ent.compliance.licence_disable.app_error", nil, "", http.StatusNotImplemented) } - if result := <-Srv.Store.Compliance().GetAll(page*perPage, perPage); result.Err != nil { + if result := <-a.Srv.Store.Compliance().GetAll(page*perPage, perPage); result.Err != nil { return nil, result.Err } else { return result.Data.(model.Compliances), nil } } -func SaveComplianceReport(job *model.Compliance) (*model.Compliance, *model.AppError) { +func (a *App) SaveComplianceReport(job *model.Compliance) (*model.Compliance, *model.AppError) { if !*utils.Cfg.ComplianceSettings.Enable || !utils.IsLicensed() || !*utils.License().Features.Compliance || einterfaces.GetComplianceInterface() == nil { return nil, model.NewAppError("saveComplianceReport", "ent.compliance.licence_disable.app_error", nil, "", http.StatusNotImplemented) } job.Type = model.COMPLIANCE_TYPE_ADHOC - if result := <-Srv.Store.Compliance().Save(job); result.Err != nil { + if result := <-a.Srv.Store.Compliance().Save(job); result.Err != nil { return nil, result.Err } else { job = result.Data.(*model.Compliance) @@ -41,12 +42,12 @@ func SaveComplianceReport(job *model.Compliance) (*model.Compliance, *model.AppE return job, nil } -func GetComplianceReport(reportId string) (*model.Compliance, *model.AppError) { +func (a *App) GetComplianceReport(reportId string) (*model.Compliance, *model.AppError) { if !*utils.Cfg.ComplianceSettings.Enable || !utils.IsLicensed() || !*utils.License().Features.Compliance || einterfaces.GetComplianceInterface() == nil { return nil, model.NewAppError("downloadComplianceReport", "ent.compliance.licence_disable.app_error", nil, "", http.StatusNotImplemented) } - if result := <-Srv.Store.Compliance().Get(reportId); result.Err != nil { + if result := <-a.Srv.Store.Compliance().Get(reportId); result.Err != nil { return nil, result.Err } else { return result.Data.(*model.Compliance), nil -- cgit v1.2.3-1-g7c22