From d93f040453f3319f6bd5b225e55654753f66049c Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 6 Jul 2022 18:37:27 +0200 Subject: [PATCH 1/5] add placeholder log models --- .../versions/3e3a67f62972_placeholder_log.py | 63 +++++++++++++++++++ ereuse_devicehub/parser/models.py | 44 +++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 ereuse_devicehub/migrations/versions/3e3a67f62972_placeholder_log.py diff --git a/ereuse_devicehub/migrations/versions/3e3a67f62972_placeholder_log.py b/ereuse_devicehub/migrations/versions/3e3a67f62972_placeholder_log.py new file mode 100644 index 00000000..aedb24bc --- /dev/null +++ b/ereuse_devicehub/migrations/versions/3e3a67f62972_placeholder_log.py @@ -0,0 +1,63 @@ +"""placeholder log + +Revision ID: 3e3a67f62972 +Revises: aeca9fb50cc6 +Create Date: 2022-07-06 18:23:54.267003 + +""" +import citext +import sqlalchemy as sa +from alembic import context, op +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision = '3e3a67f62972' +down_revision = 'aeca9fb50cc6' +branch_labels = None +depends_on = None + + +def get_inv(): + INV = context.get_x_argument(as_dictionary=True).get('inventory') + if not INV: + raise ValueError("Inventory value is not specified") + return INV + + +def upgrade(): + op.create_table( + 'placeholders_log', + 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('source', citext.CIText(), nullable=True), + sa.Column('type', citext.CIText(), nullable=True), + sa.Column('status', sa.SmallInteger(), nullable=True), + sa.Column('placeholder_id', sa.BigInteger(), nullable=True), + sa.Column('owner_id', postgresql.UUID(as_uuid=True), nullable=False), + sa.ForeignKeyConstraint( + ['placeholder_id'], + [f'{get_inv()}.placeholder.id'], + ), + sa.ForeignKeyConstraint( + ['owner_id'], + ['common.user.id'], + ), + sa.PrimaryKeyConstraint('id'), + ) + + +def downgrade(): + op.drop_table('placeholders_log') diff --git a/ereuse_devicehub/parser/models.py b/ereuse_devicehub/parser/models.py index 2da2f3ca..09749f51 100644 --- a/ereuse_devicehub/parser/models.py +++ b/ereuse_devicehub/parser/models.py @@ -5,6 +5,7 @@ from sqlalchemy.dialects.postgresql import UUID from ereuse_devicehub.db import db from ereuse_devicehub.resources.action.models import Snapshot +from ereuse_devicehub.resources.device.models import Placeholder from ereuse_devicehub.resources.enums import Severity from ereuse_devicehub.resources.models import Thing from ereuse_devicehub.resources.user.models import User @@ -43,3 +44,46 @@ class SnapshotsLog(Thing): return self.snapshot.device.devicehub_id return '' + + +class PlaceholdersLog(Thing): + """A Placeholder log.""" + + id = Column(BigInteger, Sequence('snapshots_log_seq'), primary_key=True) + source = Column(CIText(), default='', nullable=True) + type = Column(CIText(), default='', nullable=True) + status = Column(CIText(), default='', nullable=True) + + placeholder_id = Column( + UUID(as_uuid=True), db.ForeignKey(Snapshot.id), nullable=True + ) + placeholder = db.relationship( + Snapshot, primaryjoin=placeholder_id == Placeholder.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) + + def save(self, commit=False): + db.session.add(self) + + if commit: + db.session.commit() + + @property + def phid(self): + if self.placeholder: + return self.placeholder.phid + + return '' + + @property + def dhid(self): + if self.placeholder: + return self.placeholder.device.dhid + + return '' From d4824a43333ccde98813384f6ee0fd6b1cf4278b Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 7 Jul 2022 13:10:05 +0200 Subject: [PATCH 2/5] add placeholder log in form --- ereuse_devicehub/inventory/forms.py | 25 +++++- ereuse_devicehub/inventory/views.py | 25 +++++- .../versions/3e3a67f62972_placeholder_log.py | 3 +- ereuse_devicehub/parser/models.py | 13 +-- .../templates/ereuse_devicehub/base_site.html | 9 +++ .../inventory/placeholder_log_list.html | 80 +++++++++++++++++++ 6 files changed, 143 insertions(+), 12 deletions(-) create mode 100644 ereuse_devicehub/templates/inventory/placeholder_log_list.html diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index 306744c9..65d2b5c3 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -30,6 +30,7 @@ from wtforms.fields import FormField from ereuse_devicehub.db import db from ereuse_devicehub.inventory.models import DeliveryNote, ReceiverNote, Transfer +from ereuse_devicehub.parser.models import PlaceholdersLog from ereuse_devicehub.parser.parser import ParseSnapshotLsHw from ereuse_devicehub.parser.schemas import Snapshot_lite from ereuse_devicehub.resources.action.models import Snapshot, Trade @@ -540,6 +541,11 @@ class NewDeviceForm(FlaskForm): device.placeholder = self.get_placeholder() db.session.add(device) + placeholder_log = PlaceholdersLog( + type="New device", source='Web form', placeholder=device.placeholder + ) + db.session.add(placeholder_log) + def reset_ids(self): if self.amount.data > 1: self.phid.data = None @@ -595,6 +601,10 @@ class NewDeviceForm(FlaskForm): and self.functionality.data != self._obj.functionality().name ): self._obj.set_functionality(self.functionality.data) + placeholder_log = PlaceholdersLog( + type="Update", source='Web form', placeholder=self._obj.placeholder + ) + db.session.add(placeholder_log) class TagDeviceForm(FlaskForm): @@ -1445,6 +1455,7 @@ class UploadPlaceholderForm(FlaskForm): _file = files[0] if _file.content_type == 'text/csv': + self.source = "CSV File: {}".format(_file.filename) delimiter = ';' data = pd.read_csv(_file).to_dict() head = list(data.keys())[0].split(delimiter) @@ -1458,6 +1469,7 @@ class UploadPlaceholderForm(FlaskForm): for k, v in x.items(): data[head[i]][k] = v[i] else: + self.source = "Excel File: {}".format(_file.filename) try: data = pd.read_excel(_file).to_dict() except ValueError: @@ -1514,7 +1526,10 @@ class UploadPlaceholderForm(FlaskForm): placeholder.pallet = "{}".format(data['Pallet'][i]) placeholder.info = "{}".format(data['Info'][i]) - self.placeholders.append(device) + placeholder_log = PlaceholdersLog( + type="Update", source=self.source, placeholder=device.placeholder + ) + self.placeholders.append((device, placeholder_log)) continue # create a new one @@ -1540,14 +1555,18 @@ class UploadPlaceholderForm(FlaskForm): device = snapshot_json['device'] device.placeholder = Placeholder(**json_placeholder) - self.placeholders.append(device) + placeholder_log = PlaceholdersLog( + type="New device", source=self.source, placeholder=device.placeholder + ) + self.placeholders.append((device, placeholder_log)) return True def save(self, commit=True): - for device in self.placeholders: + for device, placeholder_log in self.placeholders: db.session.add(device) + db.session.add(placeholder_log) if commit: db.session.commit() diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index fad3abad..52a1a04a 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -34,7 +34,7 @@ from ereuse_devicehub.inventory.forms import ( UploadSnapshotForm, ) from ereuse_devicehub.labels.forms import PrintLabelsForm -from ereuse_devicehub.parser.models import SnapshotsLog +from ereuse_devicehub.parser.models import PlaceholdersLog, 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 @@ -880,7 +880,7 @@ class UploadPlaceholderView(GenericMixin): if lot_id: lots = self.context['lots'] lot = lots.filter(Lot.id == lot_id).one() - for device in snapshots: + for device, p in snapshots: lot.devices.add(device) db.session.add(lot) db.session.commit() @@ -889,6 +889,24 @@ class UploadPlaceholderView(GenericMixin): return flask.render_template(self.template_name, **self.context) +class PlaceholderLogListView(GenericMixin): + template_name = 'inventory/placeholder_log_list.html' + + def dispatch_request(self): + self.get_context() + self.context['page_title'] = "Placeholder Logs" + self.context['placeholders_log'] = self.get_placeholders_log() + + return flask.render_template(self.template_name, **self.context) + + def get_placeholders_log(self): + placeholder_log = PlaceholdersLog.query.filter( + PlaceholdersLog.owner == g.user + ).order_by(PlaceholdersLog.created.desc()) + + return placeholder_log + + 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( @@ -970,3 +988,6 @@ devices.add_url_rule( '/lot//upload-placeholder/', view_func=UploadPlaceholderView.as_view('lot_upload_placeholder'), ) +devices.add_url_rule( + '/placeholder-logs/', view_func=PlaceholderLogListView.as_view('placeholder_logs') +) diff --git a/ereuse_devicehub/migrations/versions/3e3a67f62972_placeholder_log.py b/ereuse_devicehub/migrations/versions/3e3a67f62972_placeholder_log.py index aedb24bc..aee0d162 100644 --- a/ereuse_devicehub/migrations/versions/3e3a67f62972_placeholder_log.py +++ b/ereuse_devicehub/migrations/versions/3e3a67f62972_placeholder_log.py @@ -44,7 +44,7 @@ def upgrade(): sa.Column('id', sa.BigInteger(), nullable=False), sa.Column('source', citext.CIText(), nullable=True), sa.Column('type', citext.CIText(), nullable=True), - sa.Column('status', sa.SmallInteger(), nullable=True), + sa.Column('severity', sa.SmallInteger(), nullable=False), sa.Column('placeholder_id', sa.BigInteger(), nullable=True), sa.Column('owner_id', postgresql.UUID(as_uuid=True), nullable=False), sa.ForeignKeyConstraint( @@ -56,6 +56,7 @@ def upgrade(): ['common.user.id'], ), sa.PrimaryKeyConstraint('id'), + schema=f'{get_inv()}', ) diff --git a/ereuse_devicehub/parser/models.py b/ereuse_devicehub/parser/models.py index 09749f51..61d4839d 100644 --- a/ereuse_devicehub/parser/models.py +++ b/ereuse_devicehub/parser/models.py @@ -52,13 +52,11 @@ class PlaceholdersLog(Thing): id = Column(BigInteger, Sequence('snapshots_log_seq'), primary_key=True) source = Column(CIText(), default='', nullable=True) type = Column(CIText(), default='', nullable=True) - status = Column(CIText(), default='', nullable=True) + severity = Column(SmallInteger, default=Severity.Info, nullable=False) - placeholder_id = Column( - UUID(as_uuid=True), db.ForeignKey(Snapshot.id), nullable=True - ) + placeholder_id = Column(BigInteger, db.ForeignKey(Placeholder.id), nullable=True) placeholder = db.relationship( - Snapshot, primaryjoin=placeholder_id == Placeholder.id + Placeholder, primaryjoin=placeholder_id == Placeholder.id ) owner_id = db.Column( UUID(as_uuid=True), @@ -84,6 +82,9 @@ class PlaceholdersLog(Thing): @property def dhid(self): if self.placeholder: - return self.placeholder.device.dhid + return self.placeholder.device.devicehub_id return '' + + def get_status(self): + return Severity(self.severity) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index 2eeb716a..96c9cf47 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -148,6 +148,15 @@ +
  • Placeholders
    • + +
  • + +
    • +
  • Devices
  • diff --git a/ereuse_devicehub/templates/inventory/placeholder_log_list.html b/ereuse_devicehub/templates/inventory/placeholder_log_list.html new file mode 100644 index 00000000..11aa1fc9 --- /dev/null +++ b/ereuse_devicehub/templates/inventory/placeholder_log_list.html @@ -0,0 +1,80 @@ +{% extends "ereuse_devicehub/base_site.html" %} +{% block main %} + +
    +

    {{ page_title }}

    + +
    + +
    +
    + +
    + +
    +
    + +
    +
    +
    + + + + + + + + + + + + + {% for log in placeholders_log %} + + + + + + + + + {% endfor %} + +
    PHIDPlaceholder sourceTypeDHIDStatusTime
    + {{ log.phid }} + + {{ log.source }} + + {{ log.type }} + + {% if log.dhid %} + {{ log.dhid }} + {% endif %} + + {{ log.get_status() }} + {{ log.created.strftime('%H:%M %d-%m-%Y') }}
    + +
    +
    + +
    +
    +
    +
    + +
    + +
    + +
    + + + +{% endblock main %} From c914705e29bed27c6ab73b6044a03b089189ed31 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 7 Jul 2022 13:10:37 +0200 Subject: [PATCH 3/5] add test files --- tests/files/placeholder_test.csv | 4 ++++ tests/files/placeholder_test.ods | Bin 0 -> 9699 bytes tests/files/placeholder_test.xlsx | Bin 0 -> 5057 bytes 3 files changed, 4 insertions(+) create mode 100644 tests/files/placeholder_test.csv create mode 100644 tests/files/placeholder_test.ods create mode 100644 tests/files/placeholder_test.xlsx diff --git a/tests/files/placeholder_test.csv b/tests/files/placeholder_test.csv new file mode 100644 index 00000000..7ec100d7 --- /dev/null +++ b/tests/files/placeholder_test.csv @@ -0,0 +1,4 @@ +Phid;Model;Manufacturer;Serial Number;Id device Supplier;Pallet;Info +a123;Vaio;Sony;12345678;TTT;24A;Good conditions +a124;Vaio;Sony;12345679;TTT;24A;Good conditions +a125;Vaio;Sony;12345680;TTT;24A;Good conditions diff --git a/tests/files/placeholder_test.ods b/tests/files/placeholder_test.ods new file mode 100644 index 0000000000000000000000000000000000000000..cc6b1fc56b39f4525380caf78e68c68d34740e2f GIT binary patch literal 9699 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 UfJb=v8P@&F@;>O;P(9rJ4{LLX&j0`b literal 0 HcmV?d00001 diff --git a/tests/files/placeholder_test.xlsx b/tests/files/placeholder_test.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..61cc9fc6afa58516b253454912df0e038d1a0303 GIT binary patch literal 5057 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 F{|D(eoEiWC literal 0 HcmV?d00001 From 2e3bc8137f3b418585248c3a1eb889bcf7efb47b Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 7 Jul 2022 15:49:21 +0200 Subject: [PATCH 4/5] add tests placeholder logs --- tests/test_render_2_0.py | 157 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/tests/test_render_2_0.py b/tests/test_render_2_0.py index e434b8c0..96415935 100644 --- a/tests/test_render_2_0.py +++ b/tests/test_render_2_0.py @@ -1781,3 +1781,160 @@ def test_edit_laptop(user3: UserClientFlask): assert dev.placeholder.id_device_supplier == 'a2' assert dev.serial_number == 'aaaac' assert dev.model == 'lc27t56' + + +@pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) +def test_placeholder_log_manual_new(user3: UserClientFlask): + uri = '/inventory/device/add/' + user3.get(uri) + data = { + 'csrf_token': generate_csrf(), + 'type': "Laptop", + 'phid': 'ace', + 'serial_number': "AAAAB", + 'model': "LC27T55", + 'manufacturer': "Samsung", + 'generation': 1, + 'weight': 0.1, + 'height': 0.1, + 'depth': 0.1, + 'id_device_supplier': "b2", + } + user3.post(uri, data=data) + + uri = '/inventory/placeholder-logs/' + body, status = user3.get(uri) + assert status == '200 OK' + assert "Placeholder Logs" in body + assert "Web form" in body + assert "ace" in body + assert "New device" in body + + +@pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) +def test_placeholder_log_manual_edit(user3: UserClientFlask): + uri = '/inventory/device/add/' + user3.get(uri) + data = { + 'csrf_token': generate_csrf(), + 'type': "Laptop", + 'phid': 'ace', + 'serial_number': "AAAAB", + 'model': "LC27T55", + 'manufacturer': "Samsung", + 'generation': 1, + 'weight': 0.1, + 'height': 0.1, + 'depth': 0.1, + 'id_device_supplier': "b2", + } + user3.post(uri, data=data) + dev = Device.query.one() + + uri = '/inventory/device/edit/{}/'.format(dev.devicehub_id) + user3.get(uri) + + data = { + 'csrf_token': generate_csrf(), + 'type': "Laptop", + 'serial_number': "AAAAC", + 'model': "LC27T56", + 'manufacturer': "Samsung", + 'generation': 1, + 'weight': 0.1, + 'height': 0.1, + 'depth': 0.1, + 'id_device_supplier': "a2", + } + user3.post(uri, data=data) + + uri = '/inventory/placeholder-logs/' + body, status = user3.get(uri) + assert status == '200 OK' + assert "Placeholder Logs" in body + assert "Web form" in body + assert "ace" in body + assert "Update" in body + assert dev.devicehub_id in body + assert "✓" in body + assert "CSV" not in body + assert "Excel" not in body + + +@pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) +def test_placeholder_log_excel_new(user3: UserClientFlask): + + uri = '/inventory/upload-placeholder/' + body, status = user3.get(uri) + + file_path = Path(__file__).parent.joinpath('files').joinpath('placeholder_test.xls') + with open(file_path, 'rb') as excel: + data = { + 'csrf_token': generate_csrf(), + 'type': "Laptop", + 'placeholder_file': excel, + } + user3.post(uri, data=data, content_type="multipart/form-data") + dev = Device.query.first() + assert dev.placeholder.phid == 'a123' + + uri = '/inventory/placeholder-logs/' + body, status = user3.get(uri) + assert status == '200 OK' + assert "Placeholder Logs" in body + assert dev.placeholder.phid in body + assert dev.devicehub_id in body + assert "Web form" not in body + assert "Update" not in body + assert "New device" in body + assert "✓" in body + assert "CSV" not in body + assert "Excel" in body + assert "placeholder_test.xls" in body + + +@pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) +def test_placeholder_log_excel_update(user3: UserClientFlask): + + uri = '/inventory/upload-placeholder/' + body, status = user3.get(uri) + + file_path = Path(__file__).parent.joinpath('files').joinpath('placeholder_test.xls') + with open(file_path, 'rb') as excel: + data = { + 'csrf_token': generate_csrf(), + 'type': "Laptop", + 'placeholder_file': excel, + } + user3.post(uri, data=data, content_type="multipart/form-data") + + file_path = Path(__file__).parent.joinpath('files').joinpath('placeholder_test.csv') + with open(file_path, 'rb') as excel: + data = { + 'csrf_token': generate_csrf(), + 'type': "Laptop", + 'placeholder_file': excel, + } + user3.post(uri, data=data, content_type="multipart/form-data") + + dev = Device.query.first() + assert dev.placeholder.phid == 'a123' + + uri = '/inventory/placeholder-logs/' + body, status = user3.get(uri) + assert status == '200 OK' + assert "Placeholder Logs" in body + assert dev.placeholder.phid in body + assert dev.devicehub_id in body + assert "Web form" not in body + assert "Update" in body + assert "New device" in body + assert "✓" in body + assert "CSV" in body + assert "Excel" in body + assert "placeholder_test.xls" in body + assert "placeholder_test.csv" in body From 4507a3206c65c77823fad6740263a90584f7c294 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 7 Jul 2022 16:18:51 +0200 Subject: [PATCH 5/5] add secuence and remove schema for placeholder_log --- .../migrations/versions/3e3a67f62972_placeholder_log.py | 3 ++- .../migrations/versions/aeca9fb50cc6_add_placeholder.py | 2 ++ ereuse_devicehub/parser/models.py | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ereuse_devicehub/migrations/versions/3e3a67f62972_placeholder_log.py b/ereuse_devicehub/migrations/versions/3e3a67f62972_placeholder_log.py index aee0d162..b3850218 100644 --- a/ereuse_devicehub/migrations/versions/3e3a67f62972_placeholder_log.py +++ b/ereuse_devicehub/migrations/versions/3e3a67f62972_placeholder_log.py @@ -56,9 +56,10 @@ def upgrade(): ['common.user.id'], ), sa.PrimaryKeyConstraint('id'), - schema=f'{get_inv()}', ) + op.execute("CREATE SEQUENCE placeholders_log_seq START 1;") def downgrade(): op.drop_table('placeholders_log') + op.execute("DROP SEQUENCE placeholders_log_seq;") diff --git a/ereuse_devicehub/migrations/versions/aeca9fb50cc6_add_placeholder.py b/ereuse_devicehub/migrations/versions/aeca9fb50cc6_add_placeholder.py index d013b64e..878cb6ec 100644 --- a/ereuse_devicehub/migrations/versions/aeca9fb50cc6_add_placeholder.py +++ b/ereuse_devicehub/migrations/versions/aeca9fb50cc6_add_placeholder.py @@ -50,7 +50,9 @@ def upgrade(): sa.PrimaryKeyConstraint('id'), schema=f'{get_inv()}', ) + op.execute("CREATE SEQUENCE placeholder_seq START 1;") def downgrade(): op.drop_table('placeholder', schema=f'{get_inv()}') + op.execute("DROP SEQUENCE placeholder_log_seq;") diff --git a/ereuse_devicehub/parser/models.py b/ereuse_devicehub/parser/models.py index 61d4839d..d8b4b62b 100644 --- a/ereuse_devicehub/parser/models.py +++ b/ereuse_devicehub/parser/models.py @@ -49,7 +49,8 @@ class SnapshotsLog(Thing): class PlaceholdersLog(Thing): """A Placeholder log.""" - id = Column(BigInteger, Sequence('snapshots_log_seq'), primary_key=True) + __table_args__ = {'schema': ''} + id = Column(BigInteger, Sequence('placeholders_log_seq'), primary_key=True) source = Column(CIText(), default='', nullable=True) type = Column(CIText(), default='', nullable=True) severity = Column(SmallInteger, default=Severity.Info, nullable=False)