SqlTermsOfService migrates to plain errors (#14675)

* Advances migragint TermsOfService

* Advances...

* Replaced message key

* Replaced message key

* Replaced message key

* Replaced message key

* Refactor name of errors

* Fix mixed type of error

* Fix-imports

* i18n-extract

* Rollback changes

* Rollback changes

* Rollback changes

Co-authored-by: mattermod <mattermod@users.noreply.github.com>

app/config.go

@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	ERROR_TERMS_OF_SERVICE_NO_ROWS_FOUND = "store.sql_terms_of_service_store.get.no_rows.app_error"
+	ERROR_TERMS_OF_SERVICE_NO_ROWS_FOUND = "app.terms_of_service.get.no_rows.app_error"
 )
 
 func (s *Server) Config() *model.Config {

app/terms_of_service.go

@@ -4,7 +4,11 @@
 package app
 
 import (
+	"errors"
+	"net/http"
+
 	"github.com/mattermost/mattermost-server/v5/model"
+	"github.com/mattermost/mattermost-server/v5/store"
 )
 
 func (a *App) CreateTermsOfService(text, userId string) (*model.TermsOfService, *model.AppError) {
@@ -13,17 +17,51 @@ func (a *App) CreateTermsOfService(text, userId string) (*model.TermsOfService,
 		UserId: userId,
 	}
 
-	if _, err := a.GetUser(userId); err != nil {
-		return nil, err
+	if _, appErr := a.GetUser(userId); appErr != nil {
+		return nil, appErr
 	}
 
-	return a.Srv().Store.TermsOfService().Save(termsOfService)
+	var err error
+	if termsOfService, err = a.Srv().Store.TermsOfService().Save(termsOfService); err != nil {
+		var iErr *store.ErrInvalidInput
+		var appErr *model.AppError
+		switch {
+		case errors.As(err, &iErr):
+			return nil, model.NewAppError("CreateTermsOfService", "app.terms_of_service.create.existing.app_error", nil, "id="+termsOfService.Id, http.StatusBadRequest)
+		case errors.As(err, &appErr):
+			return nil, appErr
+		default:
+			return nil, model.NewAppError("CreateTermsOfService", "app.terms_of_service.create.app_error", nil, "terms_of_service_id="+termsOfService.Id+",err="+err.Error(), http.StatusInternalServerError)
+		}
+	}
+
+	return termsOfService, nil
 }
 
 func (a *App) GetLatestTermsOfService() (*model.TermsOfService, *model.AppError) {
-	return a.Srv().Store.TermsOfService().GetLatest(true)
+	termsOfService, err := a.Srv().Store.TermsOfService().GetLatest(true)
+	if err != nil {
+		var nfErr *store.ErrNotFound
+		switch {
+		case errors.As(err, &nfErr):
+			return nil, model.NewAppError("GetLatestTermsOfService", "app.terms_of_service.get.no_rows.app_error", nil, "err="+err.Error(), http.StatusNotFound)
+		default:
+			return nil, model.NewAppError("GetLatestTermsOfService", "app.terms_of_service.get.app_error", nil, "err="+err.Error(), http.StatusInternalServerError)
+		}
+	}
+	return termsOfService, nil
 }
 
 func (a *App) GetTermsOfService(id string) (*model.TermsOfService, *model.AppError) {
-	return a.Srv().Store.TermsOfService().Get(id, true)
+	termsOfService, err := a.Srv().Store.TermsOfService().Get(id, true)
+	if err != nil {
+		var nfErr *store.ErrNotFound
+		switch {
+		case errors.As(err, &nfErr):
+			return nil, model.NewAppError("GetTermsOfService", "app.terms_of_service.get.no_rows.app_error", nil, "", http.StatusNotFound)
+		default:
+			return nil, model.NewAppError("GetTermsOfService", "app.terms_of_service.get.app_error", nil, "err="+err.Error(), http.StatusInternalServerError)
+		}
+	}
+	return termsOfService, nil
 }