trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adapt correctly response 400 instead of default 422

This commit is contained in:
Cayo Puigdefabregas 2022-04-25 18:38:13 +02:00
parent 767f7c3092
commit aafebbb370
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ereuse_devicehub/api/views.py
View File

@ -5,7 +5,8 @@ from flask import Blueprint
from flask import current_app as app from flask import current_app as app
from flask import g, jsonify, request from flask import g, jsonify, request
from flask.views import View from flask.views import View
from marshmallow import ValidationError from flask.wrappers import Response
from marshmallow.exceptions import ValidationError
from werkzeug.exceptions import Unauthorized from werkzeug.exceptions import Unauthorized
from ereuse_devicehub.auth import Auth from ereuse_devicehub.auth import Auth
@ -51,6 +52,8 @@ class InventoryView(LoginMix, SnapshotMix):
self.tmp_snapshots = app.config['TMP_SNAPSHOTS'] self.tmp_snapshots = app.config['TMP_SNAPSHOTS']
self.path_snapshot = save_json(snapshot_json, self.tmp_snapshots, g.user.email) self.path_snapshot = save_json(snapshot_json, self.tmp_snapshots, g.user.email)
snapshot_json = self.validate(snapshot_json) snapshot_json = self.validate(snapshot_json)
if type(snapshot_json) == Response:
return snapshot_json
try: try:
self.snapshot_json = ParseSnapshotLsHw(snapshot_json).get_snapshot() self.snapshot_json = ParseSnapshotLsHw(snapshot_json).get_snapshot()
except Exception as err: except Exception as err:
@ -87,11 +90,15 @@ class InventoryView(LoginMix, SnapshotMix):
except ValidationError as err: except ValidationError as err:
txt = "{}".format(err) txt = "{}".format(err)
uuid = snapshot_json.get('uuid') uuid = snapshot_json.get('uuid')
sid = snapshot_json.get('sid')
error = SnapshotErrors( error = SnapshotErrors(
description=txt, snapshot_uuid=uuid, severity=Severity.Error description=txt, snapshot_uuid=uuid, severity=Severity.Error, sid=sid
) )
error.save(commit=True) error.save(commit=True)
raise err # raise err
self.response = jsonify(err)
self.response.status_code = 400
return self.response
api.add_url_rule('/inventory/', view_func=InventoryView.as_view('inventory')) api.add_url_rule('/inventory/', view_func=InventoryView.as_view('inventory'))