Ab2d-5864/delete file from bfd (#81)

CMSgov · Feb 23, 2024 · 2546fff · 2546fff
1 parent 25e29b4
commit 2546fff
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 23 deletions.
diff --git a/optout/src/main/java/gov/cms/ab2d/optout/OptOutS3.java b/optout/src/main/java/gov/cms/ab2d/optout/OptOutS3.java
@@ -5,10 +5,7 @@
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.model.GetObjectRequest;
-import software.amazon.awssdk.services.s3.model.HeadObjectRequest;
-import software.amazon.awssdk.services.s3.model.PutObjectRequest;
-import software.amazon.awssdk.services.s3.model.S3Exception;
+import software.amazon.awssdk.services.s3.model.*;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -78,25 +75,18 @@ public String createResponseOptOutFile(String responseContent) {
         }
     }
 
-    //ToDo: AB2D-5796 Delete Opt-out file from S3 (inbound)
-//    public static void deleteFileFromS3() {
-//        // The map always contains 2 lines: the first and last from the optout file.
-//        if (optOutResultMap.size() == 2) {
-//            try {
-//                var request = DeleteObjectRequest.builder()
-//                        .bucket(BFD_S3_BUCKET_NAME)
-//                        .key(fileName)
-//                        .build();
-//
-//                S3_CLIENT.deleteObject(request);
-//            } catch (SdkClientException ex) {
-//                logger.log(ex.getMessage());
-//            }
-//        }
-//        else {
-//            // Slack alert
-//        }
-//    }
+    public void deleteFileFromS3() {
+        try {
+            var request = DeleteObjectRequest.builder()
+                    .bucket(BFD_S3_BUCKET_NAME)
+                    .key(fileName)
+                    .build();
+
+            s3Client.deleteObject(request);
+        } catch (SdkClientException ex) {
+            logger.log(ex.getMessage());
+        }
+    }
 
 
 }
diff --git a/optout/src/test/java/gov/cms/ab2d/optout/OptOutS3Test.java b/optout/src/test/java/gov/cms/ab2d/optout/OptOutS3Test.java
@@ -51,4 +51,10 @@ void createResponseOptOutFileTest() {
         assertTrue(S3MockAPIExtension.isObjectExists(key));
         S3MockAPIExtension.deleteFile(key);
     }
+
+    @Test
+    void deleteFileFromS3Test() {
+        OPT_OUT_S3.deleteFileFromS3();
+        Assertions.assertFalse(S3MockAPIExtension.isObjectExists(TEST_FILE_NAME));
+    }
 }