[PRMT-4727] Added functionality to store FailureReason in DynamoDB.

Signed-off-by: martin-nhs <[email protected]>
nhsconnect · Apr 8, 2024 · 648a976 · 648a976
1 parent 050496f
commit 648a976
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/main/java/uk/nhs/prm/repo/ehrtransferservice/database/TransferRepository.java b/src/main/java/uk/nhs/prm/repo/ehrtransferservice/database/TransferRepository.java
@@ -7,6 +7,7 @@
 import software.amazon.awssdk.services.dynamodb.model.*;
 import uk.nhs.prm.repo.ehrtransferservice.config.AppConfig;
 import uk.nhs.prm.repo.ehrtransferservice.database.enumeration.ConversationTransferStatus;
+import uk.nhs.prm.repo.ehrtransferservice.database.enumeration.FailureReason;
 import uk.nhs.prm.repo.ehrtransferservice.database.model.ConversationRecord;
 import uk.nhs.prm.repo.ehrtransferservice.exceptions.FailedToPersistException;
 import uk.nhs.prm.repo.ehrtransferservice.exceptions.database.ConversationAlreadyPresentException;
@@ -176,7 +177,7 @@ void updateConversationStatus(UUID inboundConversationId, ConversationTransferSt
         }
     }
 
-    void updateConversationStatusWithFailure(UUID inboundConversationId, String failureCode) {
+    void updateConversationStatusWithFailure(UUID inboundConversationId, String failureCode, FailureReason failureReason) {
         if(!isInboundConversationPresent(inboundConversationId)) {
             throw new ConversationUpdateException(inboundConversationId);
         }
@@ -199,6 +200,11 @@ void updateConversationStatusWithFailure(UUID inboundConversationId, String fail
                 .action(AttributeAction.PUT)
                 .build());
 
+        updateItems.put(FAILURE_REASON.name, AttributeValueUpdate.builder()
+            .value(AttributeValue.builder().s(failureReason.reason).build())
+            .action(AttributeAction.ADD)
+            .build());
+
         updateItems.put(FAILURE_CODE.name, AttributeValueUpdate.builder()
                 .value(AttributeValue.builder().s(failureCode).build())
                 .action(AttributeAction.PUT)

diff --git a/src/main/java/uk/nhs/prm/repo/ehrtransferservice/database/TransferService.java b/src/main/java/uk/nhs/prm/repo/ehrtransferservice/database/TransferService.java
@@ -4,6 +4,7 @@
 import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
 import uk.nhs.prm.repo.ehrtransferservice.database.enumeration.ConversationTransferStatus;
+import uk.nhs.prm.repo.ehrtransferservice.database.enumeration.FailureReason;
 import uk.nhs.prm.repo.ehrtransferservice.database.model.ConversationRecord;
 import uk.nhs.prm.repo.ehrtransferservice.exceptions.base.DatabaseException;
 import uk.nhs.prm.repo.ehrtransferservice.repo_incoming.RepoIncomingEvent;
@@ -67,10 +68,10 @@ public void updateConversationTransferStatus(UUID inboundConversationId, Convers
             inboundConversationId, conversationTransferStatus.name());
     }
 
-    public void updateConversationTransferStatusWithFailure(UUID inboundConversationId, String failureCode) {
-        transferRepository.updateConversationStatusWithFailure(inboundConversationId, failureCode);
-        log.info("Updated conversation record with Inbound Conversation ID {} to {}, with failure code {}",
-            inboundConversationId, INBOUND_FAILED.name(), failureCode);
+    public void updateConversationTransferStatusWithFailure(UUID inboundConversationId, String failureCode, FailureReason failureReason) {
+        transferRepository.updateConversationStatusWithFailure(inboundConversationId, failureCode, failureReason);
+        log.info("Updated conversation record with Inbound Conversation ID {} to {} - with failure code {} and reason {}",
+            inboundConversationId, INBOUND_FAILED.name(), failureCode, failureReason);
     }
 
     public UUID getEhrCoreInboundMessageIdForInboundConversationId(UUID inboundConversationId) {

diff --git a/.../java/uk/nhs/prm/repo/ehrtransferservice/database/enumeration/TransferTableAttribute.java b/.../java/uk/nhs/prm/repo/ehrtransferservice/database/enumeration/TransferTableAttribute.java
@@ -14,6 +14,7 @@ public enum TransferTableAttribute {
     DESTINATION_GP("DestinationGp"),
     TRANSFER_STATUS("TransferStatus"),
     FAILURE_CODE("FailureCode"),
+    FAILURE_REASON("FailureReason"),
     INBOUND_MESSAGE_ID("InboundMessageId"),
     NEMS_MESSAGE_ID("NemsMessageId"),
     CREATED_AT("CreatedAt"),

diff --git a/...main/java/uk/nhs/prm/repo/ehrtransferservice/handlers/NegativeAcknowledgementHandler.java b/...main/java/uk/nhs/prm/repo/ehrtransferservice/handlers/NegativeAcknowledgementHandler.java
@@ -11,6 +11,7 @@
 import java.util.UUID;
 
 import static uk.nhs.prm.repo.ehrtransferservice.database.enumeration.ConversationTransferStatus.INBOUND_FAILED;
+import static uk.nhs.prm.repo.ehrtransferservice.database.enumeration.FailureReason.NEGATIVE_ACKNOWLEDGEMENT_RECEIVED;
 
 @Slf4j
 @Service
@@ -29,7 +30,8 @@ public void handleMessage(Acknowledgement acknowledgement) {
 
         transferService.updateConversationTransferStatusWithFailure(
             inboundConversationId,
-            getFailureCodeForDb(acknowledgement)
+            getFailureCodeForDb(acknowledgement),
+            NEGATIVE_ACKNOWLEDGEMENT_RECEIVED
         );
 
         auditService.publishAuditMessage(inboundConversationId, INBOUND_FAILED, nemsMessageId);