From da7d4dac7a132300a55f015b8585735d41df5238 Mon Sep 17 00:00:00 2001
From: Dion Moult <dion@thinkmoult.com>
Date: Mon, 11 Sep 2023 23:24:25 +1000
Subject: [PATCH] Implement COBie systems

---
 src/ifcfm/ifcfm/cobie.py | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/ifcfm/ifcfm/cobie.py b/src/ifcfm/ifcfm/cobie.py
index 151eb815ce..27b82fd1e7 100644
--- a/src/ifcfm/ifcfm/cobie.py
+++ b/src/ifcfm/ifcfm/cobie.py
@@ -95,7 +95,14 @@ def get_components(ifc_file):
 
 
 def get_systems(ifc_file):
-    return ifc_file.by_type("IfcSystem")
+    results = []
+    components = get_components(ifc_file)
+    systems = ifc_file.by_type("IfcSystem", include_subtypes=False) + ifc_file.by_type("IfcDistributionSystem")
+    for system in systems:
+        for element in ifcopenshell.util.system.get_system_elements(system):
+            if element in components:
+                results.append((system, element))
+    return results
 
 
 def get_contact_data(ifc_file, element):
@@ -515,15 +522,18 @@ def get_component_data(ifc_file, element):
 
 
 def get_system_data(ifc_file, element):
+    system, component = element
     return {
-        "key": element.Name,
-        "Name": element.Name,
-        "Description": element.Description,
-        "Category": get_classification(element),
-        "AuthorOrganizationName": get_owner_name(element),
-        "AuthorDate": get_owner_creation_date(element),
-        "ModelSoftware": get_external_system(element),
-        "ModelID": element.GlobalId,
+        "key": val(system.Name),
+        "Name": val(system.Name),
+        "CreatedBy": get_created_by(system),
+        "CreatedOn": get_created_on(system),
+        "Category": get_category(system),
+        "ComponentNames": val(component.Name),
+        "ExternalSystem": get_external_system(system),
+        "ExternalObject": system.is_a(),
+        "ExternalIdentifier": system.GlobalId,
+        "Description": val(system.Description) or val(system.Name),
     }