NRL-1075 split category by list for multi category search

Author: eesa456

api/consumer/searchDocumentReference/search_document_reference.py

@@ -102,7 +102,7 @@ def handler(
         nhs_number=params.nhs_number,
         custodian=custodian_id,
         pointer_types=pointer_types,
-        categories=[params.category.root] if params.category else [],
+        categories=params.category.root.split(",") if params.category else [],
     ):
         try:
             document_reference = DocumentReference.model_validate_json(result.document)

api/consumer/searchPostDocumentReference/search_post_document_reference.py

@@ -105,7 +105,7 @@ def handler(
         nhs_number=body.nhs_number,
         custodian=custodian_id,
         pointer_types=pointer_types,
-        categories=[body.category.root] if body.category else [],
+        categories=body.category.root.split(",") if body.category else [],
     ):
         try:
             document_reference = DocumentReference.model_validate_json(result.document)

api/producer/searchDocumentReference/search_document_reference.py

@@ -78,15 +78,15 @@ def handler(
         custodian_suffix=metadata.ods_code_extension,
         nhs_number=params.nhs_number,
         pointer_types=pointer_types,
-        categories=[params.category.root] if params.category else [],
+        categories=params.category.root.split(",") if params.category else [],
     )
 
     for result in repository.search(
         custodian=metadata.ods_code,
         custodian_suffix=metadata.ods_code_extension,
         nhs_number=params.nhs_number,
         pointer_types=pointer_types,
-        categories=[params.category.root] if params.category else [],
+        categories=params.category.root.split(",") if params.category else [],
     ):
         try:
             document_reference = DocumentReference.model_validate_json(result.document)

api/producer/searchPostDocumentReference/search_post_document_reference.py

@@ -72,15 +72,15 @@ def handler(
         custodian_suffix=metadata.ods_code_extension,
         nhs_number=body.nhs_number,
         pointer_types=pointer_types,
-        categories=[body.category.root] if body.category else [],
+        categories=body.category.root.split(",") if body.category else [],
     )
 
     for result in repository.search(
         custodian=metadata.ods_code,
         custodian_suffix=metadata.ods_code_extension,
         nhs_number=body.nhs_number,
         pointer_types=pointer_types,
-        categories=[body.category.root] if body.category else [],
+        categories=body.category.root.split(",") if body.category else [],
     ):
         try:
             document_reference = DocumentReference.model_validate_json(result.document)

layer/nrlf/core/validators.py

@@ -43,7 +43,9 @@ def validate_category(category_: Optional[RequestQueryCategory]) -> bool:
     if not category_:
         return True
 
-    return category_.root in Categories.list()
+    categories = category_.root.split(",")
+
+    return all(category in Categories.list() for category in categories)
 
 
 @dataclass