From 3e1d5a5223e2d721e1103b67e0a55614bef8fb5e Mon Sep 17 00:00:00 2001
From: GaBaljaintheroom <junsu1222@naver.com>
Date: Sat, 8 Jun 2024 02:11:21 +0900
Subject: [PATCH 1/8] =?UTF-8?q?fix=20:=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?=
 =?UTF-8?q?=EA=B5=AC=EC=84=B1=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../capsule/CapsuleQueryRepository.java       | 31 +++++++++++++++++++
 .../CapsuleQueryRepositoryImpl.java}          | 12 +++----
 .../{ => capsule}/CapsuleRepository.java      |  4 +--
 .../image/ImageQueryRepository.java           |  9 ++++++
 .../ImageQueryRepositoryImpl.java}            |  4 +--
 .../{ => image}/ImageRepository.java          |  4 +--
 .../video/VideoQueryRepository.java           | 10 ++++++
 .../VideoQueryRepositoryImpl.java}            |  4 +--
 .../{ => video}/VideoRepository.java          |  4 +--
 .../service/CapsuleService.java               | 12 +++----
 .../generic_capsule/service/ImageService.java |  6 ++--
 .../generic_capsule/service/VideoService.java |  6 ++--
 .../service/GroupCapsuleService.java          |  2 +-
 .../CapsuleQueryRepositoryTest.java           |  4 ++-
 .../service/GroupCapsuleServiceTest.java      |  2 +-
 .../repository/MediaQueryRepositoryTest.java  | 10 +++---
 16 files changed, 88 insertions(+), 36 deletions(-)
 create mode 100644 backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleQueryRepository.java
 rename backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/{CapsuleQueryRepository.java => capsule/CapsuleQueryRepositoryImpl.java} (96%)
 rename backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/{ => capsule}/CapsuleRepository.java (96%)
 create mode 100644 backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java
 rename backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/{ImageQueryRepository.java => image/ImageQueryRepositoryImpl.java} (94%)
 rename backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/{ => image}/ImageRepository.java (85%)
 create mode 100644 backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/video/VideoQueryRepository.java
 rename backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/{VideoQueryRepository.java => video/VideoQueryRepositoryImpl.java} (94%)
 rename backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/{ => video}/VideoRepository.java (85%)

diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleQueryRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleQueryRepository.java
new file mode 100644
index 000000000..5b82ab35e
--- /dev/null
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleQueryRepository.java
@@ -0,0 +1,31 @@
+package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.capsule;
+
+import java.util.List;
+import org.locationtech.jts.geom.Polygon;
+import site.timecapsulearchive.core.domain.capsule.entity.CapsuleType;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.data.dto.NearbyARCapsuleSummaryDto;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.data.dto.NearbyCapsuleSummaryDto;
+
+public interface CapsuleQueryRepository {
+    List<NearbyARCapsuleSummaryDto> findARCapsuleSummaryDtosByCurrentLocationAndCapsuleType(
+        final Long memberId,
+        final Polygon mbr,
+        final CapsuleType capsuleType
+    );
+
+    List<NearbyCapsuleSummaryDto> findCapsuleSummaryDtosByCurrentLocationAndCapsuleType(
+        final Long memberId,
+        final Polygon mbr,
+        final CapsuleType capsuleType
+    );
+
+    List<NearbyCapsuleSummaryDto> findFriendsCapsuleSummaryDtosByCurrentLocationAndCapsuleType(
+        final List<Long> friendIds,
+        final Polygon mbr
+    );
+
+    List<NearbyARCapsuleSummaryDto> findFriendsARCapsulesByCurrentLocation(
+        final List<Long> friendIds,
+        final Polygon mbr
+    );
+}
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/CapsuleQueryRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleQueryRepositoryImpl.java
similarity index 96%
rename from backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/CapsuleQueryRepository.java
rename to backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleQueryRepositoryImpl.java
index 700a7d637..0942ed27e 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/CapsuleQueryRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleQueryRepositoryImpl.java
@@ -1,4 +1,4 @@
-package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository;
+package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.capsule;
 
 import static site.timecapsulearchive.core.domain.capsule.entity.QCapsule.capsule;
 import static site.timecapsulearchive.core.domain.capsuleskin.entity.QCapsuleSkin.capsuleSkin;
@@ -20,7 +20,7 @@
 
 @Repository
 @RequiredArgsConstructor
-public class CapsuleQueryRepository {
+public class CapsuleQueryRepositoryImpl implements CapsuleQueryRepository {
 
     private final JPAQueryFactory jpaQueryFactory;
 
@@ -104,8 +104,8 @@ public List<NearbyCapsuleSummaryDto> findCapsuleSummaryDtosByCurrentLocationAndC
      * @return 범위 내에 조회된 캡슐들의 요약 정보들을 반환한다.
      */
     public List<NearbyCapsuleSummaryDto> findFriendsCapsuleSummaryDtosByCurrentLocationAndCapsuleType(
-        List<Long> friendIds,
-        Polygon mbr
+        final List<Long> friendIds,
+        final Polygon mbr
     ) {
         return jpaQueryFactory
             .select(
@@ -136,8 +136,8 @@ private BooleanExpression ST_Contains(Polygon mbr, ComparablePath<Point> point)
      * @return 범위 내에 조회된 캡슐들의 요약 정보들을 반환한다.
      */
     public List<NearbyARCapsuleSummaryDto> findFriendsARCapsulesByCurrentLocation(
-        List<Long> friendIds,
-        Polygon mbr
+        final List<Long> friendIds,
+        final Polygon mbr
     ) {
         return jpaQueryFactory
             .select(
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/CapsuleRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleRepository.java
similarity index 96%
rename from backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/CapsuleRepository.java
rename to backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleRepository.java
index 788197a56..c0cb84b1c 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/CapsuleRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleRepository.java
@@ -1,4 +1,4 @@
-package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository;
+package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.capsule;
 
 import java.util.Optional;
 import org.springframework.data.jpa.repository.Modifying;
@@ -7,7 +7,7 @@
 import org.springframework.data.repository.query.Param;
 import site.timecapsulearchive.core.domain.capsule.entity.Capsule;
 
-public interface CapsuleRepository extends Repository<Capsule, Long> {
+public interface CapsuleRepository extends Repository<Capsule, Long>, CapsuleQueryRepository {
 
     Capsule save(Capsule capsule);
 
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java
new file mode 100644
index 000000000..4db15a1da
--- /dev/null
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java
@@ -0,0 +1,9 @@
+package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.image;
+
+import java.util.List;
+import site.timecapsulearchive.core.domain.capsule.entity.Image;
+
+public interface ImageQueryRepository {
+
+    void bulkSave(final List<Image> images);
+}
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/ImageQueryRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java
similarity index 94%
rename from backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/ImageQueryRepository.java
rename to backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java
index 6148f5377..ccd86258d 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/ImageQueryRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java
@@ -1,4 +1,4 @@
-package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository;
+package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.image;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -14,7 +14,7 @@
 
 @Repository
 @RequiredArgsConstructor
-public class ImageQueryRepository {
+public class ImageQueryRepositoryImpl implements ImageQueryRepository {
 
     private final JdbcTemplate jdbcTemplate;
 
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/ImageRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageRepository.java
similarity index 85%
rename from backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/ImageRepository.java
rename to backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageRepository.java
index 2c8478ce6..f83a05c4c 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/ImageRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageRepository.java
@@ -1,9 +1,9 @@
-package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository;
+package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.image;
 
 import org.springframework.data.repository.Repository;
 import site.timecapsulearchive.core.domain.capsule.entity.Image;
 
-public interface ImageRepository extends Repository<Image, Long> {
+public interface ImageRepository extends Repository<Image, Long>, ImageQueryRepository {
 
     void save(Image newImage);
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/video/VideoQueryRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/video/VideoQueryRepository.java
new file mode 100644
index 000000000..8acfe6026
--- /dev/null
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/video/VideoQueryRepository.java
@@ -0,0 +1,10 @@
+package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.video;
+
+import java.util.List;
+import org.springframework.data.repository.Repository;
+import site.timecapsulearchive.core.domain.capsule.entity.Video;
+
+public interface VideoQueryRepository {
+
+    void bulkSave(final List<Video> videos);
+}
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/VideoQueryRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/video/VideoQueryRepositoryImpl.java
similarity index 94%
rename from backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/VideoQueryRepository.java
rename to backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/video/VideoQueryRepositoryImpl.java
index 7235ce85e..2c3597749 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/VideoQueryRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/video/VideoQueryRepositoryImpl.java
@@ -1,4 +1,4 @@
-package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository;
+package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.video;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -14,7 +14,7 @@
 
 @Repository
 @RequiredArgsConstructor
-public class VideoQueryRepository {
+public class VideoQueryRepositoryImpl implements VideoQueryRepository {
 
     private final JdbcTemplate jdbcTemplate;
 
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/VideoRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/video/VideoRepository.java
similarity index 85%
rename from backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/VideoRepository.java
rename to backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/video/VideoRepository.java
index bd7e070e2..f07bdf3cf 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/VideoRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/video/VideoRepository.java
@@ -1,9 +1,9 @@
-package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository;
+package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.video;
 
 import org.springframework.data.repository.Repository;
 import site.timecapsulearchive.core.domain.capsule.entity.Video;
 
-public interface VideoRepository extends Repository<Video, Long> {
+public interface VideoRepository extends Repository<Video, Long>, VideoQueryRepository {
 
     void save(Video video);
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/service/CapsuleService.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/service/CapsuleService.java
index 960fa1c4c..b4b7e2417 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/service/CapsuleService.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/service/CapsuleService.java
@@ -13,8 +13,7 @@
 import site.timecapsulearchive.core.domain.capsule.generic_capsule.data.dto.CoordinateRangeDto;
 import site.timecapsulearchive.core.domain.capsule.generic_capsule.data.dto.NearbyARCapsuleSummaryDto;
 import site.timecapsulearchive.core.domain.capsule.generic_capsule.data.dto.NearbyCapsuleSummaryDto;
-import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.CapsuleQueryRepository;
-import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.CapsuleRepository;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.capsule.CapsuleRepository;
 import site.timecapsulearchive.core.domain.capsuleskin.entity.CapsuleSkin;
 import site.timecapsulearchive.core.domain.friend.repository.member_friend.MemberFriendRepository;
 import site.timecapsulearchive.core.domain.member.entity.Member;
@@ -25,7 +24,6 @@
 @Transactional(readOnly = true)
 public class CapsuleService {
 
-    private final CapsuleQueryRepository capsuleQueryRepository;
     private final CapsuleRepository capsuleRepository;
     private final MemberFriendRepository memberFriendRepository;
     private final GeoTransformManager geoTransformManager;
@@ -49,7 +47,7 @@ public List<NearbyARCapsuleSummaryDto> findARCapsuleByCurrentLocationAndCapsuleT
 
         final Polygon mbr = geoTransformManager.getDistanceMBROf3857(point, dto.distance());
 
-        return capsuleQueryRepository.findARCapsuleSummaryDtosByCurrentLocationAndCapsuleType(
+        return capsuleRepository.findARCapsuleSummaryDtosByCurrentLocationAndCapsuleType(
             memberId, mbr, capsuleType);
     }
 
@@ -63,7 +61,7 @@ public List<NearbyCapsuleSummaryDto> findCapsuleByCurrentLocationAndCapsuleType(
 
         final Polygon mbr = geoTransformManager.getDistanceMBROf3857(point, dto.distance());
 
-        return capsuleQueryRepository.findCapsuleSummaryDtosByCurrentLocationAndCapsuleType(
+        return capsuleRepository.findCapsuleSummaryDtosByCurrentLocationAndCapsuleType(
             memberId, mbr, capsuleType);
     }
 
@@ -116,7 +114,7 @@ public List<NearbyCapsuleSummaryDto> findFriendsCapsulesByCurrentLocation(
 
         final List<Long> friendIds = memberFriendRepository.findFriendIdsByOwnerId(memberId);
 
-        return capsuleQueryRepository.findFriendsCapsuleSummaryDtosByCurrentLocationAndCapsuleType(
+        return capsuleRepository.findFriendsCapsuleSummaryDtosByCurrentLocationAndCapsuleType(
             friendIds,
             mbr
         );
@@ -140,7 +138,7 @@ public List<NearbyARCapsuleSummaryDto> findFriendsARCapsulesByCurrentLocation(
 
         final List<Long> friendIds = memberFriendRepository.findFriendIdsByOwnerId(memberId);
 
-        return capsuleQueryRepository.findFriendsARCapsulesByCurrentLocation(
+        return capsuleRepository.findFriendsARCapsulesByCurrentLocation(
             friendIds,
             mbr
         );
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/service/ImageService.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/service/ImageService.java
index 022b9e9eb..b5686bc28 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/service/ImageService.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/service/ImageService.java
@@ -6,7 +6,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import site.timecapsulearchive.core.domain.capsule.entity.Capsule;
 import site.timecapsulearchive.core.domain.capsule.entity.Image;
-import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.ImageQueryRepository;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.image.ImageRepository;
 import site.timecapsulearchive.core.domain.member.entity.Member;
 import site.timecapsulearchive.core.infra.s3.data.dto.S3Directory;
 
@@ -14,7 +14,7 @@
 @RequiredArgsConstructor
 public class ImageService {
 
-    private final ImageQueryRepository imageQueryRepository;
+    private final ImageRepository imageRepository;
 
     @Transactional
     public void bulkSave(final List<String> fileNames, final Capsule capsule, final Member member) {
@@ -23,7 +23,7 @@ public void bulkSave(final List<String> fileNames, final Capsule capsule, final
                 .map(fileName -> S3Directory.CAPSULE.generateFullPath(member.getId(), fileName))
                 .toList();
 
-            imageQueryRepository.bulkSave(Image.createOf(fullFileNames, capsule, member));
+            imageRepository.bulkSave(Image.createOf(fullFileNames, capsule, member));
         }
     }
 
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/service/VideoService.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/service/VideoService.java
index 22dc0938d..acc790107 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/service/VideoService.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/service/VideoService.java
@@ -6,7 +6,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import site.timecapsulearchive.core.domain.capsule.entity.Capsule;
 import site.timecapsulearchive.core.domain.capsule.entity.Video;
-import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.VideoQueryRepository;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.video.VideoRepository;
 import site.timecapsulearchive.core.domain.member.entity.Member;
 import site.timecapsulearchive.core.infra.s3.data.dto.S3Directory;
 
@@ -14,7 +14,7 @@
 @RequiredArgsConstructor
 public class VideoService {
 
-    private final VideoQueryRepository videoQueryRepository;
+    private final VideoRepository videoRepository;
 
     @Transactional
     public void bulkSave(final List<String> fileNames, final Capsule capsule, final Member member) {
@@ -23,7 +23,7 @@ public void bulkSave(final List<String> fileNames, final Capsule capsule, final
                 .map(fileName -> S3Directory.CAPSULE.generateFullPath(member.getId(), fileName))
                 .toList();
 
-            videoQueryRepository.bulkSave(Video.createOf(fullFileNames, capsule, member));
+            videoRepository.bulkSave(Video.createOf(fullFileNames, capsule, member));
         }
     }
 
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleService.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleService.java
index d7123fe1c..86196ada7 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleService.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleService.java
@@ -10,7 +10,7 @@
 import site.timecapsulearchive.core.domain.capsule.entity.Capsule;
 import site.timecapsulearchive.core.domain.capsule.entity.CapsuleType;
 import site.timecapsulearchive.core.domain.capsule.exception.CapsuleNotFondException;
-import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.CapsuleRepository;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.capsule.CapsuleRepository;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleCreateRequestDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleDetailDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleSummaryDto;
diff --git a/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/CapsuleQueryRepositoryTest.java b/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/CapsuleQueryRepositoryTest.java
index f4fa3bec4..e1f9fada5 100644
--- a/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/CapsuleQueryRepositoryTest.java
+++ b/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/CapsuleQueryRepositoryTest.java
@@ -24,6 +24,8 @@
 import site.timecapsulearchive.core.domain.capsule.entity.CapsuleType;
 import site.timecapsulearchive.core.domain.capsule.generic_capsule.data.dto.NearbyARCapsuleSummaryDto;
 import site.timecapsulearchive.core.domain.capsule.generic_capsule.data.dto.NearbyCapsuleSummaryDto;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.capsule.CapsuleQueryRepository;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.capsule.CapsuleQueryRepositoryImpl;
 import site.timecapsulearchive.core.domain.capsuleskin.entity.CapsuleSkin;
 import site.timecapsulearchive.core.domain.friend.entity.MemberFriend;
 import site.timecapsulearchive.core.domain.member.entity.Member;
@@ -58,7 +60,7 @@ class CapsuleQueryRepositoryTest extends RepositoryTest {
     private Point point;
 
     CapsuleQueryRepositoryTest(EntityManager entityManager) {
-        this.capsuleQueryRepository = new CapsuleQueryRepository(
+        this.capsuleQueryRepository = new CapsuleQueryRepositoryImpl(
             new JPAQueryFactory(entityManager));
     }
 
diff --git a/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleServiceTest.java b/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleServiceTest.java
index 31e5d2ca5..38750bd68 100644
--- a/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleServiceTest.java
+++ b/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleServiceTest.java
@@ -18,7 +18,7 @@
 import site.timecapsulearchive.core.domain.capsule.exception.CapsuleNotFondException;
 import site.timecapsulearchive.core.domain.capsule.exception.GroupCapsuleOpenNotFoundException;
 import site.timecapsulearchive.core.domain.capsule.generic_capsule.data.dto.CapsuleDetailDto;
-import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.CapsuleRepository;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.capsule.CapsuleRepository;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.CapsuleOpenStatus;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleDetailDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleOpenStateDto;
diff --git a/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/media/repository/MediaQueryRepositoryTest.java b/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/media/repository/MediaQueryRepositoryTest.java
index 881a3465f..03d8eb2cf 100644
--- a/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/media/repository/MediaQueryRepositoryTest.java
+++ b/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/media/repository/MediaQueryRepositoryTest.java
@@ -23,8 +23,10 @@
 import site.timecapsulearchive.core.domain.capsule.entity.CapsuleType;
 import site.timecapsulearchive.core.domain.capsule.entity.Image;
 import site.timecapsulearchive.core.domain.capsule.entity.Video;
-import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.ImageQueryRepository;
-import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.VideoQueryRepository;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.image.ImageQueryRepository;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.image.ImageQueryRepositoryImpl;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.video.VideoQueryRepository;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.video.VideoQueryRepositoryImpl;
 import site.timecapsulearchive.core.domain.capsuleskin.entity.CapsuleSkin;
 import site.timecapsulearchive.core.domain.member.entity.Member;
 
@@ -44,8 +46,8 @@ public MediaQueryRepositoryTest(
         DataSource dataSource
     ) {
         this.jdbcTemplate = new JdbcTemplate(dataSource);
-        this.imageQueryRepository = new ImageQueryRepository(jdbcTemplate);
-        this.videoQueryRepository = new VideoQueryRepository(jdbcTemplate);
+        this.imageQueryRepository = new ImageQueryRepositoryImpl(jdbcTemplate);
+        this.videoQueryRepository = new VideoQueryRepositoryImpl(jdbcTemplate);
     }
 
     @Transactional

From 129e82d3b8ae96dc6b3475ea8bf26f27f44f2a9e Mon Sep 17 00:00:00 2001
From: GaBaljaintheroom <junsu1222@naver.com>
Date: Sat, 8 Jun 2024 03:16:57 +0900
Subject: [PATCH 2/8] =?UTF-8?q?feat=20:=20=EB=B3=B4=EB=AC=BC=20=EC=BA=A1?=
 =?UTF-8?q?=EC=8A=90=20=ED=9A=8D=EB=93=9D=20=EC=84=B1=EA=B3=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../image/ImageQueryRepository.java           |  4 ++
 .../image/ImageQueryRepositoryImpl.java       | 14 +++++
 .../repository/image/ImageRepository.java     |  3 +
 .../api/TreasureCapsuleApi.java               | 37 ++++++++++++
 .../api/TreasureCapsuleController.java        | 36 +++++++++++
 .../data/dto/OpenTreasureCapsuleDto.java      |  7 +++
 .../request/OpenTreasureCapsuleRequest.java   | 16 +++++
 .../TreasureCapsuleOpenFailedException.java   | 11 ++++
 .../TreasureCapsuleQueryRepository.java       | 24 ++++++++
 .../service/TreasureCapsuleService.java       | 59 +++++++++++++++++++
 .../capsuleskin/entity/CapsuleSkin.java       | 10 ++++
 .../rabbitmq/RabbitFailedComponentConfig.java | 21 +++++++
 .../rabbitmq/RabbitmqComponentConstants.java  |  7 ++-
 .../config/rabbitmq/RabbitmqConfig.java       | 21 +++++++
 .../core/global/error/ErrorCode.java          |  1 +
 .../data/dto/NotificationRequestMessage.java  |  5 +-
 .../dto/TreasureCaptureNotificationDto.java   | 32 ++++++++++
 .../manager/SocialNotificationManager.java    | 14 +++++
 .../repository/MediaQueryRepositoryTest.java  |  6 +-
 19 files changed, 323 insertions(+), 5 deletions(-)
 create mode 100644 backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleApi.java
 create mode 100644 backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleController.java
 create mode 100644 backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/data/dto/OpenTreasureCapsuleDto.java
 create mode 100644 backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/data/request/OpenTreasureCapsuleRequest.java
 create mode 100644 backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/exception/TreasureCapsuleOpenFailedException.java
 create mode 100644 backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/repository/TreasureCapsuleQueryRepository.java
 create mode 100644 backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/service/TreasureCapsuleService.java
 create mode 100644 backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/data/dto/TreasureCaptureNotificationDto.java

diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java
index 4db15a1da..897847477 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java
@@ -1,9 +1,13 @@
 package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.image;
 
 import java.util.List;
+import java.util.Optional;
 import site.timecapsulearchive.core.domain.capsule.entity.Image;
 
 public interface ImageQueryRepository {
 
     void bulkSave(final List<Image> images);
+
+    Optional<Long> deleteImage(final Long imageId);
+
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java
index ccd86258d..f1b6fe88c 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java
@@ -1,11 +1,15 @@
 package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.image;
 
+import static site.timecapsulearchive.core.domain.capsule.entity.QImage.image;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.ZonedDateTime;
 import java.util.List;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -17,6 +21,7 @@
 public class ImageQueryRepositoryImpl implements ImageQueryRepository {
 
     private final JdbcTemplate jdbcTemplate;
+    private final JPAQueryFactory jpaQueryFactory;
 
     public void bulkSave(final List<Image> images) {
         jdbcTemplate.batchUpdate(
@@ -45,4 +50,13 @@ public int getBatchSize() {
             }
         );
     }
+
+    public Optional<Long> deleteImage(final Long imageId) {
+        return Optional.of(jpaQueryFactory
+            .delete(image)
+            .where(image.id.eq(imageId))
+            .execute()
+        );
+    }
+
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageRepository.java
index f83a05c4c..e79f7d59f 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageRepository.java
@@ -1,9 +1,12 @@
 package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.image;
 
+import java.util.Optional;
 import org.springframework.data.repository.Repository;
 import site.timecapsulearchive.core.domain.capsule.entity.Image;
 
 public interface ImageRepository extends Repository<Image, Long>, ImageQueryRepository {
 
     void save(Image newImage);
+
+    Optional<Image> findById(Long imageId);
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleApi.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleApi.java
new file mode 100644
index 000000000..1ef0c6f94
--- /dev/null
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleApi.java
@@ -0,0 +1,37 @@
+package site.timecapsulearchive.core.domain.capsule.treasure_capsule.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import site.timecapsulearchive.core.global.common.response.ApiSpec;
+
+public interface TreasureCapsuleApi {
+
+    @Operation(
+        summary = "보물 캡슐 개봉",
+        description = "사용자는 보물 캡슐을 개봉할 수 있다.",
+        security = {@SecurityRequirement(name = "user_token")},
+        tags = {"secret capsule"}
+    )
+    @ApiResponses(value = {
+        @ApiResponse(
+            responseCode = "202",
+            description = "처리 시작"
+        )
+    })
+    ResponseEntity<ApiSpec<String>> openTreasureCapsule(
+        Long memberId,
+
+        @Parameter(in = ParameterIn.PATH, description = "개봉할 보물 캡슐 아이디", required = true)
+        Long capsuleId,
+
+        @Parameter(in = ParameterIn.PATH, description = "보물 url 저장한 이미지 아이디", required = true)
+        Long imageId
+    );
+
+}
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleController.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleController.java
new file mode 100644
index 000000000..66a2bf68a
--- /dev/null
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleController.java
@@ -0,0 +1,36 @@
+package site.timecapsulearchive.core.domain.capsule.treasure_capsule.api;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import site.timecapsulearchive.core.domain.capsule.treasure_capsule.service.TreasureCapsuleService;
+import site.timecapsulearchive.core.global.common.response.ApiSpec;
+import site.timecapsulearchive.core.global.common.response.SuccessCode;
+
+@RestController
+@RequestMapping("/treasure-capsules")
+@RequiredArgsConstructor
+public class TreasureCapsuleController implements TreasureCapsuleApi {
+
+    private final TreasureCapsuleService treasureCapsuleService;
+
+    @Override
+    @PostMapping("/{capsule_id}/image/{image_id}/open")
+    public ResponseEntity<ApiSpec<String>> openTreasureCapsule(
+        @AuthenticationPrincipal final Long memberId,
+        @PathVariable(value = "capsule_id") final Long capsuleId,
+        @PathVariable(value = "image_id") final Long imageId
+    ) {
+        treasureCapsuleService.openTreasureCapsule(memberId, capsuleId, imageId);
+
+        return ResponseEntity.ok(
+            ApiSpec.empty(
+                SuccessCode.SUCCESS
+            )
+        );
+    }
+}
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/data/dto/OpenTreasureCapsuleDto.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/data/dto/OpenTreasureCapsuleDto.java
new file mode 100644
index 000000000..c760767cb
--- /dev/null
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/data/dto/OpenTreasureCapsuleDto.java
@@ -0,0 +1,7 @@
+package site.timecapsulearchive.core.domain.capsule.treasure_capsule.data.dto;
+
+public record OpenTreasureCapsuleDto(
+
+) {
+
+}
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/data/request/OpenTreasureCapsuleRequest.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/data/request/OpenTreasureCapsuleRequest.java
new file mode 100644
index 000000000..5e8b238ec
--- /dev/null
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/data/request/OpenTreasureCapsuleRequest.java
@@ -0,0 +1,16 @@
+package site.timecapsulearchive.core.domain.capsule.treasure_capsule.data.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(name = "오픈할 보물 캡슐 요청 포맷")
+public record OpenTreasureCapsuleRequest(
+
+    @Schema(name = "보물 캡슐 아이디")
+    Long treasureCapsuleId,
+
+    @Schema(name = "보물 캡슐 스킨 Gif")
+    String treasureCapsuleSkinGif
+
+) {
+
+}
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/exception/TreasureCapsuleOpenFailedException.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/exception/TreasureCapsuleOpenFailedException.java
new file mode 100644
index 000000000..1c24dd45a
--- /dev/null
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/exception/TreasureCapsuleOpenFailedException.java
@@ -0,0 +1,11 @@
+package site.timecapsulearchive.core.domain.capsule.treasure_capsule.exception;
+
+import site.timecapsulearchive.core.global.error.ErrorCode;
+import site.timecapsulearchive.core.global.error.exception.BusinessException;
+
+public class TreasureCapsuleOpenFailedException extends BusinessException {
+
+    public TreasureCapsuleOpenFailedException() {
+        super(ErrorCode.TREASURE_CAPSULE_OPEN_FAILED_ERROR);
+    }
+}
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/repository/TreasureCapsuleQueryRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/repository/TreasureCapsuleQueryRepository.java
new file mode 100644
index 000000000..3da5d369e
--- /dev/null
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/repository/TreasureCapsuleQueryRepository.java
@@ -0,0 +1,24 @@
+package site.timecapsulearchive.core.domain.capsule.treasure_capsule.repository;
+
+import static site.timecapsulearchive.core.domain.capsule.entity.QCapsule.capsule;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class TreasureCapsuleQueryRepository {
+
+    private final JPAQueryFactory jpaQueryFactory;
+
+    public Optional<Long> deleteTreasureCapsule(final Long capsuleId) {
+        return Optional.of(jpaQueryFactory
+            .delete(capsule)
+            .where(capsule.id.eq(capsuleId))
+            .execute()
+        );
+    }
+
+}
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/service/TreasureCapsuleService.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/service/TreasureCapsuleService.java
new file mode 100644
index 000000000..11792cc49
--- /dev/null
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/service/TreasureCapsuleService.java
@@ -0,0 +1,59 @@
+package site.timecapsulearchive.core.domain.capsule.treasure_capsule.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.support.TransactionTemplate;
+import site.timecapsulearchive.core.domain.capsule.entity.Image;
+import site.timecapsulearchive.core.domain.capsule.exception.CapsuleNotFondException;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.image.ImageRepository;
+import site.timecapsulearchive.core.domain.capsule.treasure_capsule.exception.TreasureCapsuleOpenFailedException;
+import site.timecapsulearchive.core.domain.capsule.treasure_capsule.repository.TreasureCapsuleQueryRepository;
+import site.timecapsulearchive.core.domain.capsuleskin.entity.CapsuleSkin;
+import site.timecapsulearchive.core.domain.capsuleskin.repository.CapsuleSkinRepository;
+import site.timecapsulearchive.core.domain.member.entity.Member;
+import site.timecapsulearchive.core.domain.member.exception.MemberNotFoundException;
+import site.timecapsulearchive.core.domain.member.repository.MemberRepository;
+import site.timecapsulearchive.core.infra.queue.manager.SocialNotificationManager;
+
+@Service
+@RequiredArgsConstructor
+public class TreasureCapsuleService {
+
+    private final TreasureCapsuleQueryRepository treasureCapsuleQueryRepository;
+    private final ImageRepository imageRepository;
+    private final MemberRepository memberRepository;
+    private final CapsuleSkinRepository capsuleSkinRepository;
+    private final SocialNotificationManager socialNotificationManager;
+    private final TransactionTemplate transactionTemplate;
+
+    public void openTreasureCapsule(final Long memberId, final Long capsuleId, final Long imageId) {
+        final Member member = memberRepository.findMemberById(memberId).orElseThrow(
+            MemberNotFoundException::new);
+
+        String treasureUrl = transactionTemplate.execute(status -> {
+            // capsuleId로 image 엔티티의 imageUrl을 가져온 후 삭제
+            final Image treasureImage = imageRepository.findById(imageId)
+                .orElseThrow(CapsuleNotFondException::new);
+            imageRepository.deleteImage(imageId);
+
+            // 보물 캡슐 삭제
+            final Long deleteTreasureCapsule = treasureCapsuleQueryRepository.deleteTreasureCapsule(
+                capsuleId).orElseThrow(
+                CapsuleNotFondException::new);
+            if (deleteTreasureCapsule != 1) {
+                throw new TreasureCapsuleOpenFailedException();
+            }
+
+            // caspuleSkin 저장
+            final CapsuleSkin myTreasureCapsuleSkin = CapsuleSkin.captureTreasureCapsuleSkin(
+                treasureImage.getImageUrl(), member);
+            capsuleSkinRepository.save(myTreasureCapsuleSkin);
+
+            return treasureImage.getImageUrl();
+        });
+
+        // 알림 전송
+        socialNotificationManager.sendTreasureCaptureMessage(memberId, member.getNickname(),
+            treasureUrl);
+    }
+}
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsuleskin/entity/CapsuleSkin.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsuleskin/entity/CapsuleSkin.java
index 6cd408f78..05b7cbfd6 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsuleskin/entity/CapsuleSkin.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsuleskin/entity/CapsuleSkin.java
@@ -56,4 +56,14 @@ private CapsuleSkin(String skinName, String imageUrl, Motion motionName, Member
         this.member = member;
         this.retarget = retarget;
     }
+
+    private CapsuleSkin(String imageUrl, Member member) {
+        this.skinName = "보물 캡슐에서 얻은 스킨";
+        this.imageUrl = imageUrl;
+        this.member = member;
+    }
+
+    public static CapsuleSkin captureTreasureCapsuleSkin(String imageUrl, Member member) {
+        return new CapsuleSkin(imageUrl, member);
+    }
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/global/config/rabbitmq/RabbitFailedComponentConfig.java b/backend/core/src/main/java/site/timecapsulearchive/core/global/config/rabbitmq/RabbitFailedComponentConfig.java
index 82dd8241b..10507f188 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/global/config/rabbitmq/RabbitFailedComponentConfig.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/global/config/rabbitmq/RabbitFailedComponentConfig.java
@@ -110,4 +110,25 @@ public Binding friendAcceptFailBinding() {
             .to(friendAcceptFailExchange())
             .withQueueName();
     }
+
+    @Bean
+    public Queue treasureCaptureFailQueue() {
+        return new Queue(
+            RabbitmqComponentConstants.TREASURE_CAPTURE_NOTIFICATION_QUEUE.getFailComponent(),
+            true);
+    }
+
+    @Bean
+    public DirectExchange treasureCaptureFailExchange() {
+        return new DirectExchange(
+            RabbitmqComponentConstants.TREASURE_CAPTURE_NOTIFICATION_EXCHANGE.getFailComponent());
+    }
+
+    @Bean
+    public Binding treasureCaptureFailBinding() {
+        return BindingBuilder
+            .bind(treasureCaptureFailQueue())
+            .to(treasureCaptureFailExchange())
+            .withQueueName();
+    }
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/global/config/rabbitmq/RabbitmqComponentConstants.java b/backend/core/src/main/java/site/timecapsulearchive/core/global/config/rabbitmq/RabbitmqComponentConstants.java
index 4f615029c..fd00b378b 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/global/config/rabbitmq/RabbitmqComponentConstants.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/global/config/rabbitmq/RabbitmqComponentConstants.java
@@ -25,7 +25,12 @@ public enum RabbitmqComponentConstants {
     GROUP_ACCEPT_NOTIFICATION_QUEUE("notification.groupAccept.queue",
         "fail.notification.groupAccept.queue"),
     GROUP_ACCEPT_NOTIFICATION_EXCHANGE("notification.groupAccept.exchange",
-        "fail.notification.groupAccept.exchange");
+        "fail.notification.groupAccept.exchange"),
+
+    TREASURE_CAPTURE_NOTIFICATION_QUEUE("notification.treasureCapture.queue",
+        "fail.notification.treasureCapture.queue"),
+    TREASURE_CAPTURE_NOTIFICATION_EXCHANGE("notification.treasureCapture.exchange",
+        "fail.notification.treasureCapture.exchange");
 
     private final String successComponent;
     private final String failComponent;
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/global/config/rabbitmq/RabbitmqConfig.java b/backend/core/src/main/java/site/timecapsulearchive/core/global/config/rabbitmq/RabbitmqConfig.java
index 8343c1f3a..e30fb1aef 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/global/config/rabbitmq/RabbitmqConfig.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/global/config/rabbitmq/RabbitmqConfig.java
@@ -123,6 +123,27 @@ public Binding friendAcceptBinding() {
             .withQueueName();
     }
 
+    @Bean
+    public Queue treasureCaptureQueue() {
+        return new Queue(
+            RabbitmqComponentConstants.TREASURE_CAPTURE_NOTIFICATION_QUEUE.getSuccessComponent(),
+            true);
+    }
+
+    @Bean
+    public DirectExchange treasureCaptureExchange() {
+        return new DirectExchange(
+            RabbitmqComponentConstants.TREASURE_CAPTURE_NOTIFICATION_EXCHANGE.getSuccessComponent());
+    }
+
+    @Bean
+    public Binding treasureCaptureBinding() {
+        return BindingBuilder
+            .bind(treasureCaptureQueue())
+            .to(treasureCaptureExchange())
+            .withQueueName();
+    }
+
     @Bean
     public RabbitTemplate publisherConfirmsRabbitTemplate() {
         RabbitTemplate rabbitTemplate = new RabbitTemplate(publisherConfirmsConnectionFactory());
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/global/error/ErrorCode.java b/backend/core/src/main/java/site/timecapsulearchive/core/global/error/ErrorCode.java
index d753a1419..85389c990 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/global/error/ErrorCode.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/global/error/ErrorCode.java
@@ -58,6 +58,7 @@ public enum ErrorCode {
     NO_CAPSULE_AUTHORITY_ERROR(403, "CAPSULE-002", "캡슐에 접근 권한이 없습니다."),
     GROUP_CAPSULE_OPEN_NOT_FOUND_ERROR(404, "CAPSULE-003", "그룹 캡슐 개봉상태를 찾을 수 없습니다."),
     CAPSULE_OPEN_STATE_ERROR(400, "CAPSULE-004", "캡슐을 개봉할 수 없는 상태입니다."),
+    TREASURE_CAPSULE_OPEN_FAILED_ERROR(500, "CAPSULE-005", "보물 캡슐을 개봉에 실패하엿습니다."),
 
     //friend
     FRIEND_NOT_FOUND_ERROR(404, "FRIEND-001", "친구를 찾지 못하였습니다"),
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/data/dto/NotificationRequestMessage.java b/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/data/dto/NotificationRequestMessage.java
index c0bdc06b4..0c195f7e4 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/data/dto/NotificationRequestMessage.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/data/dto/NotificationRequestMessage.java
@@ -7,7 +7,8 @@ public enum NotificationRequestMessage {
     FRIEND_REQUEST(NotificationStatus.SUCCESS, "친구 요청 알림", "님 으로부터 친구 요청이 왔습니다."),
     FRIEND_ACCEPT(NotificationStatus.SUCCESS, "친구 수락 알림", "님이 친구 요청을 수락하였습니다."),
     GROUP_INVITE(NotificationStatus.SUCCESS, "그룹 초대 알림", "님으로부터 그룹 초대 요청이 왔습니다."),
-    GROUP_ACCEPT(NotificationStatus.SUCCESS, "그룹 수락 알림", "님이 그룹 요청을 수락하였습니다.");
+    GROUP_ACCEPT(NotificationStatus.SUCCESS, "그룹 수락 알림", "님이 그룹 요청을 수락하였습니다."),
+    TREASURE_CAPTURE(NotificationStatus.SUCCESS, "보물 찾기 알림", "님이 보물 찾기에 성공하여 캡슐 스킨을 획득하였습니다.");
 
     private final NotificationStatus status;
     private final String title;
@@ -28,6 +29,6 @@ public String getTitle() {
     }
 
     public String buildPrefixText(String prefix) {
-        return prefix + text + "ARchive에서 확인해보세요!";
+        return prefix + text + " ARchive에서 확인해보세요!";
     }
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/data/dto/TreasureCaptureNotificationDto.java b/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/data/dto/TreasureCaptureNotificationDto.java
new file mode 100644
index 000000000..b5ff9865f
--- /dev/null
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/data/dto/TreasureCaptureNotificationDto.java
@@ -0,0 +1,32 @@
+package site.timecapsulearchive.core.infra.queue.data.dto;
+
+import lombok.Builder;
+import site.timecapsulearchive.core.domain.member.entity.NotificationStatus;
+
+@Builder
+public record TreasureCaptureNotificationDto(
+
+    Long targetId,
+    String treasureUrl,
+    NotificationStatus notificationStatus,
+    String title,
+    String text
+) {
+
+    public static TreasureCaptureNotificationDto createOf(
+        final Long targetId,
+        final String treasureUrl,
+        final String memberNickname
+
+    ) {
+        final NotificationRequestMessage friendAcceptRequest = NotificationRequestMessage.TREASURE_CAPTURE;
+
+        return new TreasureCaptureNotificationDto(
+            targetId,
+            treasureUrl,
+            friendAcceptRequest.getStatus(),
+            friendAcceptRequest.getTitle(),
+            friendAcceptRequest.buildPrefixText(memberNickname)
+        );
+    }
+}
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/manager/SocialNotificationManager.java b/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/manager/SocialNotificationManager.java
index 8b251c60b..be11b9651 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/manager/SocialNotificationManager.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/manager/SocialNotificationManager.java
@@ -10,6 +10,7 @@
 import site.timecapsulearchive.core.infra.queue.data.dto.FriendsReqNotificationsDto;
 import site.timecapsulearchive.core.infra.queue.data.dto.GroupAcceptNotificationDto;
 import site.timecapsulearchive.core.infra.queue.data.dto.GroupInviteNotificationDto;
+import site.timecapsulearchive.core.infra.queue.data.dto.TreasureCaptureNotificationDto;
 import site.timecapsulearchive.core.infra.s3.manager.S3PreSignedUrlManager;
 
 @Component
@@ -92,4 +93,17 @@ public void sendGroupAcceptMessage(
             GroupAcceptNotificationDto.createOf(targetId, groupMemberNickname)
         );
     }
+    public void sendTreasureCaptureMessage(
+        final Long targetId,
+        final String memberNickname,
+        final String treasureUrl
+    ) {
+        String preSignedUrl = s3PreSignedUrlManager.getS3PreSignedUrlForGet(treasureUrl);
+
+        basicRabbitTemplate.convertAndSend(
+            RabbitmqComponentConstants.TREASURE_CAPTURE_NOTIFICATION_EXCHANGE.getSuccessComponent(),
+            RabbitmqComponentConstants.TREASURE_CAPTURE_NOTIFICATION_QUEUE.getSuccessComponent(),
+            TreasureCaptureNotificationDto.createOf(targetId, preSignedUrl, memberNickname)
+        );
+    }
 }
diff --git a/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/media/repository/MediaQueryRepositoryTest.java b/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/media/repository/MediaQueryRepositoryTest.java
index 03d8eb2cf..1dad0c849 100644
--- a/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/media/repository/MediaQueryRepositoryTest.java
+++ b/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/media/repository/MediaQueryRepositoryTest.java
@@ -3,6 +3,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
 import java.util.List;
 import javax.sql.DataSource;
@@ -43,10 +44,11 @@ class MediaQueryRepositoryTest extends RepositoryTest {
 
     public MediaQueryRepositoryTest(
         JdbcTemplate jdbcTemplate,
-        DataSource dataSource
+        DataSource dataSource,
+        JPAQueryFactory jpaQueryFactory
     ) {
         this.jdbcTemplate = new JdbcTemplate(dataSource);
-        this.imageQueryRepository = new ImageQueryRepositoryImpl(jdbcTemplate);
+        this.imageQueryRepository = new ImageQueryRepositoryImpl(jdbcTemplate, jpaQueryFactory);
         this.videoQueryRepository = new VideoQueryRepositoryImpl(jdbcTemplate);
     }
 

From ef2a9a6615a0743ddb6b02d9eacbd361c54e7876 Mon Sep 17 00:00:00 2001
From: GaBaljaintheroom <junsu1222@naver.com>
Date: Tue, 11 Jun 2024 10:35:55 +0900
Subject: [PATCH 3/8] =?UTF-8?q?refact=20:=20pr=20=EB=A6=AC=EB=B7=B0=20?=
 =?UTF-8?q?=ED=9B=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/image/ImageQueryRepository.java   |  2 ++
 .../image/ImageQueryRepositoryImpl.java          |  9 +++++++++
 .../repository/image/ImageRepository.java        |  2 --
 .../treasure_capsule/api/TreasureCapsuleApi.java | 14 +++++++++++++-
 .../data/dto/OpenTreasureCapsuleDto.java         |  7 -------
 .../data/request/OpenTreasureCapsuleRequest.java | 16 ----------------
 .../service/TreasureCapsuleService.java          | 12 ++++++------
 .../domain/capsuleskin/entity/CapsuleSkin.java   |  6 +++---
 .../data/dto/TreasureCaptureNotificationDto.java | 10 +++++-----
 .../queue/manager/SocialNotificationManager.java |  4 ++--
 10 files changed, 40 insertions(+), 42 deletions(-)
 delete mode 100644 backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/data/dto/OpenTreasureCapsuleDto.java
 delete mode 100644 backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/data/request/OpenTreasureCapsuleRequest.java

diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java
index 897847477..a27387298 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java
@@ -10,4 +10,6 @@ public interface ImageQueryRepository {
 
     Optional<Long> deleteImage(final Long imageId);
 
+    Optional<String> findImageUrl(final Long imageId);
+
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java
index f1b6fe88c..87b3218f9 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java
@@ -51,6 +51,15 @@ public int getBatchSize() {
         );
     }
 
+    public Optional<String> findImageUrl(final Long imageId) {
+        return Optional.ofNullable(jpaQueryFactory
+            .select(image.imageUrl)
+            .from(image)
+            .where(image.id.eq(imageId))
+            .fetchOne()
+        );
+    }
+
     public Optional<Long> deleteImage(final Long imageId) {
         return Optional.of(jpaQueryFactory
             .delete(image)
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageRepository.java
index e79f7d59f..9a3863f92 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageRepository.java
@@ -7,6 +7,4 @@
 public interface ImageRepository extends Repository<Image, Long>, ImageQueryRepository {
 
     void save(Image newImage);
-
-    Optional<Image> findById(Long imageId);
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleApi.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleApi.java
index 1ef0c6f94..7d00ecd03 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleApi.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleApi.java
@@ -3,12 +3,14 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
 import site.timecapsulearchive.core.global.common.response.ApiSpec;
+import site.timecapsulearchive.core.global.error.ErrorResponse;
 
 public interface TreasureCapsuleApi {
 
@@ -22,6 +24,16 @@ public interface TreasureCapsuleApi {
         @ApiResponse(
             responseCode = "202",
             description = "처리 시작"
+        ),
+        @ApiResponse(
+            responseCode = "500",
+            description = "보물 캡슐 찾기 실패 예외",
+            content = @Content(schema = @Schema(implementation = ErrorResponse.class))
+        ),
+        @ApiResponse(
+            responseCode = "500",
+            description = "외부 API 요청 실패",
+            content = @Content(schema = @Schema(implementation = ErrorResponse.class))
         )
     })
     ResponseEntity<ApiSpec<String>> openTreasureCapsule(
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/data/dto/OpenTreasureCapsuleDto.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/data/dto/OpenTreasureCapsuleDto.java
deleted file mode 100644
index c760767cb..000000000
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/data/dto/OpenTreasureCapsuleDto.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package site.timecapsulearchive.core.domain.capsule.treasure_capsule.data.dto;
-
-public record OpenTreasureCapsuleDto(
-
-) {
-
-}
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/data/request/OpenTreasureCapsuleRequest.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/data/request/OpenTreasureCapsuleRequest.java
deleted file mode 100644
index 5e8b238ec..000000000
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/data/request/OpenTreasureCapsuleRequest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package site.timecapsulearchive.core.domain.capsule.treasure_capsule.data.request;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@Schema(name = "오픈할 보물 캡슐 요청 포맷")
-public record OpenTreasureCapsuleRequest(
-
-    @Schema(name = "보물 캡슐 아이디")
-    Long treasureCapsuleId,
-
-    @Schema(name = "보물 캡슐 스킨 Gif")
-    String treasureCapsuleSkinGif
-
-) {
-
-}
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/service/TreasureCapsuleService.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/service/TreasureCapsuleService.java
index 11792cc49..2a799a79e 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/service/TreasureCapsuleService.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/service/TreasureCapsuleService.java
@@ -30,9 +30,9 @@ public void openTreasureCapsule(final Long memberId, final Long capsuleId, final
         final Member member = memberRepository.findMemberById(memberId).orElseThrow(
             MemberNotFoundException::new);
 
-        String treasureUrl = transactionTemplate.execute(status -> {
-            // capsuleId로 image 엔티티의 imageUrl을 가져온 후 삭제
-            final Image treasureImage = imageRepository.findById(imageId)
+        String treasureImageUrl = transactionTemplate.execute(status -> {
+            // imageId로 image 엔티티의 imageUrl을 가져온 후 삭제
+            final String imageUrl = imageRepository.findImageUrl(imageId)
                 .orElseThrow(CapsuleNotFondException::new);
             imageRepository.deleteImage(imageId);
 
@@ -46,14 +46,14 @@ public void openTreasureCapsule(final Long memberId, final Long capsuleId, final
 
             // caspuleSkin 저장
             final CapsuleSkin myTreasureCapsuleSkin = CapsuleSkin.captureTreasureCapsuleSkin(
-                treasureImage.getImageUrl(), member);
+                imageUrl, member);
             capsuleSkinRepository.save(myTreasureCapsuleSkin);
 
-            return treasureImage.getImageUrl();
+            return imageUrl;
         });
 
         // 알림 전송
         socialNotificationManager.sendTreasureCaptureMessage(memberId, member.getNickname(),
-            treasureUrl);
+            treasureImageUrl);
     }
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsuleskin/entity/CapsuleSkin.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsuleskin/entity/CapsuleSkin.java
index 05b7cbfd6..b5fe1717e 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsuleskin/entity/CapsuleSkin.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsuleskin/entity/CapsuleSkin.java
@@ -57,13 +57,13 @@ private CapsuleSkin(String skinName, String imageUrl, Motion motionName, Member
         this.retarget = retarget;
     }
 
-    private CapsuleSkin(String imageUrl, Member member) {
-        this.skinName = "보물 캡슐에서 얻은 스킨";
+    private CapsuleSkin(String skinName, String imageUrl, Member member) {
+        this.skinName =
         this.imageUrl = imageUrl;
         this.member = member;
     }
 
     public static CapsuleSkin captureTreasureCapsuleSkin(String imageUrl, Member member) {
-        return new CapsuleSkin(imageUrl, member);
+        return new CapsuleSkin("보물 캡슐에서 얻은 스킨", imageUrl, member);
     }
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/data/dto/TreasureCaptureNotificationDto.java b/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/data/dto/TreasureCaptureNotificationDto.java
index b5ff9865f..80d894d04 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/data/dto/TreasureCaptureNotificationDto.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/data/dto/TreasureCaptureNotificationDto.java
@@ -7,7 +7,7 @@
 public record TreasureCaptureNotificationDto(
 
     Long targetId,
-    String treasureUrl,
+    String treasureImageUrl,
     NotificationStatus notificationStatus,
     String title,
     String text
@@ -19,14 +19,14 @@ public static TreasureCaptureNotificationDto createOf(
         final String memberNickname
 
     ) {
-        final NotificationRequestMessage friendAcceptRequest = NotificationRequestMessage.TREASURE_CAPTURE;
+        final NotificationRequestMessage treasureCaptureRequest = NotificationRequestMessage.TREASURE_CAPTURE;
 
         return new TreasureCaptureNotificationDto(
             targetId,
             treasureUrl,
-            friendAcceptRequest.getStatus(),
-            friendAcceptRequest.getTitle(),
-            friendAcceptRequest.buildPrefixText(memberNickname)
+            treasureCaptureRequest.getStatus(),
+            treasureCaptureRequest.getTitle(),
+            treasureCaptureRequest.buildPrefixText(memberNickname)
         );
     }
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/manager/SocialNotificationManager.java b/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/manager/SocialNotificationManager.java
index be11b9651..c9779e64a 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/manager/SocialNotificationManager.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/manager/SocialNotificationManager.java
@@ -96,9 +96,9 @@ public void sendGroupAcceptMessage(
     public void sendTreasureCaptureMessage(
         final Long targetId,
         final String memberNickname,
-        final String treasureUrl
+        final String treasureImageUrl
     ) {
-        String preSignedUrl = s3PreSignedUrlManager.getS3PreSignedUrlForGet(treasureUrl);
+        String preSignedUrl = s3PreSignedUrlManager.getS3PreSignedUrlForGet(treasureImageUrl);
 
         basicRabbitTemplate.convertAndSend(
             RabbitmqComponentConstants.TREASURE_CAPTURE_NOTIFICATION_EXCHANGE.getSuccessComponent(),

From 1be908ed4144578968e4c4321d7e15034bcfc28b Mon Sep 17 00:00:00 2001
From: GaBaljaintheroom <junsu1222@naver.com>
Date: Tue, 11 Jun 2024 11:51:17 +0900
Subject: [PATCH 4/8] =?UTF-8?q?refact=20:=20=EC=BA=A1=EC=8A=90=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/capsule/CapsuleRepository.java |  6 ++++
 .../image/ImageQueryRepository.java           |  5 ----
 .../image/ImageQueryRepositoryImpl.java       | 19 ------------
 .../api/TreasureCapsuleApi.java               |  5 +---
 .../api/TreasureCapsuleController.java        |  7 ++---
 .../TreasureCapsuleOpenFailedException.java   | 11 -------
 .../TreasureCapsuleQueryRepository.java       | 24 ---------------
 .../service/TreasureCapsuleService.java       | 29 +++++++------------
 .../core/global/error/ErrorCode.java          |  1 -
 9 files changed, 21 insertions(+), 86 deletions(-)
 delete mode 100644 backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/exception/TreasureCapsuleOpenFailedException.java
 delete mode 100644 backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/repository/TreasureCapsuleQueryRepository.java

diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleRepository.java
index c0cb84b1c..158e0dc3d 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleRepository.java
@@ -10,6 +10,7 @@
 public interface CapsuleRepository extends Repository<Capsule, Long>, CapsuleQueryRepository {
 
     Capsule save(Capsule capsule);
+    void delete(Capsule capsule);
 
     @Query("select c from Capsule c where c.id = :capsuleId and c.member.id = :memberId")
     Optional<Capsule> findCapsuleByMemberIdAndCapsuleId(
@@ -17,6 +18,11 @@ Optional<Capsule> findCapsuleByMemberIdAndCapsuleId(
         @Param("capsuleId") Long capsuleId
     );
 
+    @Query("select c from Capsule c join fetch c.images where c.id = :capsuleId")
+    Optional<Capsule> findCapsuleWithImageByCapsuleId(
+        @Param("capsuleId") Long capsuleId
+    );
+
     @Modifying(clearAutomatically = true)
     @Query("UPDATE Capsule c SET c.isOpened = true WHERE c.id = :capsuleId and c.member.id = :memberId")
     int updateIsOpenedTrue(
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java
index a27387298..d24540bd0 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java
@@ -7,9 +7,4 @@
 public interface ImageQueryRepository {
 
     void bulkSave(final List<Image> images);
-
-    Optional<Long> deleteImage(final Long imageId);
-
-    Optional<String> findImageUrl(final Long imageId);
-
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java
index 87b3218f9..aa92d0138 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java
@@ -21,7 +21,6 @@
 public class ImageQueryRepositoryImpl implements ImageQueryRepository {
 
     private final JdbcTemplate jdbcTemplate;
-    private final JPAQueryFactory jpaQueryFactory;
 
     public void bulkSave(final List<Image> images) {
         jdbcTemplate.batchUpdate(
@@ -50,22 +49,4 @@ public int getBatchSize() {
             }
         );
     }
-
-    public Optional<String> findImageUrl(final Long imageId) {
-        return Optional.ofNullable(jpaQueryFactory
-            .select(image.imageUrl)
-            .from(image)
-            .where(image.id.eq(imageId))
-            .fetchOne()
-        );
-    }
-
-    public Optional<Long> deleteImage(final Long imageId) {
-        return Optional.of(jpaQueryFactory
-            .delete(image)
-            .where(image.id.eq(imageId))
-            .execute()
-        );
-    }
-
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleApi.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleApi.java
index 7d00ecd03..ed04aa22c 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleApi.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleApi.java
@@ -40,10 +40,7 @@ ResponseEntity<ApiSpec<String>> openTreasureCapsule(
         Long memberId,
 
         @Parameter(in = ParameterIn.PATH, description = "개봉할 보물 캡슐 아이디", required = true)
-        Long capsuleId,
-
-        @Parameter(in = ParameterIn.PATH, description = "보물 url 저장한 이미지 아이디", required = true)
-        Long imageId
+        Long capsuleId
     );
 
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleController.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleController.java
index 66a2bf68a..dfe196a12 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleController.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/api/TreasureCapsuleController.java
@@ -19,13 +19,12 @@ public class TreasureCapsuleController implements TreasureCapsuleApi {
     private final TreasureCapsuleService treasureCapsuleService;
 
     @Override
-    @PostMapping("/{capsule_id}/image/{image_id}/open")
+    @PostMapping("/{capsule_id}/open")
     public ResponseEntity<ApiSpec<String>> openTreasureCapsule(
         @AuthenticationPrincipal final Long memberId,
-        @PathVariable(value = "capsule_id") final Long capsuleId,
-        @PathVariable(value = "image_id") final Long imageId
+        @PathVariable(value = "capsule_id") final Long capsuleId
     ) {
-        treasureCapsuleService.openTreasureCapsule(memberId, capsuleId, imageId);
+        treasureCapsuleService.openTreasureCapsule(memberId, capsuleId);
 
         return ResponseEntity.ok(
             ApiSpec.empty(
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/exception/TreasureCapsuleOpenFailedException.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/exception/TreasureCapsuleOpenFailedException.java
deleted file mode 100644
index 1c24dd45a..000000000
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/exception/TreasureCapsuleOpenFailedException.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package site.timecapsulearchive.core.domain.capsule.treasure_capsule.exception;
-
-import site.timecapsulearchive.core.global.error.ErrorCode;
-import site.timecapsulearchive.core.global.error.exception.BusinessException;
-
-public class TreasureCapsuleOpenFailedException extends BusinessException {
-
-    public TreasureCapsuleOpenFailedException() {
-        super(ErrorCode.TREASURE_CAPSULE_OPEN_FAILED_ERROR);
-    }
-}
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/repository/TreasureCapsuleQueryRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/repository/TreasureCapsuleQueryRepository.java
deleted file mode 100644
index 3da5d369e..000000000
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/repository/TreasureCapsuleQueryRepository.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package site.timecapsulearchive.core.domain.capsule.treasure_capsule.repository;
-
-import static site.timecapsulearchive.core.domain.capsule.entity.QCapsule.capsule;
-
-import com.querydsl.jpa.impl.JPAQueryFactory;
-import java.util.Optional;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Repository;
-
-@Repository
-@RequiredArgsConstructor
-public class TreasureCapsuleQueryRepository {
-
-    private final JPAQueryFactory jpaQueryFactory;
-
-    public Optional<Long> deleteTreasureCapsule(final Long capsuleId) {
-        return Optional.of(jpaQueryFactory
-            .delete(capsule)
-            .where(capsule.id.eq(capsuleId))
-            .execute()
-        );
-    }
-
-}
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/service/TreasureCapsuleService.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/service/TreasureCapsuleService.java
index 2a799a79e..f0426bdfe 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/service/TreasureCapsuleService.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/treasure_capsule/service/TreasureCapsuleService.java
@@ -3,11 +3,10 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.support.TransactionTemplate;
+import site.timecapsulearchive.core.domain.capsule.entity.Capsule;
 import site.timecapsulearchive.core.domain.capsule.entity.Image;
 import site.timecapsulearchive.core.domain.capsule.exception.CapsuleNotFondException;
-import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.image.ImageRepository;
-import site.timecapsulearchive.core.domain.capsule.treasure_capsule.exception.TreasureCapsuleOpenFailedException;
-import site.timecapsulearchive.core.domain.capsule.treasure_capsule.repository.TreasureCapsuleQueryRepository;
+import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.capsule.CapsuleRepository;
 import site.timecapsulearchive.core.domain.capsuleskin.entity.CapsuleSkin;
 import site.timecapsulearchive.core.domain.capsuleskin.repository.CapsuleSkinRepository;
 import site.timecapsulearchive.core.domain.member.entity.Member;
@@ -19,30 +18,24 @@
 @RequiredArgsConstructor
 public class TreasureCapsuleService {
 
-    private final TreasureCapsuleQueryRepository treasureCapsuleQueryRepository;
-    private final ImageRepository imageRepository;
     private final MemberRepository memberRepository;
+    private final CapsuleRepository capsuleRepository;
     private final CapsuleSkinRepository capsuleSkinRepository;
     private final SocialNotificationManager socialNotificationManager;
     private final TransactionTemplate transactionTemplate;
 
-    public void openTreasureCapsule(final Long memberId, final Long capsuleId, final Long imageId) {
+    public void openTreasureCapsule(final Long memberId, final Long capsuleId) {
         final Member member = memberRepository.findMemberById(memberId).orElseThrow(
             MemberNotFoundException::new);
 
         String treasureImageUrl = transactionTemplate.execute(status -> {
-            // imageId로 image 엔티티의 imageUrl을 가져온 후 삭제
-            final String imageUrl = imageRepository.findImageUrl(imageId)
-                .orElseThrow(CapsuleNotFondException::new);
-            imageRepository.deleteImage(imageId);
-
-            // 보물 캡슐 삭제
-            final Long deleteTreasureCapsule = treasureCapsuleQueryRepository.deleteTreasureCapsule(
-                capsuleId).orElseThrow(
-                CapsuleNotFondException::new);
-            if (deleteTreasureCapsule != 1) {
-                throw new TreasureCapsuleOpenFailedException();
-            }
+            // 이미지와 함께 캡슐 조회
+            final Capsule treasureCapsule = capsuleRepository.findCapsuleWithImageByCapsuleId(
+                capsuleId).orElseThrow(CapsuleNotFondException::new);
+
+            final Image image = treasureCapsule.getImages().get(0);
+            final String imageUrl = image.getImageUrl();
+            capsuleRepository.delete(treasureCapsule);
 
             // caspuleSkin 저장
             final CapsuleSkin myTreasureCapsuleSkin = CapsuleSkin.captureTreasureCapsuleSkin(
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/global/error/ErrorCode.java b/backend/core/src/main/java/site/timecapsulearchive/core/global/error/ErrorCode.java
index 85389c990..d753a1419 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/global/error/ErrorCode.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/global/error/ErrorCode.java
@@ -58,7 +58,6 @@ public enum ErrorCode {
     NO_CAPSULE_AUTHORITY_ERROR(403, "CAPSULE-002", "캡슐에 접근 권한이 없습니다."),
     GROUP_CAPSULE_OPEN_NOT_FOUND_ERROR(404, "CAPSULE-003", "그룹 캡슐 개봉상태를 찾을 수 없습니다."),
     CAPSULE_OPEN_STATE_ERROR(400, "CAPSULE-004", "캡슐을 개봉할 수 없는 상태입니다."),
-    TREASURE_CAPSULE_OPEN_FAILED_ERROR(500, "CAPSULE-005", "보물 캡슐을 개봉에 실패하엿습니다."),
 
     //friend
     FRIEND_NOT_FOUND_ERROR(404, "FRIEND-001", "친구를 찾지 못하였습니다"),

From 569c8523718cc0f3a38e13b69ada963f26bad6df Mon Sep 17 00:00:00 2001
From: GaBaljaintheroom <junsu1222@naver.com>
Date: Tue, 11 Jun 2024 11:51:59 +0900
Subject: [PATCH 5/8] =?UTF-8?q?refact=20:=20=EC=9E=90=EB=B0=94=20=EA=B5=AC?=
 =?UTF-8?q?=EA=B8=80=20=ED=98=95=EC=8B=9D=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/domain/capsule/entity/Capsule.java          |  7 +++----
 .../repository/capsule/CapsuleQueryRepository.java   |  1 +
 .../repository/capsule/CapsuleRepository.java        |  1 +
 .../repository/image/ImageQueryRepository.java       |  1 -
 .../repository/image/ImageQueryRepositoryImpl.java   |  4 ----
 .../repository/image/ImageRepository.java            |  1 -
 .../repository/video/VideoQueryRepository.java       |  1 -
 .../group_capsule/service/GroupCapsuleService.java   |  5 +++--
 .../core/domain/capsuleskin/entity/CapsuleSkin.java  |  2 +-
 .../core/domain/friend/entity/FriendInvite.java      |  1 -
 .../friend_invite/FriendInviteRepository.java        | 12 ++++++------
 .../group/data/dto/GroupMemberWithRelationDto.java   |  1 -
 .../core/domain/member_group/entity/GroupInvite.java |  1 -
 .../GroupInviteQueryRepositoryImpl.java              |  2 --
 .../service/MemberGroupQueryService.java             |  2 +-
 .../core/global/error/GlobalExceptionHandler.java    |  3 ++-
 .../queue/manager/SocialNotificationManager.java     |  1 +
 17 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/entity/Capsule.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/entity/Capsule.java
index 833fc102e..7c11fdcd7 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/entity/Capsule.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/entity/Capsule.java
@@ -14,7 +14,6 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
-import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -64,13 +63,13 @@ public class Capsule extends BaseEntity {
     private Address address;
 
     @OneToMany(mappedBy = "capsule", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<Image> images = new ArrayList<>();
+    private final List<Image> images = new ArrayList<>();
 
     @OneToMany(mappedBy = "capsule", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<Video> videos = new ArrayList<>();
+    private final List<Video> videos = new ArrayList<>();
 
     @OneToMany(mappedBy = "capsule", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<GroupCapsuleOpen> groupCapsuleOpens = new ArrayList<>();
+    private final List<GroupCapsuleOpen> groupCapsuleOpens = new ArrayList<>();
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "group_id")
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleQueryRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleQueryRepository.java
index 5b82ab35e..34f4a50e7 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleQueryRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleQueryRepository.java
@@ -7,6 +7,7 @@
 import site.timecapsulearchive.core.domain.capsule.generic_capsule.data.dto.NearbyCapsuleSummaryDto;
 
 public interface CapsuleQueryRepository {
+
     List<NearbyARCapsuleSummaryDto> findARCapsuleSummaryDtosByCurrentLocationAndCapsuleType(
         final Long memberId,
         final Polygon mbr,
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleRepository.java
index 158e0dc3d..f992fc3f2 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/capsule/CapsuleRepository.java
@@ -10,6 +10,7 @@
 public interface CapsuleRepository extends Repository<Capsule, Long>, CapsuleQueryRepository {
 
     Capsule save(Capsule capsule);
+
     void delete(Capsule capsule);
 
     @Query("select c from Capsule c where c.id = :capsuleId and c.member.id = :memberId")
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java
index d24540bd0..4db15a1da 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepository.java
@@ -1,7 +1,6 @@
 package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.image;
 
 import java.util.List;
-import java.util.Optional;
 import site.timecapsulearchive.core.domain.capsule.entity.Image;
 
 public interface ImageQueryRepository {
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java
index aa92d0138..ccd86258d 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageQueryRepositoryImpl.java
@@ -1,15 +1,11 @@
 package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.image;
 
-import static site.timecapsulearchive.core.domain.capsule.entity.QImage.image;
-
-import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.ZonedDateTime;
 import java.util.List;
-import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageRepository.java
index 9a3863f92..f83a05c4c 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/image/ImageRepository.java
@@ -1,6 +1,5 @@
 package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.image;
 
-import java.util.Optional;
 import org.springframework.data.repository.Repository;
 import site.timecapsulearchive.core.domain.capsule.entity.Image;
 
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/video/VideoQueryRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/video/VideoQueryRepository.java
index 8acfe6026..b888da628 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/video/VideoQueryRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/generic_capsule/repository/video/VideoQueryRepository.java
@@ -1,7 +1,6 @@
 package site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.video;
 
 import java.util.List;
-import org.springframework.data.repository.Repository;
 import site.timecapsulearchive.core.domain.capsule.entity.Video;
 
 public interface VideoQueryRepository {
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleService.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleService.java
index 86196ada7..8a4758cb0 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleService.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleService.java
@@ -13,9 +13,9 @@
 import site.timecapsulearchive.core.domain.capsule.generic_capsule.repository.capsule.CapsuleRepository;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleCreateRequestDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleDetailDto;
+import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleOpenStateDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleSummaryDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.MyGroupCapsuleDto;
-import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleOpenStateDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.repository.GroupCapsuleQueryRepository;
 import site.timecapsulearchive.core.domain.capsuleskin.entity.CapsuleSkin;
 import site.timecapsulearchive.core.domain.group.entity.Group;
@@ -98,7 +98,8 @@ public Slice<MyGroupCapsuleDto> findMyGroupCapsuleSlice(
      */
     @Transactional
     public GroupCapsuleOpenStateDto openGroupCapsule(final Long memberId, final Long capsuleId) {
-        Capsule groupCapsule = capsuleRepository.findNotOpenedGroupCapsuleByMemberIdAndCapsuleId(memberId,
+        Capsule groupCapsule = capsuleRepository.findNotOpenedGroupCapsuleByMemberIdAndCapsuleId(
+                memberId,
                 capsuleId)
             .orElseThrow(CapsuleNotFondException::new);
 
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsuleskin/entity/CapsuleSkin.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsuleskin/entity/CapsuleSkin.java
index b5fe1717e..e924d45ad 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsuleskin/entity/CapsuleSkin.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsuleskin/entity/CapsuleSkin.java
@@ -59,7 +59,7 @@ private CapsuleSkin(String skinName, String imageUrl, Motion motionName, Member
 
     private CapsuleSkin(String skinName, String imageUrl, Member member) {
         this.skinName =
-        this.imageUrl = imageUrl;
+            this.imageUrl = imageUrl;
         this.member = member;
     }
 
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/friend/entity/FriendInvite.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/friend/entity/FriendInvite.java
index e1247de04..9a2ce2f19 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/friend/entity/FriendInvite.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/friend/entity/FriendInvite.java
@@ -1,6 +1,5 @@
 package site.timecapsulearchive.core.domain.friend.entity;
 
-import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/friend/repository/friend_invite/FriendInviteRepository.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/friend/repository/friend_invite/FriendInviteRepository.java
index bc9340551..7922251b9 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/friend/repository/friend_invite/FriendInviteRepository.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/friend/repository/friend_invite/FriendInviteRepository.java
@@ -17,12 +17,12 @@ Optional<FriendInvite> findFriendSendingInviteForUpdateByOwnerIdAndFriendId(Long
         Long friendId);
 
     @Query(value = """
-    select fi
-    from FriendInvite fi
-    join fetch fi.owner
-    join fetch fi.friend
-    where fi.owner.id =:ownerId and fi.friend.id =:friendId
-    """)
+        select fi
+        from FriendInvite fi
+        join fetch fi.owner
+        join fetch fi.friend
+        where fi.owner.id =:ownerId and fi.friend.id =:friendId
+        """)
     Optional<FriendInvite> findFriendReceivingInviteForUpdateByOwnerIdAndFriendId(
         @Param(value = "ownerId") Long ownerId,
         @Param(value = "friendId") Long friendId
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/group/data/dto/GroupMemberWithRelationDto.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/group/data/dto/GroupMemberWithRelationDto.java
index 0469152c2..1c8ce2fd8 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/group/data/dto/GroupMemberWithRelationDto.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/group/data/dto/GroupMemberWithRelationDto.java
@@ -1,6 +1,5 @@
 package site.timecapsulearchive.core.domain.group.data.dto;
 
-import java.util.function.Function;
 import lombok.Builder;
 import site.timecapsulearchive.core.domain.group.data.response.GroupMemberWithRelationResponse;
 
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/entity/GroupInvite.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/entity/GroupInvite.java
index 95473cef4..a3df4837e 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/entity/GroupInvite.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/entity/GroupInvite.java
@@ -14,7 +14,6 @@
 import lombok.NoArgsConstructor;
 import site.timecapsulearchive.core.domain.group.entity.Group;
 import site.timecapsulearchive.core.domain.member.entity.Member;
-import site.timecapsulearchive.core.domain.member_group.exception.NoGroupAuthorityException;
 import site.timecapsulearchive.core.global.entity.BaseEntity;
 
 @Entity
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/repository/group_invite_repository/GroupInviteQueryRepositoryImpl.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/repository/group_invite_repository/GroupInviteQueryRepositoryImpl.java
index be6975dfd..ba46a04bb 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/repository/group_invite_repository/GroupInviteQueryRepositoryImpl.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/repository/group_invite_repository/GroupInviteQueryRepositoryImpl.java
@@ -7,7 +7,6 @@
 
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
-import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -23,7 +22,6 @@
 import site.timecapsulearchive.core.domain.member_group.data.dto.GroupInviteSummaryDto;
 import site.timecapsulearchive.core.domain.member_group.data.dto.GroupSendingInviteMemberDto;
 import site.timecapsulearchive.core.domain.member_group.data.dto.GroupSendingInvitesSliceRequestDto;
-import site.timecapsulearchive.core.domain.member_group.data.dto.GroupSendingInvitesSliceRequestDto;
 import site.timecapsulearchive.core.global.util.SliceUtil;
 
 @Repository
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/service/MemberGroupQueryService.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/service/MemberGroupQueryService.java
index bd9f1c113..711d3c5d8 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/service/MemberGroupQueryService.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/member_group/service/MemberGroupQueryService.java
@@ -43,7 +43,7 @@ public List<GroupMemberDto> findGroupMemberInfos(
     }
 
     public Slice<GroupSendingInviteMemberDto> findGroupSendingInvites(final
-        GroupSendingInvitesSliceRequestDto dto) {
+    GroupSendingInvitesSliceRequestDto dto) {
         return groupInviteRepository.findGroupSendingInvites(dto);
     }
 }
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/global/error/GlobalExceptionHandler.java b/backend/core/src/main/java/site/timecapsulearchive/core/global/error/GlobalExceptionHandler.java
index d45f86f38..0e11edbd6 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/global/error/GlobalExceptionHandler.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/global/error/GlobalExceptionHandler.java
@@ -49,7 +49,8 @@ protected ResponseEntity<ErrorResponse> handleBusinessException(final BusinessEx
     }
 
     @ExceptionHandler(InternalServerException.class)
-    protected ResponseEntity<ErrorResponse> handleInternalServerException(final InternalServerException e) {
+    protected ResponseEntity<ErrorResponse> handleInternalServerException(
+        final InternalServerException e) {
         log.error(e.getMessage(), e);
 
         ErrorCode errorCode = INTERNAL_SERVER_ERROR;
diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/manager/SocialNotificationManager.java b/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/manager/SocialNotificationManager.java
index c9779e64a..cfe9d436a 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/manager/SocialNotificationManager.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/manager/SocialNotificationManager.java
@@ -93,6 +93,7 @@ public void sendGroupAcceptMessage(
             GroupAcceptNotificationDto.createOf(targetId, groupMemberNickname)
         );
     }
+
     public void sendTreasureCaptureMessage(
         final Long targetId,
         final String memberNickname,

From c736b4446e37d40ddf49c567157a185215a788f8 Mon Sep 17 00:00:00 2001
From: GaBaljaintheroom <junsu1222@naver.com>
Date: Tue, 11 Jun 2024 12:00:34 +0900
Subject: [PATCH 6/8] =?UTF-8?q?chore=20:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../capsule/media/repository/MediaQueryRepositoryTest.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/media/repository/MediaQueryRepositoryTest.java b/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/media/repository/MediaQueryRepositoryTest.java
index 1dad0c849..71deb5ce9 100644
--- a/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/media/repository/MediaQueryRepositoryTest.java
+++ b/backend/core/src/test/java/site/timecapsulearchive/core/domain/capsule/media/repository/MediaQueryRepositoryTest.java
@@ -44,11 +44,10 @@ class MediaQueryRepositoryTest extends RepositoryTest {
 
     public MediaQueryRepositoryTest(
         JdbcTemplate jdbcTemplate,
-        DataSource dataSource,
-        JPAQueryFactory jpaQueryFactory
+        DataSource dataSource
     ) {
         this.jdbcTemplate = new JdbcTemplate(dataSource);
-        this.imageQueryRepository = new ImageQueryRepositoryImpl(jdbcTemplate, jpaQueryFactory);
+        this.imageQueryRepository = new ImageQueryRepositoryImpl(jdbcTemplate);
         this.videoQueryRepository = new VideoQueryRepositoryImpl(jdbcTemplate);
     }
 

From 8e15372ec932569693a4e8946df50d25eac3bbab Mon Sep 17 00:00:00 2001
From: GaBaljaintheroom <junsu1222@naver.com>
Date: Tue, 11 Jun 2024 12:06:33 +0900
Subject: [PATCH 7/8] =?UTF-8?q?chore=20:=20=EB=A8=B8=EC=A7=80=20=EC=B6=A9?=
 =?UTF-8?q?=EB=8F=8C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../capsule/group_capsule/service/GroupCapsuleService.java      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleService.java b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleService.java
index 9370b681c..cbcfb1146 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleService.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/domain/capsule/group_capsule/service/GroupCapsuleService.java
@@ -16,8 +16,6 @@
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleDetailDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleOpenStateDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleSummaryDto;
-import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.MyGroupCapsuleDto;
-import site.timecapsulearchive.core.domain.capsule.group_capsule.data.dto.GroupCapsuleOpenStateDto;
 import site.timecapsulearchive.core.domain.capsule.group_capsule.repository.GroupCapsuleQueryRepository;
 import site.timecapsulearchive.core.domain.capsuleskin.entity.CapsuleSkin;
 import site.timecapsulearchive.core.domain.group.entity.Group;

From b60d23f0a5e93c47ef29e2ebdbd2426a4810995d Mon Sep 17 00:00:00 2001
From: GaBaljaintheroom <junsu1222@naver.com>
Date: Wed, 12 Jun 2024 01:48:47 +0900
Subject: [PATCH 8/8] =?UTF-8?q?fix=20:=20=EB=B3=80=EC=88=98=EB=AA=85=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infra/queue/data/dto/TreasureCaptureNotificationDto.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/data/dto/TreasureCaptureNotificationDto.java b/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/data/dto/TreasureCaptureNotificationDto.java
index 80d894d04..35af663b6 100644
--- a/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/data/dto/TreasureCaptureNotificationDto.java
+++ b/backend/core/src/main/java/site/timecapsulearchive/core/infra/queue/data/dto/TreasureCaptureNotificationDto.java
@@ -15,7 +15,7 @@ public record TreasureCaptureNotificationDto(
 
     public static TreasureCaptureNotificationDto createOf(
         final Long targetId,
-        final String treasureUrl,
+        final String treasureImageUrl,
         final String memberNickname
 
     ) {
@@ -23,7 +23,7 @@ public static TreasureCaptureNotificationDto createOf(
 
         return new TreasureCaptureNotificationDto(
             targetId,
-            treasureUrl,
+            treasureImageUrl,
             treasureCaptureRequest.getStatus(),
             treasureCaptureRequest.getTitle(),
             treasureCaptureRequest.buildPrefixText(memberNickname)