Merge pull request #37 from SQUAD-D/feature#18/image-update

chore
SQUAD-D · Jul 6, 2024 · 858ff41 · 858ff41
2 parents 123ff8e + cfebdf2
commit 858ff41
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/src/main/java/squad/board/service/BoardService.java b/src/main/java/squad/board/service/BoardService.java
@@ -48,7 +48,7 @@ public CommonIdResponse createBoard(Long memberId, CreateBoardRequest createBoar
         // 이미지 정보 저장
         if (createBoard.isImageExist()) {
             imageMapper.save(createBoard.getImageInfo(), board.getBoardId());
-            deadLetterQueue.pushAll(createBoard.getImageInfo().stream()
+            messageQueue.pushAll(createBoard.getImageInfo().stream()
                     .map(ImageInfoRequest::getImageUUID)
                     .toList());
         }

diff --git a/src/main/java/squad/board/service/S3Consumer.java b/src/main/java/squad/board/service/S3Consumer.java
@@ -20,17 +20,17 @@ public class S3Consumer {
     private final S3MailSender s3MailSender;
     private final String MAIL_CONTENT = "The dead letter queue has exceeded its maximum allowable size.";
 
-//    @Scheduled(fixedDelay = 1000)
-//    public void normalConsume() {
-//        while (!messageQueue.isEmpty()) {
-//            String uuid = messageQueue.pop();
-//            try {
-//                s3Service.moveImageToOriginal(uuid);
-//            } catch (AmazonServiceException e) {
-//                deadLetterQueue.push(uuid);
-//            }
-//        }
-//    }
+    @Scheduled(fixedDelay = 1000)
+    public void normalConsume() {
+        while (!messageQueue.isEmpty()) {
+            String uuid = messageQueue.pop();
+            try {
+                s3Service.moveImageToOriginal(uuid);
+            } catch (AmazonServiceException e) {
+                deadLetterQueue.push(uuid);
+            }
+        }
+    }
 
     @Scheduled(fixedDelay = 2000)
     public void deadLetterConsume() {

diff --git a/src/main/java/squad/board/service/S3DeadLetterQueue.java b/src/main/java/squad/board/service/S3DeadLetterQueue.java
@@ -12,9 +12,13 @@ public class S3DeadLetterQueue {
 
     private static final String MESSAGE_QUEUE = "s3_dead_letter";
     private static final int EMPTY = 0;
-    private static final int LIMIT = 3;
+    private static final int LIMIT = 30;
     private final RedisTemplate<String, Object> redisTemplate;
 
+    public void push(String uuid) {
+        redisTemplate.opsForList().leftPush(MESSAGE_QUEUE, uuid);
+    }
+
     public void pushAll(List<String> imageUUID) {
         for (String uuid : imageUUID)
             redisTemplate.opsForList().leftPushAll(MESSAGE_QUEUE, uuid);