From 1eac1099ae97b5a55946b2468443da6c1fc6d762 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 29 Nov 2021 07:34:54 +0100 Subject: [PATCH] introduce string constants for user / group not found messages --- ocs/pkg/service/v0/data/meta.go | 6 ++++++ ocs/pkg/service/v0/groups.go | 24 ++++++++++++------------ ocs/pkg/service/v0/users.go | 14 +++++++------- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/ocs/pkg/service/v0/data/meta.go b/ocs/pkg/service/v0/data/meta.go index 2a9a114ff5..a43090d9bd 100644 --- a/ocs/pkg/service/v0/data/meta.go +++ b/ocs/pkg/service/v0/data/meta.go @@ -35,3 +35,9 @@ var MetaNotFound = Meta{Status: "error", StatusCode: 998, Message: "Not Found"} // MetaUnknownError is used for unknown errors var MetaUnknownError = Meta{Status: "error", StatusCode: 999, Message: "Unknown Error"} + +// MessageUserNotFound is used when a user can not be found +var MessageUserNotFound = "The requested user could not be found" + +// MessageGroupNotFound is used when a group can not be found +var MessageGroupNotFound = "The requested group could not be found" diff --git a/ocs/pkg/service/v0/groups.go b/ocs/pkg/service/v0/groups.go index 3769e6b3ac..5d89cb9f80 100644 --- a/ocs/pkg/service/v0/groups.go +++ b/ocs/pkg/service/v0/groups.go @@ -56,7 +56,7 @@ func (o Ocs) ListUserGroups(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested user could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, data.MessageUserNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -119,7 +119,7 @@ func (o Ocs) AddToGroup(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested user could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, data.MessageUserNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -131,7 +131,7 @@ func (o Ocs) AddToGroup(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested group could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, data.MessageGroupNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -146,7 +146,7 @@ func (o Ocs) AddToGroup(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested group could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, data.MessageGroupNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -201,7 +201,7 @@ func (o Ocs) RemoveFromGroup(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, "The requested user could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, data.MessageUserNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -215,7 +215,7 @@ func (o Ocs) RemoveFromGroup(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested group could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, data.MessageGroupNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -230,7 +230,7 @@ func (o Ocs) RemoveFromGroup(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested group could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, data.MessageGroupNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -352,7 +352,7 @@ func (o Ocs) DeleteGroup(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested group could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, data.MessageGroupNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -366,7 +366,7 @@ func (o Ocs) DeleteGroup(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested group could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, data.MessageGroupNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -388,7 +388,7 @@ func (o Ocs) GetGroupMembers(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested group could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, data.MessageGroupNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -400,7 +400,7 @@ func (o Ocs) GetGroupMembers(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested group could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, data.MessageGroupNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -433,5 +433,5 @@ func (o Ocs) fetchGroupByName(ctx context.Context, name string) (*accounts.Group if res != nil && len(res.Groups) == 1 { return res.Groups[0], nil } - return nil, merrors.NotFound("", "The requested group could not be found") + return nil, merrors.NotFound("", data.MessageGroupNotFound) } diff --git a/ocs/pkg/service/v0/users.go b/ocs/pkg/service/v0/users.go index 43d2a80074..fbad77da54 100644 --- a/ocs/pkg/service/v0/users.go +++ b/ocs/pkg/service/v0/users.go @@ -102,7 +102,7 @@ func (o Ocs) GetUser(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested user could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, data.MessageUserNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -288,7 +288,7 @@ func (o Ocs) EditUser(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested user could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, data.MessageUserNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -366,7 +366,7 @@ func (o Ocs) DeleteUser(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested user could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, data.MessageUserNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -470,7 +470,7 @@ func (o Ocs) DeleteUser(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested user could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, data.MessageUserNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -523,7 +523,7 @@ func (o Ocs) EnableUser(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested user could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, data.MessageUserNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -574,7 +574,7 @@ func (o Ocs) DisableUser(w http.ResponseWriter, r *http.Request) { if err != nil { merr := merrors.FromError(err) if merr.Code == http.StatusNotFound { - o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested user could not be found")) + o.mustRender(w, r, response.ErrRender(data.MetaNotFound.StatusCode, data.MessageUserNotFound)) } else { o.mustRender(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error())) } @@ -731,7 +731,7 @@ func (o Ocs) fetchAccountByUsername(ctx context.Context, name string) (*accounts if res != nil && len(res.Accounts) == 1 { return res.Accounts[0], nil } - return nil, merrors.NotFound("", "The requested user could not be found") + return nil, merrors.NotFound("", data.MessageUserNotFound) } func (o Ocs) fetchAccountFromCS3Backend(ctx context.Context, name string) (*accounts.Account, error) {