From 6a6c0e5182db3addaa3f42b8c199a6c1e1261f0e Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 18 Jul 2022 10:07:37 +0200 Subject: [PATCH 1/4] show a error message creating placeholder device --- ereuse_devicehub/inventory/views.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 52a1a04a..649cb0ca 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -261,10 +261,13 @@ class DeviceCreateView(GenericMixin): next_url = url_for('inventory.devicelist') if lot_id: next_url = url_for('inventory.lotdevicelist', lot_id=lot_id) - lots = self.context['lots'] - lot = lots.filter(Lot.id == lot_id).one() - lot.devices.add(snapshot.device) - db.session.add(lot) + if snapshot and snapshot.device: + lots = self.context['lots'] + lot = lots.filter(Lot.id == lot_id).one() + lot.devices.add(snapshot.device) + db.session.add(lot) + else: + messages.error('Sorry, the device could not be created') db.session.commit() messages.success('Device "{}" created successfully!'.format(form.type.data)) From 83ea86705d870667f646695e8c41059a0629c5c2 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 18 Jul 2022 10:56:05 +0200 Subject: [PATCH 2/4] test for add new placeholder in a lot --- tests/test_render_2_0.py | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/tests/test_render_2_0.py b/tests/test_render_2_0.py index 96415935..23ddf2d9 100644 --- a/tests/test_render_2_0.py +++ b/tests/test_render_2_0.py @@ -1938,3 +1938,38 @@ def test_placeholder_log_excel_update(user3: UserClientFlask): assert "Excel" in body assert "placeholder_test.xls" in body assert "placeholder_test.csv" in body + + +@pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) +def test_add_placeholder_excel_to_lot(user3: UserClientFlask): + user3.get('/inventory/lot/add/') + lot_name = 'lot1' + data = { + 'name': lot_name, + 'csrf_token': generate_csrf(), + } + user3.post('/inventory/lot/add/', data=data) + lot = Lot.query.filter_by(name=lot_name).one() + lot_id = lot.id + + uri = f'/inventory/lot/{lot_id}/upload-placeholder/' + body, status = user3.get(uri) + assert status == '200 OK' + assert "Upload Placeholder" in body + + 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") + assert Device.query.count() == 3 + dev = Device.query.first() + assert dev.hid == 'laptop-sony-vaio-12345678' + assert dev.placeholder.phid == 'a123' + assert dev.placeholder.info == 'Good conditions' + assert dev.placeholder.pallet == '24A' + assert dev.placeholder.id_device_supplier == 'TTT' From 26b322ba701b40998e7bd64e96b248366385dc99 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 18 Jul 2022 10:56:36 +0200 Subject: [PATCH 3/4] fix bug --- ereuse_devicehub/inventory/forms.py | 2 ++ ereuse_devicehub/inventory/views.py | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index 65d2b5c3..7bf53d4f 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -335,6 +335,7 @@ class NewDeviceForm(FlaskForm): screen = FloatField('Screen size', [validators.Optional()]) def __init__(self, *args, **kwargs): + self.objs = set() self._obj = kwargs.pop('_obj', None) super().__init__(*args, **kwargs) if self._obj: @@ -545,6 +546,7 @@ class NewDeviceForm(FlaskForm): type="New device", source='Web form', placeholder=device.placeholder ) db.session.add(placeholder_log) + self.objs.add(device) def reset_ids(self): if self.amount.data > 1: diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 649cb0ca..8749bf8e 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -257,15 +257,14 @@ class DeviceCreateView(GenericMixin): } ) if form.validate_on_submit(): - snapshot = form.save(commit=False) + form.save(commit=False) next_url = url_for('inventory.devicelist') if lot_id: next_url = url_for('inventory.lotdevicelist', lot_id=lot_id) - if snapshot and snapshot.device: + if form.objs: lots = self.context['lots'] lot = lots.filter(Lot.id == lot_id).one() - lot.devices.add(snapshot.device) - db.session.add(lot) + lot.devices = lot.devices.union(form.objs) else: messages.error('Sorry, the device could not be created') From 3a6032c17d9493d16466d895c116ae0d3242e451 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 18 Jul 2022 11:28:02 +0200 Subject: [PATCH 4/4] add test for new placeholder from a lot adding from form --- tests/test_render_2_0.py | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/tests/test_render_2_0.py b/tests/test_render_2_0.py index 23ddf2d9..944995e6 100644 --- a/tests/test_render_2_0.py +++ b/tests/test_render_2_0.py @@ -1942,7 +1942,7 @@ def test_placeholder_log_excel_update(user3: UserClientFlask): @pytest.mark.mvp @pytest.mark.usefixtures(conftest.app_context.__name__) -def test_add_placeholder_excel_to_lot(user3: UserClientFlask): +def test_add_placeholder_excel_from_lot(user3: UserClientFlask): user3.get('/inventory/lot/add/') lot_name = 'lot1' data = { @@ -1973,3 +1973,41 @@ def test_add_placeholder_excel_to_lot(user3: UserClientFlask): assert dev.placeholder.info == 'Good conditions' assert dev.placeholder.pallet == '24A' assert dev.placeholder.id_device_supplier == 'TTT' + assert len(lot.devices) == 3 + + +@pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) +def test_add_new_placeholder_from_lot(user3: UserClientFlask): + user3.get('/inventory/lot/add/') + lot_name = 'lot1' + data = { + 'name': lot_name, + 'csrf_token': generate_csrf(), + } + user3.post('/inventory/lot/add/', data=data) + lot = Lot.query.filter_by(name=lot_name).one() + assert len(lot.devices) == 0 + lot_id = lot.id + + uri = f'/inventory/lot/{lot_id}/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() + assert dev.hid == 'laptop-samsung-lc27t55-aaaab' + assert dev.placeholder.phid == 'ace' + assert len(lot.devices) == 1