relationships: the cleanup tools stop acting on links that were deleted
Deleting a relationship is soft, so the row survives with isactive False, and three things read them without knowing that. Re-adding a deleted link answered 409 "this relationship already exists" about a link the page no longer shows, and there was no way forward from the UI at all - the row cannot simply be inserted again, since the triple is unique. Reactivating IS the create for an inactive row. The inverse guard blocked on a deleted inverse, which made "remove the existing one first" - the instruction in its own message - fail to unblock anything. fix-controls-direction retired the reversed row whenever a correctly-directed one existed, without checking whether that one was itself deleted. So it removed the only live link and reported a successful clean-up. It now reactivates the row pointing the right way before retiring the one pointing the wrong way. These are the commands the docs tell an operator to run against production.
This commit is contained in:
76
tests/test_core/test_relationship_soft_delete.py
Normal file
76
tests/test_core/test_relationship_soft_delete.py
Normal file
@@ -0,0 +1,76 @@
|
||||
"""Deleting a relationship is soft, and everything that reads them must know.
|
||||
|
||||
Rows are retired with isactive = False, never removed, and assetrelationships is
|
||||
unique on (source, target, type). Anything that looks a relationship up without
|
||||
filtering on isactive therefore sees links the UI does not show - and refuses to
|
||||
create one it cannot create any other way, or retires the last live row believing
|
||||
another one covers it.
|
||||
"""
|
||||
|
||||
import pytest
|
||||
|
||||
from shopdb.core.models import Asset, AssetType
|
||||
from shopdb.core.models.relationship import RelationshipType, AssetRelationship
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def rig(db):
|
||||
if not AssetType.query.filter_by(assettype='computer').first():
|
||||
db.session.add(AssetType(assettype='computer'))
|
||||
if not AssetType.query.filter_by(assettype='machine').first():
|
||||
db.session.add(AssetType(assettype='machine'))
|
||||
controls = RelationshipType.query.filter_by(relationshiptype='controls').first()
|
||||
if not controls:
|
||||
controls = RelationshipType(relationshiptype='controls', isdirectional=True)
|
||||
db.session.add(controls)
|
||||
controls.isdirectional = True
|
||||
db.session.commit()
|
||||
computer = AssetType.query.filter_by(assettype='computer').first()
|
||||
machine = AssetType.query.filter_by(assettype='machine').first()
|
||||
pc = Asset(assetnumber='PCSOFT01', assettypeid=computer.assettypeid)
|
||||
bay = Asset(assetnumber='BAYSOFT01', assettypeid=machine.assettypeid)
|
||||
db.session.add_all([pc, bay])
|
||||
db.session.commit()
|
||||
return {'pc': pc, 'bay': bay, 'controls': controls}
|
||||
|
||||
|
||||
def _create(client, headers, source, target, typeid):
|
||||
return client.post('/api/assets/relationships',
|
||||
json={'sourceassetid': source, 'targetassetid': target,
|
||||
'relationshiptypeid': typeid},
|
||||
headers=headers)
|
||||
|
||||
|
||||
def test_a_deleted_relationship_can_be_created_again(client, db, rig, auth_headers):
|
||||
"""Soft delete then re-add answered 409 about a link nothing displayed."""
|
||||
created = _create(client, auth_headers, rig['pc'].assetid, rig['bay'].assetid,
|
||||
rig['controls'].relationshiptypeid)
|
||||
assert created.status_code == 201, created.get_json()
|
||||
relid = created.get_json()['data']['relationshipid']
|
||||
|
||||
assert client.delete('/api/assets/relationships/%d' % relid,
|
||||
headers=auth_headers).status_code == 200
|
||||
|
||||
again = _create(client, auth_headers, rig['pc'].assetid, rig['bay'].assetid,
|
||||
rig['controls'].relationshiptypeid)
|
||||
assert again.status_code in (200, 201), again.get_json()
|
||||
row = db.session.get(AssetRelationship, relid)
|
||||
assert row.isactive is True
|
||||
assert AssetRelationship.query.filter_by(
|
||||
sourceassetid=rig['pc'].assetid,
|
||||
targetassetid=rig['bay'].assetid).count() == 1
|
||||
|
||||
|
||||
def test_a_deleted_inverse_does_not_block_the_right_direction(
|
||||
client, db, rig, auth_headers):
|
||||
"""'Remove the existing one first' is the advice the guard itself gives."""
|
||||
wrong = _create(client, auth_headers, rig['bay'].assetid, rig['pc'].assetid,
|
||||
rig['controls'].relationshiptypeid)
|
||||
assert wrong.status_code == 201
|
||||
relid = wrong.get_json()['data']['relationshipid']
|
||||
assert client.delete('/api/assets/relationships/%d' % relid,
|
||||
headers=auth_headers).status_code == 200
|
||||
|
||||
right = _create(client, auth_headers, rig['pc'].assetid, rig['bay'].assetid,
|
||||
rig['controls'].relationshiptypeid)
|
||||
assert right.status_code in (200, 201), right.get_json()
|
||||
Reference in New Issue
Block a user