Correct headers as part of the reqeust

UKHomeOffice · Apr 12, 2024 · 7084fa0 · 7084fa0
1 parent 4ddfd50
commit 7084fa0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/src/main/java/uk/gov/digital/ho/hocs/casework/client/notifyclient/NotifyClient.java b/src/main/java/uk/gov/digital/ho/hocs/casework/client/notifyclient/NotifyClient.java
@@ -82,8 +82,6 @@ private void sendMessage(NotifyCommand command, LogEvent event) {
         } catch (JsonProcessingException e) {
             log.error("Failed to send email message of type {}", command.getCommand(),
                 value(LogEvent.EVENT, LogEvent.NOTIFY_EMAIL_FAILED), value(LogEvent.EXCEPTION, e));
-        } catch(Exception ex) {
-            ex.printStackTrace();
         }
     }
 

diff --git a/...va/uk/gov/digital/ho/hocs/casework/migration/client/auditclient/MigrationAuditClient.java b/...va/uk/gov/digital/ho/hocs/casework/migration/client/auditclient/MigrationAuditClient.java
@@ -131,8 +131,11 @@ private void sendAuditMessage(LocalDateTime localDateTime,
             /*var publishRequest = new PublishRequest(auditQueue,
                 objectMapper.writeValueAsString(request)).withMessageAttributes(getQueueHeaders(eventType.toString()));*/
 
-            var publishRequest =  PublishRequest.builder().messageAttributes(getQueueHeaders(eventType.toString())).build();
+            //log.info("auditSearchSnsClient.listTopics(): ", auditSearchSnsClient.listTopics());
 
+            var publishRequest =  PublishRequest.builder()
+                        .topicArn(auditQueue)
+                        .messageAttributes(getQueueHeaders(eventType.toString())).build();
 
             auditSearchSnsClient.publish(publishRequest);
             log.info("Create audit of type {} for Case UUID: {}, correlationID: {}, UserID: {}, event: {}", eventType,
@@ -146,9 +149,9 @@ private void sendAuditMessage(LocalDateTime localDateTime,
     private Map<String, MessageAttributeValue> getQueueHeaders(String eventType) {
         return Map.of(EVENT_TYPE_HEADER, MessageAttributeValue.builder().dataType("String").stringValue(eventType).build(),
             RequestData.CORRELATION_ID_HEADER, MessageAttributeValue.builder().stringValue(requestData.correlationId()).build(),
-            RequestData.CORRELATION_ID_HEADER, MessageAttributeValue.builder().stringValue(requestData.userId()).build(),
-            RequestData.CORRELATION_ID_HEADER, MessageAttributeValue.builder().stringValue(requestData.username()).build(),
-            RequestData.CORRELATION_ID_HEADER, MessageAttributeValue.builder().stringValue(requestData.groups()).build());
+            RequestData.USER_ID_HEADER, MessageAttributeValue.builder().stringValue(requestData.userId()).build(),
+            RequestData.USERNAME_HEADER, MessageAttributeValue.builder().stringValue(requestData.username()).build(),
+            RequestData.GROUP_HEADER, MessageAttributeValue.builder().stringValue(requestData.groups()).build());
     }
 
     private void logFailedToParseDataPayload(JsonProcessingException e) {

diff --git a/src/test/java/uk/gov/digital/ho/hocs/casework/client/notifiyclient/NotifyClientTest.java b/src/test/java/uk/gov/digital/ho/hocs/casework/client/notifiyclient/NotifyClientTest.java
@@ -63,7 +63,6 @@ public void setup() {
         when(requestData.username()).thenReturn("some username");
 
         sqsMessageResult = new ResultCaptor<>();
-       // doAnswer(sqsMessageResult).when(notifySqsClient).sendMessage(any());
         doAnswer(sqsMessageResult).when(notifySqsClient).sendMessage((SendMessageRequest) any());
     }
 

diff --git a/...k/gov/digital/ho/hocs/casework/migration/client/auditclient/MigrationAuditClientTest.java b/...k/gov/digital/ho/hocs/casework/migration/client/auditclient/MigrationAuditClientTest.java
@@ -103,9 +103,10 @@ public void shouldSetHeaders() {
         var caseData = new CaseData(caseType, caseID, new HashMap<>(), LocalDate.now());
         Map<String, MessageAttributeValue> expectedHeaders =
             Map.of("event_type", MessageAttributeValue.builder().stringValue(EventType.CASE_CREATED.toString()).build(),
-            RequestData.CORRELATION_ID_HEADER, MessageAttributeValue.builder().stringValue(requestData.correlationId()).build(),
-            RequestData.USER_ID_HEADER, MessageAttributeValue.builder().stringValue(userId).build(),
-            RequestData.USERNAME_HEADER, MessageAttributeValue.builder().stringValue(userName).build());
+                RequestData.CORRELATION_ID_HEADER, MessageAttributeValue.builder().stringValue(requestData.correlationId()).build(),
+                RequestData.USER_ID_HEADER, MessageAttributeValue.builder().stringValue(userId).build(),
+                RequestData.USERNAME_HEADER, MessageAttributeValue.builder().stringValue(userName).build()
+            );
 
         migrationAuditClient.createCaseAudit(caseData);