NRL-1053 fix repository and perf tests

Author: eesa456

layer/nrlf/core/dynamodb/repository.py

@@ -239,27 +239,28 @@ def search(
             patient_sort = f"C#{category_id}#T#{type_id}"
             key_conditions.append("begins_with(patient_sort, :patient_sort)")
             expression_values[":patient_sort"] = patient_sort
+        else:
+            # Handle single/multiple categories and pointer types with filter expressions
+            if len(categories) == 1:
+                split_category = categories[0].split("|")
+                category_id = (
+                    SYSTEM_SHORT_IDS[split_category[0]] + "-" + split_category[1]
+                )
+                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:
+                expression_names["#category"] = "category"
+                category_filters = [
+                    f"#category = :category_{i}" for i in range(len(categories))
+                ]
+                caetgory_filter_values = {
+                    f":category_{i}": categories[i] for i in range(len(categories))
+                }
+                filter_expressions.append(f"({' OR '.join(category_filters)})")
+                expression_values.update(caetgory_filter_values)
 
-        if len(categories) == 1:
-            split_category = categories[0].split("|")
-            category_id = SYSTEM_SHORT_IDS[split_category[0]] + "-" + split_category[1]
-            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:
-            expression_names["#category"] = "category"
-            category_filters = [
-                f"#category = :category_{i}" for i in range(len(categories))
-            ]
-            caetgory_filter_values = {
-                f":category_{i}": categories[i] for i in range(len(categories))
-            }
-            filter_expressions.append(f"({' OR '.join(category_filters)})")
-            expression_values.update(caetgory_filter_values)
-
-        # Handle multiple types if no category filter
-        if not categories and len(pointer_types) > 1:
             expression_names["#pointer_type"] = "type"
             types_filters = [
                 f"#pointer_type = :type_{i}" for i in range(len(pointer_types))

tests/performance/consumer/client.js

@@ -3,6 +3,7 @@ import {
   POINTER_IDS,
   POINTER_TYPES,
   ODS_CODE,
+  CATEGORIES,
 } from "../constants.js";
 import http from "k6/http";
 import { check } from "k6";

tests/performance/producer/client.js

@@ -6,7 +6,6 @@ import {
   POINTER_IDS,
   POINTER_DOCUMENTS,
   POINTERS_TO_DELETE,
-  CATEGORIES,
 } from "../constants.js";
 import { check } from "k6";
 import { randomItem } from "https://jslib.k6.io/k6-utils/1.2.0/index.js";