NRL-1053 PR comments

Author: eesa456

api/consumer/searchDocumentReference/search_document_reference.py

@@ -61,7 +61,7 @@ def handler(
     if not validate_category(params.category):
         logger.log(
             LogReference.CONSEARCH002b,
-            type=params.category,
+            category=params.category,
         )  # TODO - Should update error message once permissioning by category is implemented
         return SpineErrorResponse.INVALID_CODE_SYSTEM(
             diagnostics="Invalid query parameter (The provided category is not valid)",

api/consumer/swagger.yaml

@@ -1559,7 +1559,7 @@ components:
           summary: Diagnostic studies report
           value: http://snomed.info/sct|721981007
         SNOMED_CODES_DIAGNOSTIC_PROCEDURE:
-          summary: RDiagnostic procedure
+          summary: Diagnostic procedure
           value: http://snomed.info/sct|103693007
         invalid:
           summary: Unknown

api/producer/searchDocumentReference/tests/test_search_document_reference_producer.py

@@ -319,7 +319,7 @@ def test_search_document_reference_filters_by_type(
 
 @mock_aws
 @mock_repository
-def test_search_document_reference_filters_by_type(
+def test_search_document_reference_filters_by_category(
     repository: DocumentPointerRepository,
 ):
     doc_ref = load_document_reference("Y05868-736253002-Valid")

api/producer/swagger.yaml

@@ -2066,7 +2066,7 @@ components:
           summary: Diagnostic studies report
           value: http://snomed.info/sct|721981007
         SNOMED_CODES_DIAGNOSTIC_PROCEDURE:
-          summary: RDiagnostic procedure
+          summary: Diagnostic procedure
           value: http://snomed.info/sct|103693007
         invalid:
           summary: Unknown

layer/nrlf/core/dynamodb/repository.py

@@ -255,11 +255,11 @@ def search(
                 category_filters = [
                     f"#category = :category_{i}" for i in range(len(categories))
                 ]
-                caetgory_filter_values = {
+                category_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)
+                expression_values.update(category_filter_values)
 
             expression_names["#pointer_type"] = "type"
             types_filters = [

layer/nrlf/core/validators.py

@@ -43,17 +43,7 @@ def validate_category(category_: Optional[RequestQueryCategory]) -> bool:
     if not category_:
         return True
 
-    category_system = category_.root.split("|", 1)[0]
-    category_code = category_.root.split("|", 1)[1]
-
-    category_list = Categories.list()
-    category_systems = [category.split("|", 1)[0] for category in category_list]
-    category_codes = [category.split("|", 1)[1] for category in category_list]
-
-    if not category_system in category_systems:
-        return False
-
-    return category_code in category_codes
+    return category_.root in Categories.list()
 
 
 @dataclass

swagger/consumer-static/components.yaml

@@ -37,7 +37,7 @@ components:
       schema:
         $ref: "#/components/schemas/RequestQueryType"
     category:
-      name: type
+      name: category
       in: query
       schema:
         $ref: "#/components/schemas/RequestQueryCategory"

tests/features/consumer/searchDocumentReference-failure.feature

@@ -192,7 +192,7 @@ Feature: Consumer - searchDocumentReference - Failure Scenarios
       }
       """
 
-  Scenario: Search rejects request with type system they are not allowed to use
+  Scenario: Search rejects request with invalid category system
     Given the application 'DataShare' (ID 'z00z-y11y-x22x') is registered to access the API
     And the organisation 'RX898' is authorised to access pointer types:
       | system                 | value     |

tests/features/consumer/searchPostDocumentReference-failure.feature

@@ -192,7 +192,7 @@ Feature: Consumer - searchDocumentReference - Failure Scenarios
       }
       """
 
-  Scenario: Search for multiple DocumentReferences by NHS number and an invalid Category
+  Scenario: Search rejects request with category system they are not allowed to use
     Given the application 'DataShare' (ID 'z00z-y11y-x22x') is registered to access the API
     And the organisation 'RX898' is authorised to access pointer types:
       | system                 | value            |