Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-09 17:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

owner.remove_role - fix error handling resource level rel (fe1e307)

Browse Source 
It's probably was just an overlook in the original commit - it was referring to `settings["organisation"]`, though `"organization"` was never passed, leading to an error. And probably by accident remove_role tests were using the same tests as remove_organization, so the issue went under the radar for a while.
This commit is contained in:
Andrej730
2025-07-15 12:34:01 +05:00
parent 03fa850ce2
commit 262739f37a
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/api/owner/remove_role.py
+3 -2
View File
@@ -42,7 +42,8 @@ def remove_role(file: ifcopenshell.file, role: ifcopenshell.entity_instance) ->
if inverse.is_a() in ("IfcOrganization", "IfcPerson", "IfcPersonAndOrganization"):
if inverse.Roles == (role,):
inverse.Roles = None
elif inverse.is_a("IfcResourceLevelRelationship") and not inverse.is_a("IfcOrganizationRelationship"):
if inverse.RelatedResourceObjects == (organisation,):
elif inverse.is_a("IfcResourceLevelRelationship"):
# IfcResourceConstraintRelationship or other rels with IfcResourceObjectSelect.
if inverse.RelatedResourceObjects == (role,):
file.remove(inverse)
file.remove(role)
src/ifcopenshell-python/test/api/owner/test_remove_role.py
+10 -9
View File
@@ -49,20 +49,21 @@ class TestRemoveRoleIFC2X3(test.bootstrap.IFC2X3):
class TestRemoveRoleIFC4(test.bootstrap.IFC4, TestRemoveRoleIFC2X3):
# IfcResourceLevelRelationships were added in IFC4.
def test_deleting_resource_approval_relationships(self):
organisation = self.file.create_entity("IfcOrganization")
self.file.create_entity("IfcResourceApprovalRelationship", RelatedResourceObjects=[organisation])
ifcopenshell.api.owner.remove_organisation(self.file, organisation=organisation)
role = self.file.create_entity("IfcActorRole")
self.file.create_entity("IfcResourceApprovalRelationship", RelatedResourceObjects=[role])
ifcopenshell.api.owner.remove_role(self.file, role=role)
assert len(self.file.by_type("IfcResourceApprovalRelationship")) == 0
def test_deleting_resource_constraint_relationships(self):
organisation = self.file.create_entity("IfcOrganization")
self.file.create_entity("IfcResourceConstraintRelationship", RelatedResourceObjects=[organisation])
ifcopenshell.api.owner.remove_organisation(self.file, organisation=organisation)
role = self.file.create_entity("IfcActorRole")
self.file.create_entity("IfcResourceConstraintRelationship", RelatedResourceObjects=[role])
ifcopenshell.api.owner.remove_role(self.file, role=role)
assert len(self.file.by_type("IfcResourceConstraintRelationship")) == 0
def test_deleting_external_reference_relationships(self):
organisation = self.file.create_entity("IfcOrganization")
self.file.create_entity("IfcExternalReferenceRelationship", RelatedResourceObjects=[organisation])
ifcopenshell.api.owner.remove_organisation(self.file, organisation=organisation)
role = self.file.create_entity("IfcActorRole")
self.file.create_entity("IfcExternalReferenceRelationship", RelatedResourceObjects=[role])
ifcopenshell.api.owner.remove_role(self.file, role=role)
assert len(self.file.by_type("IfcExternalReferenceRelationship")) == 0