From a0a52d8248f38571494cc804622aece4c852c364 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 13 Apr 2022 18:31:39 +0200 Subject: [PATCH 01/29] view list for snapshot errors --- ereuse_devicehub/inventory/views.py | 20 +++++ .../templates/inventory/snapshot_list.html | 73 +++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 ereuse_devicehub/templates/inventory/snapshot_list.html diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index ac91ac44..5ccf6961 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -547,6 +547,25 @@ class ExportsView(View): return flask.render_template('inventory/erasure.html', **params) +class SnapshotListView(GenericMixView): + decorators = [login_required] + template_name = 'inventory/snapshot_list.html' + + def dispatch_request(self): + self.get_context() + return flask.render_template(self.template_name, **self.context) + + def get_context(self): + lots = self.get_lots() + + self.context = { + 'lots': lots, + 'version': __version__, + } + + return self.context + + devices.add_url_rule('/action/add/', view_func=NewActionView.as_view('action_add')) devices.add_url_rule('/action/trade/add/', view_func=NewTradeView.as_view('trade_add')) devices.add_url_rule( @@ -560,6 +579,7 @@ devices.add_url_rule( view_func=NewTradeDocumentView.as_view('trade_document_add'), ) devices.add_url_rule('/device/', view_func=DeviceListView.as_view('devicelist')) +devices.add_url_rule('/snapshot/', view_func=SnapshotListView.as_view('snapshotlist')) devices.add_url_rule( '/device//', view_func=DeviceDetailView.as_view('device_details') ) diff --git a/ereuse_devicehub/templates/inventory/snapshot_list.html b/ereuse_devicehub/templates/inventory/snapshot_list.html new file mode 100644 index 00000000..2eb07016 --- /dev/null +++ b/ereuse_devicehub/templates/inventory/snapshot_list.html @@ -0,0 +1,73 @@ +{% extends "ereuse_devicehub/base_site.html" %} +{% block main %} + +
+

Inventory

+ +
+ +
+
+ +
+ +
+
+ +
+
+
+ + + + + + + + + + + + {% for snap in snapshots_errors %} + + + + + + + + {% endfor %} + +
WBIDSnapshot idDeviceErrorsTime
+ {{ snap.wbid }} + + {{ snap.snapshot_uuid }} + + + {{ snap.description }} + {{ dev.created.strftime('%H:%M %d-%m-%Y') }}
+ +
+
+ +
+
+
+
+ +
+ +
+ +
+ + + +{% endblock main %} From 379a2efca217016b3c297bcd920dc6a93784a62a Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 13 Apr 2022 20:15:40 +0200 Subject: [PATCH 02/29] errors in snapshots --- ereuse_devicehub/inventory/views.py | 9 ++++++++- ereuse_devicehub/templates/inventory/snapshot_list.html | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 5ccf6961..9812ffad 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -25,6 +25,7 @@ from ereuse_devicehub.inventory.forms import ( UploadSnapshotForm, ) from ereuse_devicehub.labels.forms import PrintLabelsForm +from ereuse_devicehub.parser.models import SnapshotErrors from ereuse_devicehub.resources.action.models import Trade from ereuse_devicehub.resources.device.models import Computer, DataStorage, Device from ereuse_devicehub.resources.documents.device_row import ActionRow, DeviceRow @@ -557,8 +558,12 @@ class SnapshotListView(GenericMixView): def get_context(self): lots = self.get_lots() + snapshot_errors = SnapshotErrors.query.filter( + SnapshotErrors.owner == current_user + ).order_by(SnapshotErrors.created.desc()) self.context = { + 'snapshot_errors': snapshot_errors, 'lots': lots, 'version': __version__, } @@ -579,7 +584,9 @@ devices.add_url_rule( view_func=NewTradeDocumentView.as_view('trade_document_add'), ) devices.add_url_rule('/device/', view_func=DeviceListView.as_view('devicelist')) -devices.add_url_rule('/snapshot/', view_func=SnapshotListView.as_view('snapshotlist')) +devices.add_url_rule( + '/snapshot/errors/', view_func=SnapshotListView.as_view('snapshot_errors_list') +) devices.add_url_rule( '/device//', view_func=DeviceDetailView.as_view('device_details') ) diff --git a/ereuse_devicehub/templates/inventory/snapshot_list.html b/ereuse_devicehub/templates/inventory/snapshot_list.html index 2eb07016..f34e7930 100644 --- a/ereuse_devicehub/templates/inventory/snapshot_list.html +++ b/ereuse_devicehub/templates/inventory/snapshot_list.html @@ -33,7 +33,7 @@ - {% for snap in snapshots_errors %} + {% for snap in snapshot_errors %} {{ snap.wbid }} @@ -46,7 +46,7 @@ {{ snap.description }} - {{ dev.created.strftime('%H:%M %d-%m-%Y') }} + {{ snap.created.strftime('%H:%M %d-%m-%Y') }} {% endfor %} From 5e74255145de0d9f80a0331831342b3fac81f2ab Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 11 May 2022 16:59:36 +0200 Subject: [PATCH 03/29] basic list snapshots --- ereuse_devicehub/inventory/views.py | 13 ++++ .../templates/inventory/snapshots_list.html | 63 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 ereuse_devicehub/templates/inventory/snapshots_list.html diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index a09f4f5b..f089dc63 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -505,6 +505,18 @@ class ExportsView(View): return flask.render_template('inventory/erasure.html', **params) +class SnapshotListView(GenericMixView): + methods = ['GET'] + decorators = [login_required] + template_name = 'inventory/snapshots_list.html' + + def dispatch_request(self, id): + self.get_context() + self.context['page_title'] = "Snapshots" + self.context['snapshots'] = [] + return flask.render_template(self.template_name, **self.context) + + devices.add_url_rule('/action/add/', view_func=NewActionView.as_view('action_add')) devices.add_url_rule('/action/trade/add/', view_func=NewTradeView.as_view('trade_add')) devices.add_url_rule( @@ -551,3 +563,4 @@ devices.add_url_rule( devices.add_url_rule( '/export//', view_func=ExportsView.as_view('export') ) +devices.add_url_rule('/snapshots/', view_func=SnapshotListView.as_view('snapshotslist')) diff --git a/ereuse_devicehub/templates/inventory/snapshots_list.html b/ereuse_devicehub/templates/inventory/snapshots_list.html new file mode 100644 index 00000000..e6004f63 --- /dev/null +++ b/ereuse_devicehub/templates/inventory/snapshots_list.html @@ -0,0 +1,63 @@ +{% extends "ereuse_devicehub/base_site.html" %} +{% block main %} + +
+

Inventory

+ +
+ +
+
+ +
+ +
+
+ + +
+ +
+ +
Snapshot
+ + + + + + + + + + + + {% for snap in snapshots %} + + + + + + + + {% endfor %} + +
SidWorkbench VersionErrorsDHIDUploaded
{{ snap.sid }}{{ snap.version }}{{ snap.status }}{{ snap.device.devicehub_id }}{{ snap.created }}
+ +
+ +
+
+ +
+
+
+ + + +{% endblock main %} From 123757793f40cb0385ba36d6aa68ca67594dabd4 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 11 May 2022 17:03:31 +0200 Subject: [PATCH 04/29] add link on sidebar and put empty data --- ereuse_devicehub/inventory/views.py | 2 +- ereuse_devicehub/templates/ereuse_devicehub/base_site.html | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index f089dc63..2cdf5af1 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -510,7 +510,7 @@ class SnapshotListView(GenericMixView): decorators = [login_required] template_name = 'inventory/snapshots_list.html' - def dispatch_request(self, id): + def dispatch_request(self): self.get_context() self.context['page_title'] = "Snapshots" self.context['snapshots'] = [] diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index fe014107..95b3d3a5 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -101,6 +101,13 @@ +
  • + +
    • +
    • +
  • Snapshots
    • + +
  • + +
    • +
  • Devices
  • @@ -120,13 +129,6 @@
    • -
  • - -
    • -
  • @@ -16,34 +17,47 @@
    -
    +
    - -
    - -
    - -
    Snapshot
    +
    +
    +
    - - - - - + + + + + + + - {% for snap in snapshots %} + {% for snap in snapshots_log %} - - - + + + + + @@ -51,11 +65,16 @@
    SidWorkbench VersionErrorsDHIDUploadedSIDSnapshot idVersionDeviceStatusDescriptionTime
    {{ snap.sid or ''}}{{ snap.version }}{{ snap.status }} - - {{ snap.device.devicehub_id }} - + {{ snap.sid }} + + {{ snap.snapshot_uuid }} + + {{ snap.workbench_version }} + + {% if snap.snapshot %} + + {{ snap.snapshot.device.devicehub_id }} + + {% endif %} + + {{ snap.severity }} + + {{ snap.description }} {{ snap.created.strftime('%H:%M %d-%m-%Y') }}
    -
    +
    +
    +
    +
    +
    +
    From d9e94e66d3535e854fab1bbca7a2d95af701b068 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 18 May 2022 11:01:58 +0200 Subject: [PATCH 07/29] change views --- ereuse_devicehub/inventory/views.py | 38 +++++++---------------------- ereuse_devicehub/views.py | 1 + 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index cb722937..a6c4fa2f 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -25,8 +25,8 @@ from ereuse_devicehub.inventory.forms import ( UploadSnapshotForm, ) from ereuse_devicehub.labels.forms import PrintLabelsForm -from ereuse_devicehub.parser.models import SnapshotErrors -from ereuse_devicehub.resources.action.models import Snapshot, Trade +from ereuse_devicehub.parser.models import SnapshotsLog +from ereuse_devicehub.resources.action.models import Trade from ereuse_devicehub.resources.device.models import Computer, DataStorage, Device from ereuse_devicehub.resources.documents.device_row import ActionRow, DeviceRow from ereuse_devicehub.resources.hash_reports import insert_hash @@ -513,33 +513,17 @@ class ExportsView(View): return flask.render_template('inventory/erasure.html', **params) -class SnapshotErrorsListView(GenericMixView): - methods = ['GET'] - decorators = [login_required] - template_name = 'inventory/snapshot_errors_list.html' - - def dispatch_request(self): - self.get_context() - self.context['page_title'] = "Snapshot Errors" - snapshot_errors = SnapshotErrors.query.filter( - SnapshotErrors.owner == current_user - ).order_by(SnapshotErrors.created.desc()) - self.context['snapshot_errors'] = snapshot_errors - - return flask.render_template(self.template_name, **self.context) - - -class SnapshotListView(GenericMixView): - decorators = [login_required] +class SnapshotListView(GenericMixin): template_name = 'inventory/snapshots_list.html' def dispatch_request(self): self.get_context() - snapshots = Snapshot.query.filter(Snapshot.author == current_user).order_by( - Snapshot.created.desc() - ) - self.context['page_title'] = "Snapshots" - self.context['snapshots'] = snapshots + self.context['page_title'] = "Snapshots Logs" + snapshots_log = SnapshotsLog.query.filter( + SnapshotsLog.owner == current_user + ).order_by(SnapshotsLog.created.desc()) + self.context['snapshots_log'] = snapshots_log + return flask.render_template(self.template_name, **self.context) @@ -556,10 +540,6 @@ devices.add_url_rule( view_func=NewTradeDocumentView.as_view('trade_document_add'), ) devices.add_url_rule('/device/', view_func=DeviceListView.as_view('devicelist')) -devices.add_url_rule( - '/snapshot/errors/', - view_func=SnapshotErrorsListView.as_view('snapshot_errors_list'), -) devices.add_url_rule( '/device//', view_func=DeviceDetailView.as_view('device_details') ) diff --git a/ereuse_devicehub/views.py b/ereuse_devicehub/views.py index 018a85a9..dc426d8e 100644 --- a/ereuse_devicehub/views.py +++ b/ereuse_devicehub/views.py @@ -50,6 +50,7 @@ class LogoutView(View): class GenericMixin(View): + methods = ['GET'] decorators = [login_required] def get_lots(self): From a7ceab2cde0fb202a33626e5ff72d9ad4f740fd7 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 18 May 2022 11:03:58 +0200 Subject: [PATCH 08/29] change SnapshotErrors for SnapshotsLog --- ereuse_devicehub/api/views.py | 4 +-- ereuse_devicehub/inventory/forms.py | 4 +-- ereuse_devicehub/parser/computer.py | 4 +-- ereuse_devicehub/parser/parser.py | 4 +-- .../resources/action/views/snapshot.py | 4 +-- tests/test_snapshot.py | 26 +++++++++---------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ereuse_devicehub/api/views.py b/ereuse_devicehub/api/views.py index 6af655b9..9ab5d32c 100644 --- a/ereuse_devicehub/api/views.py +++ b/ereuse_devicehub/api/views.py @@ -11,7 +11,7 @@ from werkzeug.exceptions import Unauthorized from ereuse_devicehub.auth import Auth from ereuse_devicehub.db import db -from ereuse_devicehub.parser.models import SnapshotErrors +from ereuse_devicehub.parser.models import SnapshotsLog from ereuse_devicehub.parser.parser import ParseSnapshotLsHw from ereuse_devicehub.parser.schemas import Snapshot_lite from ereuse_devicehub.resources.action.views.snapshot import ( @@ -80,7 +80,7 @@ class InventoryView(LoginMixin, SnapshotMixin): txt = "{}".format(err) uuid = snapshot_json.get('uuid') sid = snapshot_json.get('sid') - error = SnapshotErrors( + error = SnapshotsLog( description=txt, snapshot_uuid=uuid, severity=Severity.Error, sid=sid ) error.save(commit=True) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index 2f1e6cca..ce301fa7 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -27,7 +27,7 @@ from wtforms import ( from wtforms.fields import FormField from ereuse_devicehub.db import db -from ereuse_devicehub.parser.models import SnapshotErrors +from ereuse_devicehub.parser.models import SnapshotsLog from ereuse_devicehub.parser.parser import ParseSnapshotLsHw from ereuse_devicehub.parser.schemas import Snapshot_lite from ereuse_devicehub.resources.action.models import Snapshot, Trade @@ -250,7 +250,7 @@ class UploadSnapshotForm(SnapshotMixin, FlaskForm): txt = "{}".format(err) uuid = snapshot_json.get('uuid') sid = snapshot_json.get('sid') - error = SnapshotErrors( + error = SnapshotsLog( description=txt, snapshot_uuid=uuid, severity=Severity.Error, diff --git a/ereuse_devicehub/parser/computer.py b/ereuse_devicehub/parser/computer.py index bf417dac..fb964808 100644 --- a/ereuse_devicehub/parser/computer.py +++ b/ereuse_devicehub/parser/computer.py @@ -14,7 +14,7 @@ from ereuse_utils.nested_lookup import ( ) from ereuse_devicehub.parser import base2, unit, utils -from ereuse_devicehub.parser.models import SnapshotErrors +from ereuse_devicehub.parser.models import SnapshotsLog from ereuse_devicehub.parser.utils import Dumpeable from ereuse_devicehub.resources.enums import Severity @@ -457,7 +457,7 @@ class Computer(Device): return logger.error(txt) - error = SnapshotErrors( + error = SnapshotsLog( description=txt, snapshot_uuid=uuid, severity=severity, sid=sid ) error.save() diff --git a/ereuse_devicehub/parser/parser.py b/ereuse_devicehub/parser/parser.py index 85683a5c..7d5f6db9 100644 --- a/ereuse_devicehub/parser/parser.py +++ b/ereuse_devicehub/parser/parser.py @@ -8,7 +8,7 @@ from marshmallow.exceptions import ValidationError from ereuse_devicehub.parser import base2 from ereuse_devicehub.parser.computer import Computer -from ereuse_devicehub.parser.models import SnapshotErrors +from ereuse_devicehub.parser.models import SnapshotsLog from ereuse_devicehub.resources.action.schemas import Snapshot from ereuse_devicehub.resources.enums import DataStorageInterface, Severity @@ -552,7 +552,7 @@ class ParseSnapshotLsHw: logger.error(txt) self._errors.append(txt) - error = SnapshotErrors( + error = SnapshotsLog( description=txt, snapshot_uuid=self.uuid, severity=severity, sid=self.sid ) error.save() diff --git a/ereuse_devicehub/resources/action/views/snapshot.py b/ereuse_devicehub/resources/action/views/snapshot.py index 569f6b0d..5e58b830 100644 --- a/ereuse_devicehub/resources/action/views/snapshot.py +++ b/ereuse_devicehub/resources/action/views/snapshot.py @@ -11,7 +11,7 @@ from marshmallow import ValidationError from sqlalchemy.util import OrderedSet from ereuse_devicehub.db import db -from ereuse_devicehub.parser.models import SnapshotErrors +from ereuse_devicehub.parser.models import SnapshotsLog from ereuse_devicehub.resources.action.models import Snapshot from ereuse_devicehub.resources.device.models import Computer from ereuse_devicehub.resources.device.sync import Sync @@ -140,7 +140,7 @@ class SnapshotView(SnapshotMixin): except ValidationError as err: txt = "{}".format(err) uuid = snapshot_json.get('uuid') - error = SnapshotErrors( + error = SnapshotsLog( description=txt, snapshot_uuid=uuid, severity=Severity.Error ) error.save(commit=True) diff --git a/tests/test_snapshot.py b/tests/test_snapshot.py index e8519206..b4e54237 100644 --- a/tests/test_snapshot.py +++ b/tests/test_snapshot.py @@ -15,10 +15,10 @@ from requests.exceptions import HTTPError from teal.db import DBError, UniqueViolation from teal.marshmallow import ValidationError -from ereuse_devicehub.client import UserClient, Client +from ereuse_devicehub.client import Client, UserClient from ereuse_devicehub.db import db from ereuse_devicehub.devicehub import Devicehub -from ereuse_devicehub.parser.models import SnapshotErrors +from ereuse_devicehub.parser.models import SnapshotsLog from ereuse_devicehub.resources.action.models import ( Action, BenchmarkDataStorage, @@ -977,7 +977,7 @@ def test_snapshot_wb_lite(user: UserClient): assert '00:28:f8:a6:d5:7e' in dev.hid assert dev.actions[0].power_on_hours == 6032 - errors = SnapshotErrors.query.filter().all() + errors = SnapshotsLog.query.filter().all() assert errors == [] @@ -986,9 +986,7 @@ def test_snapshot_wb_lite(user: UserClient): def test_snapshot_wb_lite_qemu(user: UserClient): """This test check the minimum validation of json that come from snapshot""" - snapshot = file_json( - "qemu-cc9927a9-55ad-4937-b36b-7185147d9fa9.json" - ) + snapshot = file_json("qemu-cc9927a9-55ad-4937-b36b-7185147d9fa9.json") body, res = user.post(snapshot, uri="/api/inventory/") assert body['sid'] == "VL0L5" @@ -1172,7 +1170,7 @@ def test_snapshot_lite_error_in_components(user: UserClient): dev = m.Device.query.filter_by(devicehub_id=bodyLite['dhid']).one() assert 'Motherboard' not in [x.type for x in dev.components] - error = SnapshotErrors.query.all()[0] + error = SnapshotsLog.query.all()[0] assert 'StopIteration' in error.description @@ -1225,12 +1223,12 @@ def test_snapshot_errors(user: UserClient): }, } - assert SnapshotErrors.query.all() == [] + assert SnapshotsLog.query.all() == [] body11, res = user.post(snapshot_11, res=Snapshot) - assert SnapshotErrors.query.all() == [] + assert SnapshotsLog.query.all() == [] bodyLite, res = user.post(snapshot_lite, uri="/api/inventory/") dev = m.Device.query.filter_by(devicehub_id=bodyLite['dhid']).one() - assert len(SnapshotErrors.query.all()) == 2 + assert len(SnapshotsLog.query.all()) == 2 assert body11['device'].get('hid') == dev.hid assert body11['device']['id'] == dev.id @@ -1267,7 +1265,7 @@ def test_snapshot_errors_no_serial_number(user: UserClient): bodyLite, res = user.post(snapshot_lite, uri="/api/inventory/") assert res.status_code == 201 - assert len(SnapshotErrors.query.all()) == 0 + assert len(SnapshotsLog.query.all()) == 0 dev = m.Device.query.filter_by(devicehub_id=bodyLite['dhid']).one() assert not dev.model assert not dev.manufacturer @@ -1286,9 +1284,11 @@ def test_snapshot_errors_no_serial_number(user: UserClient): @pytest.mark.usefixtures(conftest.app_context.__name__) def test_snapshot_check_tests_lite(user: UserClient): """This test check the minimum validation of json that come from snapshot""" - snapshot_lite = file_json('test_lite/2022-4-13-19-5_user@dhub.com_b27dbf43-b88a-4505-ae27-10de5a95919e.json') + snapshot_lite = file_json( + 'test_lite/2022-4-13-19-5_user@dhub.com_b27dbf43-b88a-4505-ae27-10de5a95919e.json' + ) bodyLite, res = user.post(snapshot_lite, uri="/api/inventory/") assert res.status_code == 201 - SnapshotErrors.query.all() + SnapshotsLog.query.all() dev = m.Device.query.filter_by(devicehub_id=bodyLite['dhid']).one() From 3670fe0ff1327ca7ba4b02f39299c30a7b50b52b Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 18 May 2022 12:46:34 +0200 Subject: [PATCH 09/29] fixing migrations --- .../versions/926865284103_snapshot_log.py | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/ereuse_devicehub/migrations/versions/926865284103_snapshot_log.py b/ereuse_devicehub/migrations/versions/926865284103_snapshot_log.py index 7dc29c75..56f385af 100644 --- a/ereuse_devicehub/migrations/versions/926865284103_snapshot_log.py +++ b/ereuse_devicehub/migrations/versions/926865284103_snapshot_log.py @@ -43,7 +43,7 @@ def upgrade(): ), sa.Column('id', sa.BigInteger(), nullable=False), sa.Column('description', citext.CIText(), nullable=True), - sa.Column('workbench_version', citext.CIText(), nullable=True), + sa.Column('version', citext.CIText(), nullable=True), sa.Column('sid', citext.CIText(), nullable=True), sa.Column('severity', sa.SmallInteger(), nullable=False), sa.Column('snapshot_uuid', postgresql.UUID(as_uuid=True), nullable=True), @@ -69,3 +69,34 @@ def upgrade(): def downgrade(): op.drop_table('snapshots_log', schema=f'{get_inv()}') op.execute(f"DROP SEQUENCE {get_inv()}.snapshots_log_seq;") + + op.create_table( + 'snapshot_errors', + sa.Column( + 'updated', + sa.TIMESTAMP(timezone=True), + server_default=sa.text('CURRENT_TIMESTAMP'), + nullable=False, + comment='The last time Devicehub recorded a change for \n this thing.\n ', + ), + sa.Column( + 'created', + sa.TIMESTAMP(timezone=True), + server_default=sa.text('CURRENT_TIMESTAMP'), + nullable=False, + comment='When Devicehub created this.', + ), + sa.Column('id', sa.BigInteger(), nullable=False), + sa.Column('description', citext.CIText(), nullable=False), + sa.Column('snapshot_uuid', postgresql.UUID(as_uuid=True), nullable=False), + sa.Column('severity', sa.SmallInteger(), nullable=False), + sa.Column('sid', citext.CIText(), nullable=True), + sa.Column('owner_id', postgresql.UUID(as_uuid=True), nullable=False), + sa.ForeignKeyConstraint( + ['owner_id'], + ['common.user.id'], + ), + sa.PrimaryKeyConstraint('id'), + schema=f'{get_inv()}', + ) + op.execute(f"CREATE SEQUENCE {get_inv()}.snapshot_errors_seq START 1;") From c0abfd6f0b1433b75deffd8eff03b51889aac285 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 18 May 2022 12:46:57 +0200 Subject: [PATCH 10/29] change version --- ereuse_devicehub/parser/models.py | 2 +- ereuse_devicehub/templates/inventory/snapshots_list.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ereuse_devicehub/parser/models.py b/ereuse_devicehub/parser/models.py index a2621daa..82f272dc 100644 --- a/ereuse_devicehub/parser/models.py +++ b/ereuse_devicehub/parser/models.py @@ -15,7 +15,7 @@ class SnapshotsLog(Thing): id = Column(BigInteger, Sequence('snapshots_log_seq'), primary_key=True) severity = Column(SmallInteger, default=Severity.Info, nullable=False) - workbench_version = Column(CIText(), default='', nullable=True) + version = Column(CIText(), default='', nullable=True) description = Column(CIText(), default='', nullable=True) sid = Column(CIText(), nullable=True) dhid = Column(CIText(), nullable=True) diff --git a/ereuse_devicehub/templates/inventory/snapshots_list.html b/ereuse_devicehub/templates/inventory/snapshots_list.html index 0de896bb..22ecd74d 100644 --- a/ereuse_devicehub/templates/inventory/snapshots_list.html +++ b/ereuse_devicehub/templates/inventory/snapshots_list.html @@ -44,7 +44,7 @@ {{ snap.snapshot_uuid }} - {{ snap.workbench_version }} + {{ snap.version }} {% if snap.snapshot %} From 112e6bd01a2dca4828e10f277fff797836bdbcb8 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 18 May 2022 12:47:23 +0200 Subject: [PATCH 11/29] save ok in log --- ereuse_devicehub/api/views.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/ereuse_devicehub/api/views.py b/ereuse_devicehub/api/views.py index 9ab5d32c..1385a78d 100644 --- a/ereuse_devicehub/api/views.py +++ b/ereuse_devicehub/api/views.py @@ -59,6 +59,16 @@ class InventoryView(LoginMixin, SnapshotMixin): snapshot = self.build() db.session.add(snapshot) + + snap_log = SnapshotsLog( + description='Ok', + snapshot_uuid=snapshot.uuid, + severity=Severity.Info, + sid=snapshot.sid, + version=snapshot.version, + ) + snap_log.save() + db.session().final_flush() db.session.commit() self.response = jsonify( @@ -80,8 +90,13 @@ class InventoryView(LoginMixin, SnapshotMixin): txt = "{}".format(err) uuid = snapshot_json.get('uuid') sid = snapshot_json.get('sid') + version = snapshot_json.get('version') error = SnapshotsLog( - description=txt, snapshot_uuid=uuid, severity=Severity.Error, sid=sid + description=txt, + snapshot_uuid=uuid, + severity=Severity.Error, + sid=sid, + version=version, ) error.save(commit=True) # raise err From 1698f35e3da3bc113bf2f79ea84b6be521b78472 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 18 May 2022 17:59:05 +0200 Subject: [PATCH 12/29] fix model --- ereuse_devicehub/parser/models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ereuse_devicehub/parser/models.py b/ereuse_devicehub/parser/models.py index 82f272dc..5f861647 100644 --- a/ereuse_devicehub/parser/models.py +++ b/ereuse_devicehub/parser/models.py @@ -11,22 +11,22 @@ from ereuse_devicehub.resources.user.models import User class SnapshotsLog(Thing): - """A Snapshot errors.""" + """A Snapshot log.""" id = Column(BigInteger, Sequence('snapshots_log_seq'), primary_key=True) severity = Column(SmallInteger, default=Severity.Info, nullable=False) version = Column(CIText(), default='', nullable=True) description = Column(CIText(), default='', nullable=True) sid = Column(CIText(), nullable=True) - dhid = Column(CIText(), nullable=True) - snapshot_id = Column(UUID(as_uuid=True), db.ForeignKey(User.id), nullable=True) + snapshot_uuid = Column(UUID(as_uuid=True), nullable=True) + snapshot_id = Column(UUID(as_uuid=True), db.ForeignKey(Snapshot.id), nullable=True) owner_id = db.Column( UUID(as_uuid=True), db.ForeignKey(User.id), nullable=False, default=lambda: g.user.id, ) - snapshot = db.relationship(User, primaryjoin=snapshot_id == Snapshot.id) + snapshot = db.relationship(Snapshot, primaryjoin=snapshot_id == Snapshot.id) owner = db.relationship(User, primaryjoin=owner_id == User.id) def save(self, commit=False): From 3d73e1a368f7b14ed02283bfd982af3d92be164e Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 18 May 2022 18:00:54 +0200 Subject: [PATCH 13/29] fix version in snaposhotslog --- ereuse_devicehub/parser/computer.py | 14 ++++++++++---- ereuse_devicehub/parser/parser.py | 11 ++++++++--- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ereuse_devicehub/parser/computer.py b/ereuse_devicehub/parser/computer.py index fb964808..a6993c04 100644 --- a/ereuse_devicehub/parser/computer.py +++ b/ereuse_devicehub/parser/computer.py @@ -422,7 +422,7 @@ class Computer(Device): self._ram = None @classmethod - def run(cls, lshw, hwinfo_raw, uuid=None, sid=None): + def run(cls, lshw, hwinfo_raw, uuid=None, sid=None, version=None): """ Gets hardware information from the computer and its components, like serial numbers or model names, and benchmarks them. @@ -447,18 +447,24 @@ class Computer(Device): txt = "Error: Snapshot: {uuid}, sid: {sid}, type_error: {type}, error: {error}".format( uuid=uuid, sid=sid, type=err.__class__, error=err ) - cls.errors(txt, uuid=uuid, sid=sid) + cls.errors(txt, uuid=uuid, sid=sid, version=version) return computer, components @classmethod - def errors(cls, txt=None, uuid=None, sid=None, severity=Severity.Error): + def errors( + cls, txt=None, uuid=None, sid=None, version=None, severity=Severity.Error + ): if not txt: return logger.error(txt) error = SnapshotsLog( - description=txt, snapshot_uuid=uuid, severity=severity, sid=sid + description=txt, + snapshot_uuid=uuid, + severity=severity, + sid=sid, + version=version, ) error.save() diff --git a/ereuse_devicehub/parser/parser.py b/ereuse_devicehub/parser/parser.py index 7d5f6db9..f20d91d9 100644 --- a/ereuse_devicehub/parser/parser.py +++ b/ereuse_devicehub/parser/parser.py @@ -320,6 +320,7 @@ class ParseSnapshotLsHw: self.default = default self.uuid = snapshot.get("uuid") self.sid = snapshot.get("sid") + self.version = snapshot.get("version") self.dmidecode_raw = snapshot["data"]["dmidecode"] self.smart = snapshot["data"]["smart"] self.hwinfo_raw = snapshot["data"]["hwinfo"] @@ -362,7 +363,7 @@ class ParseSnapshotLsHw: def set_basic_datas(self): try: pc, self.components_obj = Computer.run( - self.lshw, self.hwinfo_raw, self.uuid, self.sid + self.lshw, self.hwinfo_raw, self.uuid, self.sid, self.version ) pc = pc.dump() minimum_hid = None in [pc['manufacturer'], pc['model'], pc['serialNumber']] @@ -546,13 +547,17 @@ class ParseSnapshotLsHw: return action - def errors(self, txt=None, severity=Severity.Info): + def errors(self, txt=None, severity=Severity.Error): if not txt: return self._errors logger.error(txt) self._errors.append(txt) error = SnapshotsLog( - description=txt, snapshot_uuid=self.uuid, severity=severity, sid=self.sid + description=txt, + snapshot_uuid=self.uuid, + severity=severity, + sid=self.sid, + version=self.version, ) error.save() From b8c97780be5b7208bb6edd29d554ae0a03fb573a Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 18 May 2022 18:02:08 +0200 Subject: [PATCH 14/29] add snapshotslog Ok result --- ereuse_devicehub/api/views.py | 1 + ereuse_devicehub/inventory/forms.py | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ereuse_devicehub/api/views.py b/ereuse_devicehub/api/views.py index 1385a78d..db7f0c9d 100644 --- a/ereuse_devicehub/api/views.py +++ b/ereuse_devicehub/api/views.py @@ -66,6 +66,7 @@ class InventoryView(LoginMixin, SnapshotMixin): severity=Severity.Info, sid=snapshot.sid, version=snapshot.version, + snapshot=snapshot, ) snap_log.save() diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index ce301fa7..9a6a1d14 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -236,10 +236,14 @@ class UploadSnapshotForm(SnapshotMixin, FlaskForm): schema_lite = Snapshot_lite() devices = [] self.tmp_snapshots = app.config['TMP_SNAPSHOTS'] + # import pdb; pdb.set_trace() for filename, snapshot_json in self.snapshots: path_snapshot = save_json(snapshot_json, self.tmp_snapshots, g.user.email) snapshot_json.pop('debug', None) version = snapshot_json.get('schema_api') + uuid = snapshot_json.get('uuid') + sid = snapshot_json.get('sid') + software_version = snapshot_json.get('version') if self.is_wb_lite_snapshot(version): self.snapshot_json = schema_lite.load(snapshot_json) snapshot_json = ParseSnapshotLsHw(self.snapshot_json).snapshot_json @@ -248,13 +252,12 @@ class UploadSnapshotForm(SnapshotMixin, FlaskForm): snapshot_json = schema.load(snapshot_json) except ValidationError as err: txt = "{}".format(err) - uuid = snapshot_json.get('uuid') - sid = snapshot_json.get('sid') error = SnapshotsLog( description=txt, snapshot_uuid=uuid, severity=Severity.Error, sid=sid, + version=software_version, ) error.save(commit=True) self.result[filename] = 'Error' @@ -263,6 +266,15 @@ class UploadSnapshotForm(SnapshotMixin, FlaskForm): response = self.build(snapshot_json) db.session.add(response) devices.append(response.device) + snap_log = SnapshotsLog( + description='Ok', + snapshot_uuid=uuid, + severity=Severity.Error, + sid=sid, + version=software_version, + snapshot=response, + ) + snap_log.save() if hasattr(response, 'type'): self.result[filename] = 'Ok' From 04969ad9399c3d9b0f0d7fca42427dfb655e32dd Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 18 May 2022 18:02:38 +0200 Subject: [PATCH 15/29] clean template --- .../templates/inventory/snapshot_list.html | 73 ------------------- 1 file changed, 73 deletions(-) delete mode 100644 ereuse_devicehub/templates/inventory/snapshot_list.html diff --git a/ereuse_devicehub/templates/inventory/snapshot_list.html b/ereuse_devicehub/templates/inventory/snapshot_list.html deleted file mode 100644 index f34e7930..00000000 --- a/ereuse_devicehub/templates/inventory/snapshot_list.html +++ /dev/null @@ -1,73 +0,0 @@ -{% extends "ereuse_devicehub/base_site.html" %} -{% block main %} - -
    -

    Inventory

    - -
    - -
    -
    - -
    - -
    -
    - -
    -
    -
    - - - - - - - - - - - - {% for snap in snapshot_errors %} - - - - - - - - {% endfor %} - -
    WBIDSnapshot idDeviceErrorsTime
    - {{ snap.wbid }} - - {{ snap.snapshot_uuid }} - - - {{ snap.description }} - {{ snap.created.strftime('%H:%M %d-%m-%Y') }}
    - -
    -
    - -
    -
    -
    -
    - -
    - -
    - -
    - - - -{% endblock main %} From f2a7a158516b34f0e49a8f4337e150fbf8f48f20 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 18 May 2022 18:25:21 +0200 Subject: [PATCH 16/29] drop pdbs --- ereuse_devicehub/inventory/forms.py | 1 - ereuse_devicehub/resources/device/models.py | 1 - 2 files changed, 2 deletions(-) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index 9a6a1d14..fc67db1d 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -236,7 +236,6 @@ class UploadSnapshotForm(SnapshotMixin, FlaskForm): schema_lite = Snapshot_lite() devices = [] self.tmp_snapshots = app.config['TMP_SNAPSHOTS'] - # import pdb; pdb.set_trace() for filename, snapshot_json in self.snapshots: path_snapshot = save_json(snapshot_json, self.tmp_snapshots, g.user.email) snapshot_json.pop('debug', None) diff --git a/ereuse_devicehub/resources/device/models.py b/ereuse_devicehub/resources/device/models.py index 771ee725..88c02e1b 100644 --- a/ereuse_devicehub/resources/device/models.py +++ b/ereuse_devicehub/resources/device/models.py @@ -358,7 +358,6 @@ class Device(Thing): from ereuse_devicehub.resources.device import states with suppress(LookupError, ValueError): - # import pdb; pdb.set_trace() return self.last_action_of(*states.Physical.actions()) @property From 0bc75ec547c94fb06f3a8e46631ebb433ba08465 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 18 May 2022 18:26:01 +0200 Subject: [PATCH 17/29] add get_status --- ereuse_devicehub/parser/models.py | 6 ++++++ ereuse_devicehub/parser/parser.py | 8 ++++---- ereuse_devicehub/templates/inventory/snapshots_list.html | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ereuse_devicehub/parser/models.py b/ereuse_devicehub/parser/models.py index 5f861647..b6e7d2eb 100644 --- a/ereuse_devicehub/parser/models.py +++ b/ereuse_devicehub/parser/models.py @@ -34,3 +34,9 @@ class SnapshotsLog(Thing): if commit: db.session.commit() + + def get_status(self): + if self.severity: + return Severity(self.severity) + + return '' diff --git a/ereuse_devicehub/parser/parser.py b/ereuse_devicehub/parser/parser.py index f20d91d9..ac18a75b 100644 --- a/ereuse_devicehub/parser/parser.py +++ b/ereuse_devicehub/parser/parser.py @@ -422,7 +422,7 @@ class ParseSnapshotLsHw: uuid=self.uuid, size=size, sid=self.sid ) ) - self.errors(txt) + self.errors(txt, severity=Severity.Warning) return 128 size, units = size.split(" ") return base2.Quantity(float(size), units).to('MiB').m @@ -433,7 +433,7 @@ class ParseSnapshotLsHw: txt = "Error: Snapshot: {uuid}, tag: {sid} have this ram Speed: {speed}".format( uuid=self.uuid, speed=speed, sid=self.sid ) - self.errors(txt) + self.errors(txt, severity=Severity.Warning) return 100 speed, units = speed.split(" ") return float(speed) @@ -468,7 +468,7 @@ class ParseSnapshotLsHw: txt = "Error: Snapshot: {uuid} tag: {sid} have this uuid: {device}".format( uuid=self.uuid, device=dmi_uuid, sid=self.sid ) - self.errors(txt) + self.errors(txt, severity=Severity.Warning) dmi_uuid = None return dmi_uuid @@ -515,7 +515,7 @@ class ParseSnapshotLsHw: interface, self.sid ) self.errors("{}".format(err)) - self.errors(txt) + self.errors(txt, severity=Severity.Warning) return "ATA" def get_data_storage_size(self, x): diff --git a/ereuse_devicehub/templates/inventory/snapshots_list.html b/ereuse_devicehub/templates/inventory/snapshots_list.html index 22ecd74d..c9c76a08 100644 --- a/ereuse_devicehub/templates/inventory/snapshots_list.html +++ b/ereuse_devicehub/templates/inventory/snapshots_list.html @@ -54,7 +54,7 @@ {% endif %} - {{ snap.severity }} + {{ snap.get_status() }} {{ snap.description }} From a919c0ee26e315f92216bff5130abaca5482d29d Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 19 May 2022 09:47:31 +0200 Subject: [PATCH 18/29] force query --- ereuse_devicehub/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ereuse_devicehub/views.py b/ereuse_devicehub/views.py index dc426d8e..d09ff3a4 100644 --- a/ereuse_devicehub/views.py +++ b/ereuse_devicehub/views.py @@ -64,6 +64,7 @@ class GenericMixin(View): ) ) .distinct() + .all() ) def get_context(self): From cea143dcbe4ccb58b9d8c9202ebbb9730d3bd0ce Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 19 May 2022 10:58:07 +0200 Subject: [PATCH 19/29] fix lot render --- ereuse_devicehub/resources/lot/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ereuse_devicehub/resources/lot/models.py b/ereuse_devicehub/resources/lot/models.py index 88c68626..7b7da4e2 100644 --- a/ereuse_devicehub/resources/lot/models.py +++ b/ereuse_devicehub/resources/lot/models.py @@ -106,11 +106,11 @@ class Lot(Thing): @property def is_incoming(self): - return bool(self.trade and self.trade.user_to == current_user) + return bool(self.trade and self.trade.user_to == g.user) @property def is_outgoing(self): - return bool(self.trade and self.trade.user_from == current_user) + return bool(self.trade and self.trade.user_from == g.user) @classmethod def descendantsq(cls, id): From 744b14f28699526e66447f20d19ca3629395880d Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 19 May 2022 13:48:52 +0200 Subject: [PATCH 20/29] join all snapshots logs in one for every uuid --- ereuse_devicehub/inventory/views.py | 37 +++++++++++++++++-- .../templates/inventory/snapshots_list.html | 12 ++---- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index a6c4fa2f..6c281cea 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -519,13 +519,42 @@ class SnapshotListView(GenericMixin): def dispatch_request(self): self.get_context() self.context['page_title'] = "Snapshots Logs" - snapshots_log = SnapshotsLog.query.filter( - SnapshotsLog.owner == current_user - ).order_by(SnapshotsLog.created.desc()) - self.context['snapshots_log'] = snapshots_log + self.context['snapshots_log'] = self.get_snapshots_log() return flask.render_template(self.template_name, **self.context) + def get_snapshots_log(self): + snapshots_log = SnapshotsLog.query.filter( + SnapshotsLog.owner == g.user + ).order_by(SnapshotsLog.created.desc()) + logs = {} + for snap in snapshots_log: + if snap.snapshot_uuid not in logs: + logs[snap.snapshot_uuid] = { + 'sid': snap.sid, + 'snapshot_uuid': snap.snapshot_uuid, + 'version': snap.version, + 'device': snap.snapshot.device.devicehub_id + if snap.snapshot + else '', + 'status': snap.get_status(), + 'severity': snap.severity, + 'created': snap.created, + } + continue + + if snap.created > logs[snap.snapshot_uuid]['created']: + logs[snap.snapshot_uuid]['created'] = snap.created + + if snap.severity > logs[snap.snapshot_uuid]['severity']: + logs[snap.snapshot_uuid]['severity'] = snap.severity + logs[snap.snapshot_uuid]['status'] = snap.get_status() + + result = sorted(logs.values(), key=lambda d: d['created']) + result.reverse() + + return result + devices.add_url_rule('/action/add/', view_func=NewActionView.as_view('action_add')) devices.add_url_rule('/action/trade/add/', view_func=NewTradeView.as_view('trade_add')) diff --git a/ereuse_devicehub/templates/inventory/snapshots_list.html b/ereuse_devicehub/templates/inventory/snapshots_list.html index c9c76a08..b7035613 100644 --- a/ereuse_devicehub/templates/inventory/snapshots_list.html +++ b/ereuse_devicehub/templates/inventory/snapshots_list.html @@ -30,7 +30,6 @@ Version Device Status - Description Time @@ -47,17 +46,14 @@ {{ snap.version }} - {% if snap.snapshot %} - - {{ snap.snapshot.device.devicehub_id }} + {% if snap.device %} + + {{ snap.device }} {% endif %} - {{ snap.get_status() }} - - - {{ snap.description }} + {{ snap.status }} {{ snap.created.strftime('%H:%M %d-%m-%Y') }} From 6ecbd4e09d448758be368042d7178b7a13457873 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 19 May 2022 18:16:47 +0200 Subject: [PATCH 21/29] add details of one entry snapshot log --- ereuse_devicehub/inventory/views.py | 31 +++++++++-- ereuse_devicehub/parser/models.py | 6 +++ .../templates/inventory/snapshot_detail.html | 54 +++++++++++++++++++ .../templates/inventory/snapshots_list.html | 6 +++ 4 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 ereuse_devicehub/templates/inventory/snapshot_detail.html diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 6c281cea..a54b06eb 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -534,9 +534,7 @@ class SnapshotListView(GenericMixin): 'sid': snap.sid, 'snapshot_uuid': snap.snapshot_uuid, 'version': snap.version, - 'device': snap.snapshot.device.devicehub_id - if snap.snapshot - else '', + 'device': snap.get_device(), 'status': snap.get_status(), 'severity': snap.severity, 'created': snap.created, @@ -556,6 +554,29 @@ class SnapshotListView(GenericMixin): return result +class SnapshotDetailView(GenericMixin): + template_name = 'inventory/snapshot_detail.html' + + def dispatch_request(self, snapshot_uuid): + self.snapshot_uuid = snapshot_uuid + self.get_context() + self.context['page_title'] = "Snapshot Detail" + self.context['snapshots_log'] = self.get_snapshots_log() + self.context['snapshot_uuid'] = snapshot_uuid + self.context['snapshot_sid'] = '' + if self.context['snapshots_log'].count(): + self.context['snapshot_sid'] = self.context['snapshots_log'][0].sid + + return flask.render_template(self.template_name, **self.context) + + def get_snapshots_log(self): + return ( + SnapshotsLog.query.filter(SnapshotsLog.owner == g.user) + .filter(SnapshotsLog.snapshot_uuid == self.snapshot_uuid) + .order_by(SnapshotsLog.created.desc()) + ) + + devices.add_url_rule('/action/add/', view_func=NewActionView.as_view('action_add')) devices.add_url_rule('/action/trade/add/', view_func=NewTradeView.as_view('trade_add')) devices.add_url_rule( @@ -603,3 +624,7 @@ devices.add_url_rule( '/export//', view_func=ExportsView.as_view('export') ) devices.add_url_rule('/snapshots/', view_func=SnapshotListView.as_view('snapshotslist')) +devices.add_url_rule( + '/snapshots//', + view_func=SnapshotDetailView.as_view('snapshot_detail'), +) diff --git a/ereuse_devicehub/parser/models.py b/ereuse_devicehub/parser/models.py index b6e7d2eb..949011d0 100644 --- a/ereuse_devicehub/parser/models.py +++ b/ereuse_devicehub/parser/models.py @@ -40,3 +40,9 @@ class SnapshotsLog(Thing): return Severity(self.severity) return '' + + def get_device(self): + if self.snapshot: + return self.snapshot.device.devicehub_id + + return '' diff --git a/ereuse_devicehub/templates/inventory/snapshot_detail.html b/ereuse_devicehub/templates/inventory/snapshot_detail.html new file mode 100644 index 00000000..4ea87572 --- /dev/null +++ b/ereuse_devicehub/templates/inventory/snapshot_detail.html @@ -0,0 +1,54 @@ +{% extends "ereuse_devicehub/base_site.html" %} +{% block main %} + +
    +

    Inventory

    + +
    + +
    +
    + +
    + +
    +
    +

    {{ snapshot_sid }} | {{ snapshot_uuid }}

    + +
    + +
    +
    Traceability log Details
    +
    + {% for log in snapshots_log %} +
    +
    +
    {{ log.get_status() }}
    + {{ log.created.strftime('%H:%M %d-%m-%Y') }} +
    +

    + Device: + {{ log.get_device() }}
    + Version: {{ log.version }}
    +

    +

    + + {{ log.description }} + +

    +
    + {% endfor %} +
    +
    + +
    +
    +
    +
    +
    +{% endblock main %} diff --git a/ereuse_devicehub/templates/inventory/snapshots_list.html b/ereuse_devicehub/templates/inventory/snapshots_list.html index b7035613..0a6084d1 100644 --- a/ereuse_devicehub/templates/inventory/snapshots_list.html +++ b/ereuse_devicehub/templates/inventory/snapshots_list.html @@ -37,10 +37,16 @@ {% for snap in snapshots_log %} + {% if snap.sid %} + {{ snap.sid }} + + {% endif %} + {{ snap.snapshot_uuid }} + {{ snap.version }} From bf455c40c9b58d4f5f87b21567ae0e34280c5418 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 20 May 2022 11:42:39 +0200 Subject: [PATCH 22/29] try to fix bug --- ereuse_devicehub/resources/lot/models.py | 242 ++++++++++++++--------- 1 file changed, 153 insertions(+), 89 deletions(-) diff --git a/ereuse_devicehub/resources/lot/models.py b/ereuse_devicehub/resources/lot/models.py index 7b7da4e2..1e1c5afe 100644 --- a/ereuse_devicehub/resources/lot/models.py +++ b/ereuse_devicehub/resources/lot/models.py @@ -10,7 +10,7 @@ from sqlalchemy import TEXT from sqlalchemy.dialects.postgresql import UUID from sqlalchemy_utils import LtreeType from sqlalchemy_utils.types.ltree import LQUERY -from teal.db import CASCADE_OWN, UUIDLtree, check_range, IntEnum +from teal.db import CASCADE_OWN, IntEnum, UUIDLtree, check_range from teal.resource import url_for_resource from ereuse_devicehub.db import create_view, db, exp, f @@ -21,70 +21,88 @@ from ereuse_devicehub.resources.user.models import User class Lot(Thing): - id = db.Column(UUID(as_uuid=True), primary_key=True) # uuid is generated on init by default + id = db.Column( + UUID(as_uuid=True), primary_key=True + ) # uuid is generated on init by default name = db.Column(CIText(), nullable=False) description = db.Column(CIText()) description.comment = """A comment about the lot.""" closed = db.Column(db.Boolean, default=False, nullable=False) closed.comment = """A closed lot cannot be modified anymore.""" - devices = db.relationship(Device, - backref=db.backref('lots', lazy=True, collection_class=set), - secondary=lambda: LotDevice.__table__, - lazy=True, - collection_class=set) + devices = db.relationship( + Device, + backref=db.backref('lots', lazy=True, collection_class=set), + secondary=lambda: LotDevice.__table__, + lazy=True, + collection_class=set, + ) """The **children** devices that the lot has. Note that the lot can have more devices, if they are inside descendant lots. """ - parents = db.relationship(lambda: Lot, - viewonly=True, - lazy=True, - collection_class=set, - secondary=lambda: LotParent.__table__, - primaryjoin=lambda: Lot.id == LotParent.child_id, - secondaryjoin=lambda: LotParent.parent_id == Lot.id, - cascade='refresh-expire', # propagate changes outside ORM - backref=db.backref('children', - viewonly=True, - lazy=True, - cascade='refresh-expire', - collection_class=set) - ) + parents = db.relationship( + lambda: Lot, + viewonly=True, + lazy=True, + collection_class=set, + secondary=lambda: LotParent.__table__, + primaryjoin=lambda: Lot.id == LotParent.child_id, + secondaryjoin=lambda: LotParent.parent_id == Lot.id, + cascade='refresh-expire', # propagate changes outside ORM + backref=db.backref( + 'children', + viewonly=True, + lazy=True, + cascade='refresh-expire', + collection_class=set, + ), + ) """The parent lots.""" - all_devices = db.relationship(Device, - viewonly=True, - lazy=True, - collection_class=set, - secondary=lambda: LotDeviceDescendants.__table__, - primaryjoin=lambda: Lot.id == LotDeviceDescendants.ancestor_lot_id, - secondaryjoin=lambda: LotDeviceDescendants.device_id == Device.id) + all_devices = db.relationship( + Device, + viewonly=True, + lazy=True, + collection_class=set, + secondary=lambda: LotDeviceDescendants.__table__, + primaryjoin=lambda: Lot.id == LotDeviceDescendants.ancestor_lot_id, + secondaryjoin=lambda: LotDeviceDescendants.device_id == Device.id, + ) """All devices, including components, inside this lot and its descendants. """ amount = db.Column(db.Integer, check_range('amount', min=0, max=100), default=0) - owner_id = db.Column(UUID(as_uuid=True), - db.ForeignKey(User.id), - nullable=False, - default=lambda: g.user.id) + owner_id = db.Column( + UUID(as_uuid=True), + db.ForeignKey(User.id), + nullable=False, + default=lambda: g.user.id, + ) owner = db.relationship(User, primaryjoin=owner_id == User.id) - transfer_state = db.Column(IntEnum(TransferState), default=TransferState.Initial, nullable=False) + transfer_state = db.Column( + IntEnum(TransferState), default=TransferState.Initial, nullable=False + ) transfer_state.comment = TransferState.__doc__ - receiver_address = db.Column(CIText(), - db.ForeignKey(User.email), - nullable=False, - default=lambda: g.user.email) + receiver_address = db.Column( + CIText(), + db.ForeignKey(User.email), + nullable=False, + default=lambda: g.user.email, + ) receiver = db.relationship(User, primaryjoin=receiver_address == User.email) - def __init__(self, name: str, closed: bool = closed.default.arg, - description: str = None) -> None: + def __init__( + self, name: str, closed: bool = closed.default.arg, description: str = None + ) -> None: """Initializes a lot :param name: :param closed: """ - super().__init__(id=uuid.uuid4(), name=name, closed=closed, description=description) + super().__init__( + id=uuid.uuid4(), name=name, closed=closed, description=description + ) Path(self) # Lots have always one edge per default. @property @@ -106,7 +124,10 @@ class Lot(Thing): @property def is_incoming(self): - return bool(self.trade and self.trade.user_to == g.user) + if hasattr(self, 'trade'): + return self.trade.user_to == g.user + return False + # return bool(self.trade and self.trade.user_to == g.user) @property def is_outgoing(self): @@ -115,7 +136,9 @@ class Lot(Thing): @classmethod def descendantsq(cls, id): _id = UUIDLtree.convert(id) - return (cls.id == Path.lot_id) & Path.path.lquery(exp.cast('*.{}.*'.format(_id), LQUERY)) + return (cls.id == Path.lot_id) & Path.path.lquery( + exp.cast('*.{}.*'.format(_id), LQUERY) + ) @classmethod def roots(cls): @@ -176,13 +199,17 @@ class Lot(Thing): if isinstance(child, Lot): return Path.has_lot(self.id, child.id) elif isinstance(child, Device): - device = db.session.query(LotDeviceDescendants) \ - .filter(LotDeviceDescendants.device_id == child.id) \ - .filter(LotDeviceDescendants.ancestor_lot_id == self.id) \ + device = ( + db.session.query(LotDeviceDescendants) + .filter(LotDeviceDescendants.device_id == child.id) + .filter(LotDeviceDescendants.ancestor_lot_id == self.id) .one_or_none() + ) return device else: - raise TypeError('Lot only contains devices and lots, not {}'.format(child.__class__)) + raise TypeError( + 'Lot only contains devices and lots, not {}'.format(child.__class__) + ) def __repr__(self) -> str: return ''.format(self) @@ -192,35 +219,44 @@ class LotDevice(db.Model): device_id = db.Column(db.BigInteger, db.ForeignKey(Device.id), primary_key=True) lot_id = db.Column(UUID(as_uuid=True), db.ForeignKey(Lot.id), primary_key=True) created = db.Column(db.DateTime, nullable=False, default=datetime.utcnow) - author_id = db.Column(UUID(as_uuid=True), - db.ForeignKey(User.id), - nullable=False, - default=lambda: g.user.id) + author_id = db.Column( + UUID(as_uuid=True), + db.ForeignKey(User.id), + nullable=False, + default=lambda: g.user.id, + ) author = db.relationship(User, primaryjoin=author_id == User.id) author_id.comment = """The user that put the device in the lot.""" class Path(db.Model): - id = db.Column(db.UUID(as_uuid=True), - primary_key=True, - server_default=db.text('gen_random_uuid()')) + id = db.Column( + db.UUID(as_uuid=True), + primary_key=True, + server_default=db.text('gen_random_uuid()'), + ) lot_id = db.Column(db.UUID(as_uuid=True), db.ForeignKey(Lot.id), nullable=False) - lot = db.relationship(Lot, - backref=db.backref('paths', - lazy=True, - collection_class=set, - cascade=CASCADE_OWN), - primaryjoin=Lot.id == lot_id) + lot = db.relationship( + Lot, + backref=db.backref( + 'paths', lazy=True, collection_class=set, cascade=CASCADE_OWN + ), + primaryjoin=Lot.id == lot_id, + ) path = db.Column(LtreeType, nullable=False) - created = db.Column(db.TIMESTAMP(timezone=True), server_default=db.text('CURRENT_TIMESTAMP')) + created = db.Column( + db.TIMESTAMP(timezone=True), server_default=db.text('CURRENT_TIMESTAMP') + ) created.comment = """When Devicehub created this.""" __table_args__ = ( # dag.delete_edge needs to disable internally/temporarily the unique constraint - db.UniqueConstraint(path, name='path_unique', deferrable=True, initially='immediate'), + db.UniqueConstraint( + path, name='path_unique', deferrable=True, initially='immediate' + ), db.Index('path_gist', path, postgresql_using='gist'), db.Index('path_btree', path, postgresql_using='btree'), - db.Index('lot_id_index', lot_id, postgresql_using='hash') + db.Index('lot_id_index', lot_id, postgresql_using='hash'), ) def __init__(self, lot: Lot) -> None: @@ -243,7 +279,9 @@ class Path(db.Model): child_id = UUIDLtree.convert(child_id) return bool( db.session.execute( - "SELECT 1 from path where path ~ '*.{}.*.{}.*'".format(parent_id, child_id) + "SELECT 1 from path where path ~ '*.{}.*.{}.*'".format( + parent_id, child_id + ) ).first() ) @@ -263,47 +301,73 @@ class LotDeviceDescendants(db.Model): """Ancestor lot table.""" _desc = Lot.__table__.alias() """Descendant lot table.""" - lot_device = _desc \ - .join(LotDevice, _desc.c.id == LotDevice.lot_id) \ - .join(Path, _desc.c.id == Path.lot_id) + lot_device = _desc.join(LotDevice, _desc.c.id == LotDevice.lot_id).join( + Path, _desc.c.id == Path.lot_id + ) """Join: Path -- Lot -- LotDevice""" - descendants = "path.path ~ (CAST('*.'|| replace(CAST({}.id as text), '-', '_') " \ - "|| '.*' AS LQUERY))".format(_ancestor.name) + descendants = ( + "path.path ~ (CAST('*.'|| replace(CAST({}.id as text), '-', '_') " + "|| '.*' AS LQUERY))".format(_ancestor.name) + ) """Query that gets the descendants of the ancestor lot.""" - devices = db.select([ - LotDevice.device_id, - _desc.c.id.label('parent_lot_id'), - _ancestor.c.id.label('ancestor_lot_id'), - None - ]).select_from(_ancestor).select_from(lot_device).where(db.text(descendants)) + devices = ( + db.select( + [ + LotDevice.device_id, + _desc.c.id.label('parent_lot_id'), + _ancestor.c.id.label('ancestor_lot_id'), + None, + ] + ) + .select_from(_ancestor) + .select_from(lot_device) + .where(db.text(descendants)) + ) # Components _parent_device = Device.__table__.alias(name='parent_device') """The device that has the access to the lot.""" - lot_device_component = lot_device \ - .join(_parent_device, _parent_device.c.id == LotDevice.device_id) \ - .join(Component, _parent_device.c.id == Component.parent_id) + lot_device_component = lot_device.join( + _parent_device, _parent_device.c.id == LotDevice.device_id + ).join(Component, _parent_device.c.id == Component.parent_id) """Join: Path -- Lot -- LotDevice -- ParentDevice (Device) -- Component""" - components = db.select([ - Component.id.label('device_id'), - _desc.c.id.label('parent_lot_id'), - _ancestor.c.id.label('ancestor_lot_id'), - LotDevice.device_id.label('device_parent_id'), - ]).select_from(_ancestor).select_from(lot_device_component).where(db.text(descendants)) + components = ( + db.select( + [ + Component.id.label('device_id'), + _desc.c.id.label('parent_lot_id'), + _ancestor.c.id.label('ancestor_lot_id'), + LotDevice.device_id.label('device_parent_id'), + ] + ) + .select_from(_ancestor) + .select_from(lot_device_component) + .where(db.text(descendants)) + ) __table__ = create_view('lot_device_descendants', devices.union(components)) class LotParent(db.Model): - i = f.index(Path.path, db.func.text2ltree(f.replace(exp.cast(Path.lot_id, TEXT), '-', '_'))) + i = f.index( + Path.path, db.func.text2ltree(f.replace(exp.cast(Path.lot_id, TEXT), '-', '_')) + ) __table__ = create_view( 'lot_parent', - db.select([ - Path.lot_id.label('child_id'), - exp.cast(f.replace(exp.cast(f.subltree(Path.path, i - 1, i), TEXT), '_', '-'), - UUID).label('parent_id') - ]).select_from(Path).where(i > 0), + db.select( + [ + Path.lot_id.label('child_id'), + exp.cast( + f.replace( + exp.cast(f.subltree(Path.path, i - 1, i), TEXT), '_', '-' + ), + UUID, + ).label('parent_id'), + ] + ) + .select_from(Path) + .where(i > 0), ) From 6bf419f59a943b7eca7d31c504635527f344100c Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 20 May 2022 11:45:53 +0200 Subject: [PATCH 23/29] try to fix bug --- ereuse_devicehub/resources/lot/models.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ereuse_devicehub/resources/lot/models.py b/ereuse_devicehub/resources/lot/models.py index 1e1c5afe..a8e957e2 100644 --- a/ereuse_devicehub/resources/lot/models.py +++ b/ereuse_devicehub/resources/lot/models.py @@ -127,11 +127,12 @@ class Lot(Thing): if hasattr(self, 'trade'): return self.trade.user_to == g.user return False - # return bool(self.trade and self.trade.user_to == g.user) @property def is_outgoing(self): - return bool(self.trade and self.trade.user_from == g.user) + if hasattr(self, 'trade'): + return self.trade.user_to == g.user + return False @classmethod def descendantsq(cls, id): From 9590cff19313d356e35de2eef38c8ef4ed38c45b Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 20 May 2022 13:44:11 +0200 Subject: [PATCH 24/29] bugfix parse errors messages --- ereuse_devicehub/inventory/forms.py | 2 +- ereuse_devicehub/parser/parser.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index fc67db1d..2e48e933 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -268,7 +268,7 @@ class UploadSnapshotForm(SnapshotMixin, FlaskForm): snap_log = SnapshotsLog( description='Ok', snapshot_uuid=uuid, - severity=Severity.Error, + severity=Severity.Info, sid=sid, version=software_version, snapshot=response, diff --git a/ereuse_devicehub/parser/parser.py b/ereuse_devicehub/parser/parser.py index ac18a75b..ee361738 100644 --- a/ereuse_devicehub/parser/parser.py +++ b/ereuse_devicehub/parser/parser.py @@ -418,7 +418,7 @@ class ParseSnapshotLsHw: size = ram.get("Size") if not len(size.split(" ")) == 2: txt = ( - "Error: Snapshot: {uuid}, tag: {sid} have this ram Size: {size}".format( + "Error: Snapshot: {uuid}, Sid: {sid} have this ram Size: {size}".format( uuid=self.uuid, size=size, sid=self.sid ) ) @@ -430,7 +430,7 @@ class ParseSnapshotLsHw: def get_ram_speed(self, ram): speed = ram.get("Speed", "100") if not len(speed.split(" ")) == 2: - txt = "Error: Snapshot: {uuid}, tag: {sid} have this ram Speed: {speed}".format( + txt = "Error: Snapshot: {uuid}, Sid: {sid} have this ram Speed: {speed}".format( uuid=self.uuid, speed=speed, sid=self.sid ) self.errors(txt, severity=Severity.Warning) @@ -465,7 +465,7 @@ class ParseSnapshotLsHw: uuid.UUID(dmi_uuid) except (ValueError, AttributeError) as err: self.errors("{}".format(err)) - txt = "Error: Snapshot: {uuid} tag: {sid} have this uuid: {device}".format( + txt = "Error: Snapshot: {uuid} sid: {sid} have this uuid: {device}".format( uuid=self.uuid, device=dmi_uuid, sid=self.sid ) self.errors(txt, severity=Severity.Warning) @@ -511,8 +511,8 @@ class ParseSnapshotLsHw: try: DataStorageInterface(interface.upper()) except ValueError as err: - txt = "tag: {}, interface {} is not in DataStorageInterface Enum".format( - interface, self.sid + txt = "Sid: {}, interface {} is not in DataStorageInterface Enum".format( + self.sid, interface ) self.errors("{}".format(err)) self.errors(txt, severity=Severity.Warning) From 1a8dc80067dd9751f5c694dc542b8080f2a5efca Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 20 May 2022 13:52:32 +0200 Subject: [PATCH 25/29] fix the info result --- ereuse_devicehub/parser/models.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ereuse_devicehub/parser/models.py b/ereuse_devicehub/parser/models.py index 949011d0..2da2f3ca 100644 --- a/ereuse_devicehub/parser/models.py +++ b/ereuse_devicehub/parser/models.py @@ -36,10 +36,7 @@ class SnapshotsLog(Thing): db.session.commit() def get_status(self): - if self.severity: - return Severity(self.severity) - - return '' + return Severity(self.severity) def get_device(self): if self.snapshot: From a4864869957cf355c85ae0dd67d5c3a2fc8c2e7f Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 20 May 2022 18:30:43 +0200 Subject: [PATCH 26/29] fix circular imports --- ereuse_devicehub/resources/action/views/snapshot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ereuse_devicehub/resources/action/views/snapshot.py b/ereuse_devicehub/resources/action/views/snapshot.py index 5e58b830..55a6065e 100644 --- a/ereuse_devicehub/resources/action/views/snapshot.py +++ b/ereuse_devicehub/resources/action/views/snapshot.py @@ -11,7 +11,6 @@ from marshmallow import ValidationError from sqlalchemy.util import OrderedSet from ereuse_devicehub.db import db -from ereuse_devicehub.parser.models import SnapshotsLog from ereuse_devicehub.resources.action.models import Snapshot from ereuse_devicehub.resources.device.models import Computer from ereuse_devicehub.resources.device.sync import Sync @@ -138,6 +137,7 @@ class SnapshotView(SnapshotMixin): try: self.snapshot_json = resource_def.schema.load(snapshot_json) except ValidationError as err: + from ereuse_devicehub.parser.models import SnapshotsLog txt = "{}".format(err) uuid = snapshot_json.get('uuid') error = SnapshotsLog( From 3f2d3df8176282d1492df1078edd37117dec0c72 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 20 May 2022 18:31:21 +0200 Subject: [PATCH 27/29] fix list for query --- ereuse_devicehub/views.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ereuse_devicehub/views.py b/ereuse_devicehub/views.py index d09ff3a4..dc426d8e 100644 --- a/ereuse_devicehub/views.py +++ b/ereuse_devicehub/views.py @@ -64,7 +64,6 @@ class GenericMixin(View): ) ) .distinct() - .all() ) def get_context(self): From d63a256da5d0064eaad6a5100e9e147702d82a30 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 20 May 2022 18:31:47 +0200 Subject: [PATCH 28/29] fix version in text --- ereuse_devicehub/api/views.py | 4 ++-- ereuse_devicehub/parser/parser.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ereuse_devicehub/api/views.py b/ereuse_devicehub/api/views.py index db7f0c9d..dd06042c 100644 --- a/ereuse_devicehub/api/views.py +++ b/ereuse_devicehub/api/views.py @@ -65,7 +65,7 @@ class InventoryView(LoginMixin, SnapshotMixin): snapshot_uuid=snapshot.uuid, severity=Severity.Info, sid=snapshot.sid, - version=snapshot.version, + version=str(snapshot.version), snapshot=snapshot, ) snap_log.save() @@ -97,7 +97,7 @@ class InventoryView(LoginMixin, SnapshotMixin): snapshot_uuid=uuid, severity=Severity.Error, sid=sid, - version=version, + version=str(version), ) error.save(commit=True) # raise err diff --git a/ereuse_devicehub/parser/parser.py b/ereuse_devicehub/parser/parser.py index ee361738..fa511f66 100644 --- a/ereuse_devicehub/parser/parser.py +++ b/ereuse_devicehub/parser/parser.py @@ -320,7 +320,7 @@ class ParseSnapshotLsHw: self.default = default self.uuid = snapshot.get("uuid") self.sid = snapshot.get("sid") - self.version = snapshot.get("version") + self.version = str(snapshot.get("version")) self.dmidecode_raw = snapshot["data"]["dmidecode"] self.smart = snapshot["data"]["smart"] self.hwinfo_raw = snapshot["data"]["hwinfo"] From 59379b41a58e131d236611b26574b457c2ff63e9 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 20 May 2022 18:32:07 +0200 Subject: [PATCH 29/29] fix tests --- tests/test_snapshot.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/test_snapshot.py b/tests/test_snapshot.py index b4e54237..c5c16599 100644 --- a/tests/test_snapshot.py +++ b/tests/test_snapshot.py @@ -978,7 +978,8 @@ def test_snapshot_wb_lite(user: UserClient): assert dev.actions[0].power_on_hours == 6032 errors = SnapshotsLog.query.filter().all() - assert errors == [] + assert len(errors) == 1 + assert errors[0].description == 'Ok' @pytest.mark.mvp @@ -1170,8 +1171,8 @@ def test_snapshot_lite_error_in_components(user: UserClient): dev = m.Device.query.filter_by(devicehub_id=bodyLite['dhid']).one() assert 'Motherboard' not in [x.type for x in dev.components] - error = SnapshotsLog.query.all()[0] - assert 'StopIteration' in error.description + error = SnapshotsLog.query.all() + assert 'StopIteration' in error[0].description @pytest.mark.mvp @@ -1228,7 +1229,7 @@ def test_snapshot_errors(user: UserClient): assert SnapshotsLog.query.all() == [] bodyLite, res = user.post(snapshot_lite, uri="/api/inventory/") dev = m.Device.query.filter_by(devicehub_id=bodyLite['dhid']).one() - assert len(SnapshotsLog.query.all()) == 2 + assert len(SnapshotsLog.query.all()) == 3 assert body11['device'].get('hid') == dev.hid assert body11['device']['id'] == dev.id @@ -1265,7 +1266,9 @@ def test_snapshot_errors_no_serial_number(user: UserClient): bodyLite, res = user.post(snapshot_lite, uri="/api/inventory/") assert res.status_code == 201 - assert len(SnapshotsLog.query.all()) == 0 + logs = SnapshotsLog.query.all() + assert len(logs) == 1 + assert logs[0].description == 'Ok' dev = m.Device.query.filter_by(devicehub_id=bodyLite['dhid']).one() assert not dev.model assert not dev.manufacturer