[PRMP-907] Adjust delete service to remove pointer for non LG

Author: adamwhitingnhs

app/src/components/blocks/_delete/deleteSubmitStage/DeleteSubmitStage.tsx

@@ -28,6 +28,7 @@ import BackButton from '../../../generic/backButton/BackButton';
 import PatientSummary, { PatientInfo } from '../../../generic/patientSummary/PatientSummary';
 import {
     DOCUMENT_TYPE,
+    DOCUMENT_TYPE_CONFIG,
     getConfigForDocType,
     getDocumentTypeLabel,
 } from '../../../../helpers/utils/documentType';
@@ -72,6 +73,12 @@ export const DeleteSubmitStageIndexView = ({
         'Select whether you want to permanently delete these patient files';
     const userIsGP = role === REPOSITORY_ROLE.GP_ADMIN || role === REPOSITORY_ROLE.GP_CLINICAL;
 
+    let documentConfig: DOCUMENT_TYPE_CONFIG | null = null;
+    if (docType !== DOCUMENT_TYPE.ALL) {
+        documentConfig = getConfigForDocType(document?.documentSnomedCodeType ?? docType!)
+        docType = documentConfig.snomedCode as DOCUMENT_TYPE;
+    }
+
     const handleYesOption = async (): Promise<void> => {
         const onSuccess = (): void => {
             resetDocState();
@@ -85,7 +92,7 @@ export const DeleteSubmitStageIndexView = ({
         try {
             setDeletionStage(SUBMISSION_STATE.PENDING);
             const response: DeleteResponse = await deleteAllDocuments({
-                documentId: document?.id,
+                documentId: !documentConfig?.singleDocumentOnly ? document?.id : undefined,
                 docType: docType,
                 nhsNumber: nhsNumber,
                 baseUrl,
@@ -174,7 +181,7 @@ export const DeleteSubmitStageIndexView = ({
                         <>
                             <p>
                                 Record type:{' '}
-                                {getConfigForDocType(document.documentSnomedCodeType)?.displayName}
+                                {documentConfig?.displayName}
                             </p>
                             <p>Filename: {document.fileName}</p>
                         </>

lambdas/services/document_deletion_service.py

@@ -1,14 +1,14 @@
 import os
 import uuid
-from typing import Literal
+from typing import Literal, Optional
 from urllib.parse import urlparse
 
 from botocore.exceptions import ClientError
 from enums.document_retention import DocumentRetentionDays
 from enums.lambda_error import LambdaError
 from enums.metadata_field_names import DocumentReferenceMetadataFields
 from enums.nrl_sqs_upload import NrlActionTypes
-from enums.snomed_codes import SnomedCodes
+from enums.snomed_codes import SnomedCode, SnomedCodes
 from enums.supported_document_types import SupportedDocumentTypes
 from inflection import underscore
 from models.document_reference import DocumentReference
@@ -64,22 +64,25 @@ def delete_document_by_id(self, nhs_number: str, document_id: str):
             document_ttl_days=DocumentRetentionDays.SOFT_DELETE,
         )
 
-        self.handle_object_delete(document_ref)
-
-        self.send_sqs_message_to_remove_pointer(nhs_number, document_ref.file_location)
+        self.send_sqs_message_to_remove_pointer(
+            nhs_number,
+            snomed=SnomedCodes.find_by_code(document_ref.document_snomed_code_type),
+            doc_ref=document_ref
+        )
 
     def delete_documents_by_types(
         self, nhs_number: str, doc_types: list[SupportedDocumentTypes]
     ):
         files_deleted = []
 
         for doc_type in doc_types:
+            snomed = SnomedCodes.find_by_code(doc_type)
             files_deleted += self.delete_specific_doc_type(nhs_number, doc_type)
+            self.send_sqs_message_to_remove_pointer(nhs_number, snomed)
 
         if SupportedDocumentTypes.LG in doc_types:
             self.delete_documents_references_in_stitch_table(nhs_number)
             self.delete_unstitched_document_reference(nhs_number)
-            self.send_sqs_message_to_remove_pointer(nhs_number)
 
         return files_deleted
 
@@ -170,18 +173,20 @@ def delete_specific_doc_type(
             raise DocumentDeletionServiceException(500, LambdaError.DocDelClient)
 
     def send_sqs_message_to_remove_pointer(
-        self, nhs_number: str, document_url: str = None
+        self, 
+        nhs_number: str, 
+        snomed: SnomedCode,
+        doc_ref: Optional[DocumentReference] = None
     ):
         delete_nrl_message = NrlSqsMessage(
             nhs_number=nhs_number,
             action=NrlActionTypes.DELETE,
-            snomed_code_doc_type=SnomedCodes.LLOYD_GEORGE.value,
+            snomed_code_doc_type=snomed,
             snomed_code_category=SnomedCodes.CARE_PLAN.value,
         )
 
-        if document_url:
-            attachment = Attachment(url=document_url)
-
+        if doc_ref:
+            attachment = Attachment(url=doc_ref.file_location)
             delete_nrl_message.attachment = attachment
 
         sqs_group_id = f"NRL_delete_{uuid.uuid4()}"

lambdas/tests/unit/services/test_document_deletion_service.py

@@ -121,18 +121,15 @@ def test_handle_delete_for_all_doc_type(
     mock_delete_documents_references_in_stitch_table,
     mock_delete_unstitched_document_reference,
 ):
-    expected = TEST_DOC_STORE_REFERENCES + TEST_LG_DOC_STORE_REFERENCES
+    expected = TEST_LG_DOC_STORE_REFERENCES
 
     actual = mock_deletion_service.handle_reference_delete(
-        TEST_NHS_NUMBER, [SupportedDocumentTypes.ARF, SupportedDocumentTypes.LG]
+        TEST_NHS_NUMBER, [SupportedDocumentTypes.LG]
     )
 
     assert expected == actual
 
-    assert mock_delete_specific_doc_type.call_count == 2
-    mock_delete_specific_doc_type.assert_any_call(
-        TEST_NHS_NUMBER, SupportedDocumentTypes.ARF
-    )
+    assert mock_delete_specific_doc_type.call_count == 1
     mock_delete_specific_doc_type.assert_any_call(
         TEST_NHS_NUMBER, SupportedDocumentTypes.LG
     )
@@ -194,15 +191,12 @@ def test_handle_delete_all_doc_type_when_only_lg_records_available(
 
     expected = TEST_LG_DOC_STORE_REFERENCES
     actual = mock_deletion_service.handle_reference_delete(
-        nhs_number, [SupportedDocumentTypes.LG, SupportedDocumentTypes.ARF]
+        nhs_number, [SupportedDocumentTypes.LG]
     )
 
     assert expected == actual
 
-    assert mock_delete_specific_doc_type.call_count == 2
-    mock_delete_specific_doc_type.assert_any_call(
-        nhs_number, SupportedDocumentTypes.ARF
-    )
+    assert mock_delete_specific_doc_type.call_count == 1
     mock_delete_specific_doc_type.assert_any_call(nhs_number, SupportedDocumentTypes.LG)
 
     mock_delete_unstitched_document_reference.assert_called()
@@ -211,7 +205,6 @@ def test_handle_delete_all_doc_type_when_only_lg_records_available(
 @pytest.mark.parametrize(
     ["doc_type", "expected"],
     [
-        (SupportedDocumentTypes.ARF, TEST_DOC_STORE_REFERENCES),
         (SupportedDocumentTypes.LG, TEST_LG_DOC_STORE_REFERENCES),
     ],
 )
@@ -238,7 +231,7 @@ def test_handle_delete_when_no_record_for_patient_return_empty_list(
     expected = []
     actual = mock_deletion_service.handle_reference_delete(
         TEST_NHS_NUMBER_WITH_NO_RECORD,
-        [SupportedDocumentTypes.LG, SupportedDocumentTypes.ARF],
+        [SupportedDocumentTypes.LG],
     )
 
     assert actual == expected
@@ -247,7 +240,6 @@ def test_handle_delete_when_no_record_for_patient_return_empty_list(
 @pytest.mark.parametrize(
     ["doc_type", "table_name", "doc_ref"],
     [
-        (SupportedDocumentTypes.ARF, MOCK_ARF_TABLE_NAME, TEST_DOC_STORE_REFERENCES),
         (SupportedDocumentTypes.LG, MOCK_LG_TABLE_NAME, TEST_LG_DOC_STORE_REFERENCES),
     ],
 )
@@ -275,7 +267,7 @@ def test_delete_specific_doc_type(
 
 @pytest.mark.parametrize(
     "doc_type",
-    [SupportedDocumentTypes.ARF, SupportedDocumentTypes.LG],
+    [SupportedDocumentTypes.LG],
 )
 def test_delete_specific_doc_type_when_no_record_for_given_patient(
     doc_type,
@@ -322,18 +314,19 @@ def test_delete_documents_references_in_stitch_table(mock_deletion_service):
 def test_send_sqs_message_to_remove_pointer(mocker, mock_deletion_service):
     mocker.patch("uuid.uuid4", return_value="test_uuid")
 
+    snomed=SnomedCodes.LLOYD_GEORGE.value
     expected_message_body = (
         '{{"nhs_number":"{}",'
         '"snomed_code_doc_type":{},'
         '"snomed_code_category":{},'
         '"action":"delete"}}'
     ).format(
         TEST_NHS_NUMBER,
-        SnomedCodes.LLOYD_GEORGE.value.model_dump_json(),
+        snomed.model_dump_json(),
         SnomedCodes.CARE_PLAN.value.model_dump_json(),
     )
 
-    mock_deletion_service.send_sqs_message_to_remove_pointer(TEST_NHS_NUMBER)
+    mock_deletion_service.send_sqs_message_to_remove_pointer(TEST_NHS_NUMBER, snomed)
 
     assert mock_deletion_service.sqs_service.send_message_fifo.call_count == 1
 
@@ -353,15 +346,6 @@ def test_delete_unstitched_document_reference_called_for_LG(
     mock_delete_unstitched_document_reference.assert_called()
 
 
-def test_delete_unstitched_document_reference_not_called_for_ARF(
-    mock_deletion_service, mocker, mock_delete_unstitched_document_reference
-):
-    mock_deletion_service.handle_reference_delete(
-        TEST_NHS_NUMBER, [SupportedDocumentTypes.ARF]
-    )
-    mock_delete_unstitched_document_reference.assert_not_called()
-
-
 def test_delete_unstitched_document_reference_updates_correct_dynamo_table(
     mock_deletion_service, mock_fetch_documents_with_nhs_number
 ):