[NDR-322] Remove PDMDocumentMetadata table

Author: jameslinnell

lambdas/enums/infrastructure.py

@@ -18,15 +18,12 @@ def __getattr__(cls, name):
 
 class DynamoTables(StrEnum, metaclass=DynamoMeta):
     LLOYD_GEORGE = "LloydGeorgeReferenceMetadata"
-    PDM = "PDMDocumentMetadata"
     CORE = "COREDocumentMetadata"
 
     def __str__(self) -> str:
         workspace = os.getenv("WORKSPACE")
         if not workspace:
-            logger.error(
-                "No workspace environment variable found during table definition."
-            )
+            logger.error("No workspace environment variable found during table definition.")
             raise DocumentRefException(500, LambdaError.EnvMissing)
         return f"{workspace}_{self.value}"
 

lambdas/handlers/document_reference_virus_scan_handler.py

@@ -16,13 +16,12 @@
 @ensure_environment_variables(
     names=[
         "LLOYD_GEORGE_DYNAMODB_NAME",
-        "PDM_DYNAMODB_NAME",
         "STAGING_STORE_BUCKET_NAME",
         "LLOYD_GEORGE_BUCKET_NAME",
         "PDM_BUCKET_NAME",
         "VIRUS_SCAN_STUB",
         "DOCUMENT_REVIEW_DYNAMODB_NAME",
-        "PENDING_REVIEW_BUCKET_NAME"
+        "PENDING_REVIEW_BUCKET_NAME",
     ]
 )
 def lambda_handler(event, context):
@@ -42,6 +41,4 @@ def lambda_handler(event, context):
 
         service.handle_upload_document_reference_request(object_key, object_size)
 
-    return ApiGatewayResponse(
-        200, "Virus Scan was successful", "POST"
-    ).create_api_gateway_response()
+    return ApiGatewayResponse(200, "Virus Scan was successful", "POST").create_api_gateway_response()

lambdas/handlers/get_fhir_document_reference_handler.py

@@ -27,8 +27,6 @@
         "APPCONFIG_APPLICATION",
         "APPCONFIG_CONFIGURATION",
         "APPCONFIG_ENVIRONMENT",
-        "LLOYD_GEORGE_DYNAMODB_NAME",
-        "PDM_DYNAMODB_NAME",
         "PRESIGNED_ASSUME_ROLE",
         "CLOUDFRONT_URL",
     ]
@@ -41,35 +39,21 @@ def lambda_handler(event, context):
         document_id, snomed_code = extract_document_parameters(event)
 
         get_document_service = GetFhirDocumentReferenceService()
-        document_reference = get_document_service.handle_get_document_reference_request(
-            snomed_code, document_id
-        )
+        document_reference = get_document_service.handle_get_document_reference_request(snomed_code, document_id)
 
         if selected_role_id and bearer_token:
-            verify_user_authorisation(
-                bearer_token, selected_role_id, document_reference.nhs_number
-            )
+            verify_user_authorisation(bearer_token, selected_role_id, document_reference.nhs_number)
 
-        document_reference_response = (
-            get_document_service.create_document_reference_fhir_response(
-                document_reference
-            )
-        )
+        document_reference_response = get_document_service.create_document_reference_fhir_response(document_reference)
 
-        logger.info(
-            f"Successfully retrieved document reference for document_id: {document_id}, snomed_code: {snomed_code}"
-        )
+        logger.info(f"Successfully retrieved document reference for document_id: {document_id}, snomed_code: {snomed_code}")
 
-        return ApiGatewayResponse(
-            status_code=200, body=document_reference_response, methods="GET"
-        ).create_api_gateway_response()
+        return ApiGatewayResponse(status_code=200, body=document_reference_response, methods="GET").create_api_gateway_response()
 
     except GetFhirDocumentReferenceException as exception:
         return ApiGatewayResponse(
             status_code=exception.status_code,
-            body=exception.error.create_error_response().create_error_fhir_response(
-                exception.error.value.get("fhir_coding")
-            ),
+            body=exception.error.create_error_response().create_error_fhir_response(exception.error.value.get("fhir_coding")),
             methods="GET",
         ).create_api_gateway_response()
 
@@ -81,9 +65,7 @@ def extract_document_parameters(event):
 
     if not document_id or not snomed_code:
         logger.error("Missing document id or snomed code in request path parameters.")
-        raise GetFhirDocumentReferenceException(
-            400, LambdaError.DocumentReferenceMissingParameters
-        )
+        raise GetFhirDocumentReferenceException(400, LambdaError.DocumentReferenceMissingParameters)
 
     return document_id, snomed_code
 
@@ -101,19 +83,13 @@ def verify_user_authorisation(bearer_token, selected_role_id, nhs_number):
         userinfo = oidc_service.fetch_userinfo(bearer_token)
 
         org_ods_code = oidc_service.fetch_user_org_code(userinfo, selected_role_id)
-        smartcard_role_code, _ = oidc_service.fetch_user_role_code(
-            userinfo, selected_role_id, "R"
-        )
+        smartcard_role_code, _ = oidc_service.fetch_user_role_code(userinfo, selected_role_id, "R")
     except (OidcApiException, AuthorisationException) as e:
         logger.error(f"Authorization error: {str(e)}")
-        raise GetFhirDocumentReferenceException(
-            403, LambdaError.DocumentReferenceUnauthorised
-        )
+        raise GetFhirDocumentReferenceException(403, LambdaError.DocumentReferenceUnauthorised)
 
     try:
-        search_patient_service = SearchPatientDetailsService(
-            smartcard_role_code, org_ods_code
-        )
+        search_patient_service = SearchPatientDetailsService(smartcard_role_code, org_ods_code)
         search_patient_service.handle_search_patient_request(nhs_number, False)
     except SearchPatientException as e:
         raise GetFhirDocumentReferenceException(e.status_code, e.error)

lambdas/tests/unit/enums/test_infrastructure.py

@@ -9,7 +9,6 @@
     ["enum_value", "expected"],
     [
         (DynamoTables.LLOYD_GEORGE, "LloydGeorgeReferenceMetadata"),
-        (DynamoTables.PDM, "PDMDocumentMetadata"),
         (DynamoTables.CORE, "COREDocumentMetadata"),
     ],
 )
@@ -29,7 +28,7 @@ def test_dynamo_tables_no_workspace(monkeypatch):
     monkeypatch.delenv("WORKSPACE", raising=False)
 
     with pytest.raises(DocumentRefException) as exc:
-        str(DynamoTables.PDM)
+        str(DynamoTables.CORE)
 
     assert exc.value.status_code == 500
     assert exc.value.error == LambdaError.EnvMissing

lambdas/utils/dynamo_utils.py

@@ -87,9 +87,7 @@ def create_expression_attribute_values(attribute_field_values: dict) -> dict:
     """
     expression_attribute_values = {}
     for field_name, field_value in attribute_field_values.items():
-        expression_attribute_values[
-            f"{create_expression_value_placeholder(field_name)}"
-        ] = field_value
+        expression_attribute_values[f"{create_expression_value_placeholder(field_name)}"] = field_value
 
     return expression_attribute_values
 
@@ -133,14 +131,12 @@ def filter_uploaded_docs_and_recently_uploading_docs():
     filter_builder.add_condition("Uploaded", AttributeOperator.EQUAL, True)
     uploaded_filter_expression = filter_builder.build()
 
-    filter_builder.add_condition(
-        "Uploading", AttributeOperator.EQUAL, True
-    ).add_condition("LastUpdated", AttributeOperator.GREATER_OR_EQUAL, time_limit)
+    filter_builder.add_condition("Uploading", AttributeOperator.EQUAL, True).add_condition(
+        "LastUpdated", AttributeOperator.GREATER_OR_EQUAL, time_limit
+    )
     uploading_filter_expression = filter_builder.build()
 
-    return delete_filter_expression & (
-        uploaded_filter_expression | uploading_filter_expression
-    )
+    return delete_filter_expression & (uploaded_filter_expression | uploading_filter_expression)
 
 
 def parse_dynamo_record(dynamodb_record: Dict[str, Any]) -> Dict[str, Any]:
@@ -196,12 +192,8 @@ def build_mixed_condition_expression(
         if operator in ["attribute_exists", "attribute_not_exists"]:
             condition_expressions.append(f"{operator}({condition_placeholder})")
         else:
-            condition_value_placeholder = create_expression_value_placeholder(
-                field_name, suffix
-            )
-            condition_expressions.append(
-                f"{condition_placeholder} {operator} {condition_value_placeholder}"
-            )
+            condition_value_placeholder = create_expression_value_placeholder(field_name, suffix)
+            condition_expressions.append(f"{condition_placeholder} {operator} {condition_value_placeholder}")
             condition_attribute_values[condition_value_placeholder] = field_value
 
     condition_expression = f" {join_operator} ".join(condition_expressions)
@@ -242,9 +234,7 @@ def build_general_transaction_item(
     action = action.capitalize()
 
     if action not in ["Put", "Update", "Delete", "Conditioncheck"]:
-        raise ValueError(
-            f"Invalid action: {action}. Must be one of: Put, Update, Delete, ConditionCheck"
-        )
+        raise ValueError(f"Invalid action: {action}. Must be one of: Put, Update, Delete, ConditionCheck")
 
     transaction_item: dict[str, dict[str, Any]] = {action: {"TableName": table_name}}
 
@@ -269,14 +259,10 @@ def build_general_transaction_item(
         transaction_item[action]["ConditionExpression"] = condition_expression
 
     if expression_attribute_names:
-        transaction_item[action][
-            "ExpressionAttributeNames"
-        ] = expression_attribute_names
+        transaction_item[action]["ExpressionAttributeNames"] = expression_attribute_names
 
     if expression_attribute_values:
-        transaction_item[action][
-            "ExpressionAttributeValues"
-        ] = expression_attribute_values
+        transaction_item[action]["ExpressionAttributeValues"] = expression_attribute_values
 
     return transaction_item
 
@@ -305,8 +291,8 @@ def build_transaction_item(
         expression_attribute_values.update(update_attr_values)
 
     if conditions:
-        condition_expr, condition_attr_names, condition_attr_values = (
-            build_mixed_condition_expression(conditions, condition_join_operator)
+        condition_expr, condition_attr_names, condition_attr_values = build_mixed_condition_expression(
+            conditions, condition_join_operator
         )
         condition_expression = condition_expr
         expression_attribute_names.update(condition_attr_names)
@@ -336,15 +322,12 @@ def __init__(self):
 
     def _define_tables(self):
         self.lg_dynamo_table = DynamoTables.LLOYD_GEORGE
-        self.pdm_dynamo_table = DynamoTables.PDM
         self.core_dynamo_table = DynamoTables.CORE
 
     def resolve(self, doc_type: SnomedCode) -> str:
         try:
             table = self.mapping[doc_type.code]
             return str(table)
         except KeyError:
-            logger.error(
-                f"SNOMED code {doc_type.code} - {doc_type.display_name} is not supported"
-            )
+            logger.error(f"SNOMED code {doc_type.code} - {doc_type.display_name} is not supported")
             raise InvalidDocTypeException(400, LambdaError.DocTypeDB)