add attachmentKey to the form fill request DTO

FloRul · Apr 2, 2024 · af70b2d · af70b2d
1 parent ef4983d
commit af70b2d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/...uestPreProcessorFunction/src/main/java/com/levio/awsdemo/formrequestpreprocessor/App.java b/...uestPreProcessorFunction/src/main/java/com/levio/awsdemo/formrequestpreprocessor/App.java
@@ -32,7 +32,7 @@ public Void handleRequest(final S3EventNotification input, final Context context
 
         input.getRecords().forEach(s3EventNotificationRecord -> {
                 var key = s3EventNotificationRecord.getS3().getObject().getKey();
-                var formFillRequest = new FormFillRequestDTO(extractEmailId(key), extractFormKey(key));
+                var formFillRequest = new FormFillRequestDTO(extractEmailId(key), extractFormKey(key), key);
                 sqsProducerService.send(formFillRequest);
         }
 

diff --git a/...n/src/main/java/com/levio/awsdemo/formrequestpreprocessor/service/FormFillRequestDTO.java b/...n/src/main/java/com/levio/awsdemo/formrequestpreprocessor/service/FormFillRequestDTO.java
@@ -1,19 +1,32 @@
 package com.levio.awsdemo.formrequestpreprocessor.service;
 
 public class FormFillRequestDTO {
+    /**
+     * The ID of the email which initiated the request
+     */
     String emailId;
+
+    /**
+     * The key to the form to be filled
+     */
     String formKey;
 
+    /**
+     * The key to the attachment to parse
+     */
+    String attachmentKey;
 
-    public FormFillRequestDTO(String emailId, String formKey) {
+    public FormFillRequestDTO(String emailId, String formKey, String attachmentKey) {
         this.emailId = emailId;
         this.formKey = formKey;
+        this.attachmentKey = attachmentKey;
     }
 
     public String toJson() {
         return "{" +
                 "\"emailId\":\"" + emailId + "\"," +
                 "\"formKey\":\"" + formKey + "\"" +
+                "\"attachmentKey\":\"" + attachmentKey + "\"" +
                 "}";
     }
 }
diff --git a/...ormRequestProcessorFunction/src/main/java/com/levio/awsdemo/formrequestprocessor/App.java b/...ormRequestProcessorFunction/src/main/java/com/levio/awsdemo/formrequestprocessor/App.java
@@ -65,6 +65,7 @@ public Void handleRequest(final SQSEvent input, final Context context) {
             }
 
             var emailId = formFillRequest.getEmailId();
+            var attachmentKey = formFillRequest.getAttachmentKey();
             var formKey = formFillRequest.getFormKey();
             var questionsMapper = retrieveDocumentMapper(formKey);
 
@@ -75,7 +76,7 @@ public Void handleRequest(final SQSEvent input, final Context context) {
                 String sender = ((InternetAddress) message.getFrom()[0]).getAddress();
                 String subject = message.getSubject();
 
-                String content = s3Service.getFile(formKey +"/attachment/" + emailId + ".txt");
+                String content = s3Service.getFile(attachmentKey);
 
                 questionsMapper.entrySet().parallelStream()
                         .forEach(positionQuestionAnswerMapper -> {

diff --git a/...tion/src/main/java/com/levio/awsdemo/formrequestprocessor/service/FormFillRequestDTO.java b/...tion/src/main/java/com/levio/awsdemo/formrequestprocessor/service/FormFillRequestDTO.java
@@ -14,4 +14,7 @@ public class FormFillRequestDTO {
 
     @JsonProperty("formKey") // Map JSON property to field
     private String formKey;
+
+    @JsonProperty("attachmentKey")
+    private String attachmentKey;
 }