sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use micro error codes and id

Browse Source
This commit is contained in:
A.Unger
2020-08-20 15:49:16 +02:00
parent adcecd9792
commit eb713b7a97
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/service/v0/service.go
+5 -5
View File
@@ -52,11 +52,11 @@ func NewService(cfg *config.Config, logger log.Logger) Service {
func (g Service) SaveBundle(c context.Context, req *proto.SaveBundleRequest, res *proto.SaveBundleResponse) error {
cleanUpResource(c, req.Bundle.Resource)
if validationError := validateSaveBundle(req); validationError != nil {
return merrors.FromError(validationError)
return merrors.FromError(merrors.BadRequest("ocis-settings", "%s", validationError))
}
r, err := g.manager.WriteBundle(req.Bundle)
if err != nil {
return merrors.FromError(err)
return merrors.FromError(merrors.InternalServerError("ocis-settings", "%s", err))
}
res.Bundle = r
return nil
@@ -118,15 +118,15 @@ func (g Service) SaveValue(c context.Context, req *proto.SaveValueRequest, res *
cleanUpResource(c, req.Value.Resource)
// TODO: we need to check, if the authenticated user has permission to write the value for the specified resource (e.g. global, file with id xy, ...)
if validationError := validateSaveValue(req); validationError != nil {
return merrors.FromError(validationError)
return merrors.FromError(merrors.BadRequest("ocis-settings", "%s", validationError))
}
r, err := g.manager.WriteValue(req.Value)
if err != nil {
return merrors.FromError(err)
return merrors.FromError(merrors.BadRequest("ocis-settings", "%s", err))
}
valueWithIdentifier, err := g.getValueWithIdentifier(r)
if err != nil {
return merrors.FromError(err)
return merrors.FromError(merrors.NotFound("ocis-settings", "%s", err))
}
res.Value = valueWithIdentifier
return nil