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

add more clear error message, add a check if exist this snapshot and put the commit at the end of the loop

This commit is contained in:
Cayo Puigdefabregas 2022-01-20 10:33:14 +01:00
parent f35dab8983
commit 6e0f627aca
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ereuse_devicehub/inventory/forms.py
View File

@ -5,6 +5,7 @@ from wtforms import StringField, validators, MultipleFileField
from flask import g, request, app from flask import g, request, app
from sqlalchemy.util import OrderedSet from sqlalchemy.util import OrderedSet
from psycopg2.errors import UniqueViolation from psycopg2.errors import UniqueViolation
from json.decoder import JSONDecodeError
from ereuse_devicehub.db import db from ereuse_devicehub.db import db
from ereuse_devicehub.resources.device.models import Device, Computer, Smartphone, Cellphone, \ from ereuse_devicehub.resources.device.models import Device, Computer, Smartphone, Cellphone, \
@ -107,9 +108,21 @@ class UploadSnapshotForm(FlaskForm):
self.result[filename] = 'Not processed' self.result[filename] = 'Not processed'
d = d.stream.read() d = d.stream.read()
if not d: if not d:
self.result[filename] = 'Error' self.result[filename] = 'Error this snapshot is empty'
continue continue
self.snapshots.append((filename, json.loads(d)))
try:
d_json = json.loads(d)
except JSONDecodeError:
self.result[filename] = 'Error this snapshot is not a json'
continue
uuid_snapshot = d_json.get('uuid')
if Snapshot.query.filter(Snapshot.uuid == uuid_snapshot).all():
self.result[filename] = 'Error this snapshot exist'
continue
self.snapshots.append((filename, d_json))
if not self.snapshots: if not self.snapshots:
return False return False
@ -142,6 +155,8 @@ class UploadSnapshotForm(FlaskForm):
move_json(self.tmp_snapshots, path_snapshot, g.user.email) move_json(self.tmp_snapshots, path_snapshot, g.user.email)
db.session.commit()
def build(self, snapshot_json): def build(self, snapshot_json):
# this is a copy adaptated from ereuse_devicehub.resources.action.views.snapshot # this is a copy adaptated from ereuse_devicehub.resources.action.views.snapshot
device = snapshot_json.pop('device') # type: Computer device = snapshot_json.pop('device') # type: Computer
@ -198,7 +213,6 @@ class UploadSnapshotForm(FlaskForm):
snapshot.severity = Severity.Warning snapshot.severity = Severity.Warning
db.session.add(snapshot) db.session.add(snapshot)
db.session.commit()
return snapshot return snapshot