Code review for assign product with myoualid

src/ifcopenshell-python/ifcopenshell/api/control/assign_control.py

@@ -13,27 +13,18 @@ class Usecase:
             self.settings[key] = value
 
     def execute(self):
-        has_assignments = None
         if self.settings["related_object"].HasAssignments:
-            for assignement in self.settings["related_object"].HasAssignments:
-                if assignement.is_a("IfclRelAssignsToControl"):
-                    has_assignments = assignement
+            for assignment in self.settings["related_object"].HasAssignments:
+                if (
+                    assignment.is_a("IfclRelAssignsToControl")
+                    and assignment.RelatingControl == self.settings["relating_control"]
+                ):
+                    return
 
         controls = None
-        for rel in self.settings["relating_control"].Controls:
-            if rel.is_a("IfcRelAssignsToControl"):
-                controls = rel
-                break
-        if has_assignments and has_assignments == controls:
-            return
-        if has_assignments:
-            related_objects = list(has_assignments.RelatedObjects)
-            related_objects.remove(self.settings["related_object"])
-            if related_objects:
-                has_assignments.RelatedObjects = related_objects
-                ifcopenshell.api.run("owner.update_owner_history", self.file, **{"element": has_assignments})
-            else:
-                self.file.remove(has_assignments)
+        if self.settings["relating_control"].Controls:
+            controls = self.settings["relating_control"].Controls[0]
+
         if controls:
             related_objects = list(controls.RelatedObjects)
             related_objects.append(self.settings["related_object"])

src/ifcopenshell-python/ifcopenshell/api/nest/assign_object.py

@@ -6,7 +6,7 @@ class Usecase:
     def __init__(self, file, **settings):
         self.file = file
         self.settings = {
-            "object": None,
+            "related_object": None,
             "relating_object": None,
         }
         for key, value in settings.items():
@@ -14,8 +14,8 @@ class Usecase:
 
     def execute(self):
         nests = None
-        if self.settings["object"].Nests:
-            nests = self.settings["object"].Nests[0]
+        if self.settings["related_object"].Nests:
+            nests = self.settings["related_object"].Nests[0]
 
         is_nested_by = None
         for rel in self.settings["relating_object"].IsNestedBy:
@@ -28,7 +28,7 @@ class Usecase:
 
         if nests:
             related_objects = list(nests.RelatedObjects)
-            related_objects.remove(self.settings["object"])
+            related_objects.remove(self.settings["related_object"])
             if related_objects:
                 nests.RelatedObjects = related_objects
                 ifcopenshell.api.run("owner.update_owner_history", self.file, **{"element": nests})
@@ -37,7 +37,7 @@ class Usecase:
 
         if is_nested_by:
             related_objects = list(is_nested_by.RelatedObjects)
-            related_objects.append(self.settings["object"])
+            related_objects.append(self.settings["related_object"])
             is_nested_by.RelatedObjects = related_objects
             ifcopenshell.api.run("owner.update_owner_history", self.file, **{"element": is_nested_by})
         else:
@@ -46,7 +46,7 @@ class Usecase:
                 **{
                     "GlobalId": ifcopenshell.guid.new(),
                     "OwnerHistory": ifcopenshell.api.run("owner.create_owner_history", self.file),
-                    "RelatedObjects": [self.settings["object"]],
+                    "RelatedObjects": [self.settings["related_object"]],
                     "RelatingObject": self.settings["relating_object"],
                 }
             )

src/ifcopenshell-python/ifcopenshell/api/sequence/assign_product.py

@@ -7,50 +7,37 @@ class Usecase:
         self.file = file
         self.settings = {
             "relating_product": None,
-            "related_process": None,
+            "related_object": None,
         }
         for key, value in settings.items():
             self.settings[key] = value
 
     def execute(self):
+        if self.settings["related_object"].HasAssignments:
+            for assignment in self.settings["related_object"].HasAssignments:
+                if (
+                    assignment.is_a("IfclRelAssignsToProduct")
+                    and assignment.RelatingProduct == self.settings["relating_product"]
+                ):
+                    return
+
         referenced_by = None
-
         if self.settings["relating_product"].ReferencedBy:
-            for rel in self.settings["relating_product"].ReferencedBy:
-                if rel.is_a("IfcRelAssignsToProduct"):
-                    referenced_by = rel
-
-        assignment = None
-        for rel in self.settings["related_process"].HasAssignments:
-            if rel.is_a('IfcRelAssignsToProduct'):
-                assignment = rel
-                break
-        if referenced_by and referenced_by == assignment:
-            return
-
-        if assignment:
-            related_objects = set(assignment.RelatedObjects)
-            related_objects.add(self.settings["relating_product"])
-            assignment.RelatedObjects = list(related_objects)
-            ifcopenshell.api.run("owner.update_owner_history", self.file, **{"element": assignment})
-        else:
-            rel = self.file.create_entity(
-            "IfcRelAssignsToProduct",
-            **{
-                "GlobalId": ifcopenshell.guid.new(),
-                "OwnerHistory": ifcopenshell.api.run("owner.create_owner_history", self.file),
-                "RelatingProduct": self.settings["relating_product"],
-                "RelatedObjects": [self.settings["related_process"]],
-            })
-            return rel
+            referenced_by = self.settings["relating_product"].ReferencedBy[0]
 
         if referenced_by:
             related_objects = list(referenced_by.RelatedObjects)
-            related_objects.remove(self.settings["relating_product"])
-            if related_objects:
-                referenced_by.RelatedObjects = related_objects
-                ifcopenshell.api.run("owner.update_owner_history", self.file, **{"element": referenced_by})
-            else:
-                self.file.remove(referenced_by)
-
-        return rel
+            related_objects.append(self.settings["related_object"])
+            referenced_by.RelatedObjects = related_objects
+            ifcopenshell.api.run("owner.update_owner_history", self.file, **{"element": referenced_by})
+        else:
+            referenced_by = self.file.create_entity(
+                "IfcRelAssignsToProduct",
+                **{
+                    "GlobalId": ifcopenshell.guid.new(),
+                    "OwnerHistory": ifcopenshell.api.run("owner.create_owner_history", self.file),
+                    "RelatedObjects": [self.settings["related_object"]],
+                    "RelatingProduct": self.settings["relating_product"],
+                }
+            )
+        return referenced_by