NRL-1053 fix type and category filter expression issue

Author: eesa456

layer/nrlf/core/dynamodb/repository.py

@@ -33,15 +33,6 @@ def _get_sk_ids_for_type(pointer_type: str) -> tuple:
     return category_id, type_id
 
 
-def _get_sk_id_for_category(category: str) -> tuple:
-    category_system, category_code = category.split("|")
-    if category_system not in SYSTEM_SHORT_IDS:
-        raise ValueError(f"Unknown system for category: {category_system}")
-    category_id = SYSTEM_SHORT_IDS[category_system] + "-" + category_code
-
-    return category_id
-
-
 class Repository(ABC, Generic[RepositoryModel]):
     ITEM_TYPE: Type[RepositoryModel]
 
@@ -249,14 +240,26 @@ def search(
             key_conditions.append("begins_with(patient_sort, :patient_sort)")
             expression_values[":patient_sort"] = patient_sort
 
-        if len(categories) == 1:
-            # Optimisation for single category
-            category_id = _get_sk_id_for_category(categories[0])
+        # Handle multiple categories and pointer types with filter expressions
+        if len(pointer_types) > 1:
+            expression_names["#pointer_type"] = "type"
+            types_filters = [
+                f"#pointer_type = :type_{i}" for i in range(len(pointer_types))
+            ]
+            types_filter_values = {
+                f":type_{i}": pointer_types[i] for i in range(len(pointer_types))
+            }
+            filter_expressions.append(f"({' OR '.join(types_filters)})")
+            expression_values.update(types_filter_values)
+
+        # if pointer_types then category filter is not needed
+        if not pointer_types and len(categories) == 1:
+            category_id = categories[0].replace("|", "-")
             patient_sort = f"C#{category_id}"
             key_conditions.append("begins_with(patient_sort, :patient_sort)")
             expression_values[":patient_sort"] = patient_sort
 
-        if len(categories) > 1:
+        if not pointer_types and len(categories) > 1:
             expression_names["#category"] = "category"
             category_filters = [
                 f"#category = :category_{i}" for i in range(len(categories))
@@ -267,18 +270,6 @@ def search(
             filter_expressions.append(f"({' OR '.join(category_filters)})")
             expression_values.update(caetgory_filter_values)
 
-        # Handle multiple categories and pointer types with filter expressions
-        if len(pointer_types) > 1:
-            expression_names["#pointer_type"] = "type"
-            types_filters = [
-                f"#pointer_type = :type_{i}" for i in range(len(pointer_types))
-            ]
-            types_filter_values = {
-                f":type_{i}": pointer_types[i] for i in range(len(pointer_types))
-            }
-            filter_expressions.append(f"({' OR '.join(types_filters)})")
-            expression_values.update(types_filter_values)
-
         if custodian:
             logger.log(
                 LogReference.REPOSITORY016,