diff options
author | George Goldberg <george@gberg.me> | 2017-09-18 18:31:31 +0100 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-09-18 13:31:31 -0400 |
commit | 61d0078e0adade4d3670dd25975529a5f0c3bc98 (patch) | |
tree | 2f73586ec1955eedad424719f18517043ba70109 /store/sql_compliance_store.go | |
parent | 29e917486af2ff26b85c56b3323ca2fbc7309352 (diff) | |
download | chat-61d0078e0adade4d3670dd25975529a5f0c3bc98.tar.gz chat-61d0078e0adade4d3670dd25975529a5f0c3bc98.tar.bz2 chat-61d0078e0adade4d3670dd25975529a5f0c3bc98.zip |
Add error codes to the remaining stores (Part 2). (#7462)
Diffstat (limited to 'store/sql_compliance_store.go')
-rw-r--r-- | store/sql_compliance_store.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/store/sql_compliance_store.go b/store/sql_compliance_store.go index 9c1c7dc90..73015d47f 100644 --- a/store/sql_compliance_store.go +++ b/store/sql_compliance_store.go @@ -4,6 +4,7 @@ package store import ( + "net/http" "strconv" "strings" @@ -49,7 +50,7 @@ func (s SqlComplianceStore) Save(compliance *model.Compliance) StoreChannel { } if err := s.GetMaster().Insert(compliance); err != nil { - result.Err = model.NewLocAppError("SqlComplianceStore.Save", "store.sql_compliance.save.saving.app_error", nil, err.Error()) + result.Err = model.NewAppError("SqlComplianceStore.Save", "store.sql_compliance.save.saving.app_error", nil, err.Error(), http.StatusInternalServerError) } else { result.Data = compliance } @@ -75,7 +76,7 @@ func (us SqlComplianceStore) Update(compliance *model.Compliance) StoreChannel { } if _, err := us.GetMaster().Update(compliance); err != nil { - result.Err = model.NewLocAppError("SqlComplianceStore.Update", "store.sql_compliance.save.saving.app_error", nil, err.Error()) + result.Err = model.NewAppError("SqlComplianceStore.Update", "store.sql_compliance.save.saving.app_error", nil, err.Error(), http.StatusInternalServerError) } else { result.Data = compliance } @@ -98,7 +99,7 @@ func (s SqlComplianceStore) GetAll(offset, limit int) StoreChannel { var compliances model.Compliances if _, err := s.GetReplica().Select(&compliances, query, map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil { - result.Err = model.NewLocAppError("SqlComplianceStore.Get", "store.sql_compliance.get.finding.app_error", nil, err.Error()) + result.Err = model.NewAppError("SqlComplianceStore.Get", "store.sql_compliance.get.finding.app_error", nil, err.Error(), http.StatusInternalServerError) } else { result.Data = compliances } @@ -118,9 +119,9 @@ func (us SqlComplianceStore) Get(id string) StoreChannel { result := StoreResult{} if obj, err := us.GetReplica().Get(model.Compliance{}, id); err != nil { - result.Err = model.NewLocAppError("SqlComplianceStore.Get", "store.sql_compliance.get.finding.app_error", nil, err.Error()) + result.Err = model.NewAppError("SqlComplianceStore.Get", "store.sql_compliance.get.finding.app_error", nil, err.Error(), http.StatusInternalServerError) } else if obj == nil { - result.Err = model.NewLocAppError("SqlComplianceStore.Get", "store.sql_compliance.get.finding.app_error", nil, err.Error()) + result.Err = model.NewAppError("SqlComplianceStore.Get", "store.sql_compliance.get.finding.app_error", nil, err.Error(), http.StatusNotFound) } else { result.Data = obj.(*model.Compliance) } @@ -252,7 +253,7 @@ func (s SqlComplianceStore) ComplianceExport(job *model.Compliance) StoreChannel var cposts []*model.CompliancePost if _, err := s.GetReplica().Select(&cposts, query, props); err != nil { - result.Err = model.NewLocAppError("SqlPostStore.ComplianceExport", "store.sql_post.compliance_export.app_error", nil, err.Error()) + result.Err = model.NewAppError("SqlPostStore.ComplianceExport", "store.sql_post.compliance_export.app_error", nil, err.Error(), http.StatusInternalServerError) } else { result.Data = cposts } |