Merge branch 'feature/PI-650-read_as_device' into release/2024-12-11

Author: megan-bower4

src/api/createDeviceAccreditedSystem/src/v1/steps.py

@@ -115,7 +115,7 @@ def add_device_reference_data_id(data, cache) -> Device:
     device_reference_data: DeviceReferenceData = data[read_device_reference_data]
     for drd in device_reference_data:
         as_device.add_device_reference_data_id(
-            device_reference_data_id=str(drd.id), path_to_data=["*.Interaction ID"]
+            device_reference_data_id=str(drd.id), path_to_data=["Interaction ID"]
         )
     return as_device
 

src/api/readDevice/src/v1/steps.py

@@ -74,14 +74,34 @@ def read_device_reference_data(data, cache) -> list[DeviceReferenceData]:
             id=id,
         )
         device_reference_datas.append(drd)
-
     return device_reference_datas
 
 
+def filter_by_jsonpath(data, filters: list) -> dict:
+    response = {}
+    if "*" not in filters:
+        response = {filter_key: data[filter_key] for filter_key in filters}
+        return response
+    return data
+
+
+def filter_device_reference_data(data, cache) -> list[DeviceReferenceData]:
+    device: Device = data[read_device]
+    device_reference_data_list: list[DeviceReferenceData] = data[
+        read_device_reference_data
+    ]
+
+    for drd in device_reference_data_list:
+        filters = device.device_reference_data[str(drd.id)]
+        for questionnaire_response in drd.questionnaire_responses.values():
+            for qr in questionnaire_response:
+                qr.data = filter_by_jsonpath(data=qr.data, filters=filters)
+    return device_reference_data_list
+
+
 def update_device_with_device_reference_data(data, cache) -> Device:
     device: Device = data[read_device]
     device_reference_datas = data[read_device_reference_data]
-
     [
         device.questionnaire_responses.setdefault(key, []).extend(responses)
         for drd in device_reference_datas
@@ -102,6 +122,7 @@ def device_to_dict(data, cache) -> tuple[str, dict]:
     read_product,
     read_device,
     read_device_reference_data,
+    filter_device_reference_data,
     update_device_with_device_reference_data,
     device_to_dict,
 ]