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

Merge pull request #384 from eReuse/feature/3830-redirect-to-twin

Browse source 
add tests and redirect from abstract device to twin page
This commit is contained in:
cayop 2022-10-18 11:45:39 +02:00 committed by GitHub
parent fc86181311 106ab2f650
commit 177fbe1109
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ereuse_devicehub/resources/device/views.py
View file

@ -137,7 +137,10 @@ class DeviceView(View):
return self.one_private(id)
def one_public(self, id: int):
device = Device.query.filter_by(devicehub_id=id, active=True).one()
devices = Device.query.filter_by(devicehub_id=id, active=True).all()
if not devices:
devices = [Device.query.filter_by(dhid_bk=id, active=True).one()]
device = devices[0]
abstract = None
if device.binding:
return flask.redirect(device.public_link)

8
tests/test_render_2_0.py
View file

@ -1675,6 +1675,7 @@ def test_export_lots(user3: UserClientFlask):
@pytest.mark.mvp
@pytest.mark.usefixtures(conftest.app_context.__name__)
def test_export_snapshot_json(user3: UserClientFlask):
# ??
file_name = 'real-eee-1001pxd.snapshot.13.json'
snap = create_device(user3, file_name)
@ -2158,9 +2159,16 @@ def test_manual_binding(user3: UserClientFlask):
# check new structure
assert dev_wb.binding.phid == '1'
assert dev_wb.binding.device == dev
assert dev_wb.phid() == dev.phid()
assert dev_wb.is_abstract() == dev.is_abstract() == 'Twin'
# assert dev_wb.
assert Placeholder.query.filter_by(id=old_placeholder.id).first() is None
assert Device.query.filter_by(id=old_placeholder.device.id).first() is None
body_real, status = user3.get(f'/devices/{dhid_real}')
body_abstract, status = user3.get(f'/devices/{dhid_abstract}')
assert body_real == body_abstract
@pytest.mark.mvp
@pytest.mark.usefixtures(conftest.app_context.__name__)