feat: 임시 앨범 삭제 기능 구현

cherrypic-api/src/main/java/org/cherrypic/domain/album/event/AlbumDeleteNotificationSendEvent.java → cherrypic-api/src/main/java/org/cherrypic/domain/album/dto/event/AlbumDeleteNotificationSendEvent.java

@@ -1,4 +1,4 @@
-package org.cherrypic.domain.album.event;
+package org.cherrypic.domain.album.dto.event;
 
 import java.util.List;
 

cherrypic-api/src/main/java/org/cherrypic/domain/album/event/AlbumImagesDeleteEvent.java → cherrypic-api/src/main/java/org/cherrypic/domain/album/dto/event/AlbumImagesDeleteEvent.java

@@ -1,4 +1,4 @@
-package org.cherrypic.domain.album.event;
+package org.cherrypic.domain.album.dto.event;
 
 public record AlbumImagesDeleteEvent(Long albumId) {
     public static AlbumImagesDeleteEvent of(Long albumId) {

cherrypic-api/src/main/java/org/cherrypic/domain/album/service/AlbumServiceImpl.java

@@ -7,19 +7,19 @@
 import org.cherrypic.album.entity.Album;
 import org.cherrypic.album.entity.InvitationCode;
 import org.cherrypic.album.enums.AlbumType;
+import org.cherrypic.domain.album.dto.event.AlbumDeleteNotificationSendEvent;
+import org.cherrypic.domain.album.dto.event.AlbumImagesDeleteEvent;
 import org.cherrypic.domain.album.dto.request.AlbumCreateRequest;
 import org.cherrypic.domain.album.dto.request.AlbumUpdateRequest;
 import org.cherrypic.domain.album.dto.response.*;
-import org.cherrypic.domain.album.event.AlbumDeleteNotificationSendEvent;
-import org.cherrypic.domain.album.event.AlbumImagesDeleteEvent;
 import org.cherrypic.domain.album.exception.AlbumErrorCode;
 import org.cherrypic.domain.album.repository.AlbumRepository;
 import org.cherrypic.domain.album.repository.InvitationCodeRepository;
 import org.cherrypic.domain.event.repository.EventImageRepository;
 import org.cherrypic.domain.event.repository.EventRepository;
 import org.cherrypic.domain.favorites.repository.FavoritesRepository;
-import org.cherrypic.domain.image.event.ImageDeleteEvent;
-import org.cherrypic.domain.image.event.ImagesDeleteEvent;
+import org.cherrypic.domain.image.dto.event.ImageDeleteEvent;
+import org.cherrypic.domain.image.dto.event.ImagesDeleteEvent;
 import org.cherrypic.domain.image.repository.ImageRepository;
 import org.cherrypic.domain.notification.repository.NotificationRepository;
 import org.cherrypic.domain.participant.repository.ParticipantRepository;

cherrypic-api/src/main/java/org/cherrypic/domain/event/service/EventServiceImpl.java

@@ -17,7 +17,7 @@
 import org.cherrypic.domain.event.exception.EventErrorCode;
 import org.cherrypic.domain.event.repository.EventImageRepository;
 import org.cherrypic.domain.event.repository.EventRepository;
-import org.cherrypic.domain.image.event.ImageDeleteEvent;
+import org.cherrypic.domain.image.dto.event.ImageDeleteEvent;
 import org.cherrypic.domain.image.exception.ImageErrorCode;
 import org.cherrypic.domain.image.repository.ImageRepository;
 import org.cherrypic.domain.participant.repository.ParticipantRepository;

cherrypic-api/src/main/java/org/cherrypic/domain/image/event/ImageDeleteEvent.java → cherrypic-api/src/main/java/org/cherrypic/domain/image/dto/event/ImageDeleteEvent.java

@@ -1,4 +1,4 @@
-package org.cherrypic.domain.image.event;
+package org.cherrypic.domain.image.dto.event;
 
 public record ImageDeleteEvent(String imageUrl) {
     public static ImageDeleteEvent of(String imageUrl) {

cherrypic-api/src/main/java/org/cherrypic/domain/image/event/ImagesDeleteEvent.java → cherrypic-api/src/main/java/org/cherrypic/domain/image/dto/event/ImagesDeleteEvent.java

@@ -1,4 +1,4 @@
-package org.cherrypic.domain.image.event;
+package org.cherrypic.domain.image.dto.event;
 
 import java.util.List;
 

cherrypic-api/src/main/java/org/cherrypic/domain/image/event/ImageEventListener.java

@@ -1,7 +1,9 @@
 package org.cherrypic.domain.image.event;
 
 import lombok.RequiredArgsConstructor;
-import org.cherrypic.domain.album.event.AlbumImagesDeleteEvent;
+import org.cherrypic.domain.album.dto.event.AlbumImagesDeleteEvent;
+import org.cherrypic.domain.image.dto.event.ImageDeleteEvent;
+import org.cherrypic.domain.image.dto.event.ImagesDeleteEvent;
 import org.cherrypic.s3.S3Util;
 import org.cherrypic.s3.enums.ImageType;
 import org.springframework.scheduling.annotation.Async;

cherrypic-api/src/main/java/org/cherrypic/domain/image/service/ImageServiceImpl.java

@@ -12,15 +12,15 @@
 import org.cherrypic.domain.event.exception.EventErrorCode;
 import org.cherrypic.domain.event.repository.EventImageRepository;
 import org.cherrypic.domain.event.repository.EventRepository;
+import org.cherrypic.domain.image.dto.event.ImagesDeleteEvent;
 import org.cherrypic.domain.image.dto.request.*;
 import org.cherrypic.domain.image.dto.response.*;
-import org.cherrypic.domain.image.event.ImagesDeleteEvent;
 import org.cherrypic.domain.image.exception.ImageErrorCode;
 import org.cherrypic.domain.image.repository.ImageRepository;
 import org.cherrypic.domain.participant.repository.ParticipantRepository;
 import org.cherrypic.domain.subscription.exception.SubscriptionErrorCode;
 import org.cherrypic.domain.subscription.repository.SubscriptionRepository;
-import org.cherrypic.domain.tempalbum.event.TempAlbumImagesDeleteEvent;
+import org.cherrypic.domain.tempalbum.dto.event.TempAlbumImagesDeleteEvent;
 import org.cherrypic.domain.tempalbum.exception.TempAlbumErrorCode;
 import org.cherrypic.domain.tempalbum.repository.TempAlbumImageRepository;
 import org.cherrypic.domain.tempalbum.repository.TempAlbumRepository;

cherrypic-api/src/main/java/org/cherrypic/domain/member/service/MemberServiceImpl.java

@@ -1,7 +1,7 @@
 package org.cherrypic.domain.member.service;
 
 import lombok.RequiredArgsConstructor;
-import org.cherrypic.domain.image.event.ImageDeleteEvent;
+import org.cherrypic.domain.image.dto.event.ImageDeleteEvent;
 import org.cherrypic.domain.member.dto.request.FcmTokenSaveRequest;
 import org.cherrypic.domain.member.dto.request.MemberProfileUpdateRequest;
 import org.cherrypic.domain.member.dto.response.LocalImageDeletionToggleResponse;

cherrypic-api/src/main/java/org/cherrypic/domain/notification/event/NotificationEventListener.java

@@ -1,7 +1,7 @@
 package org.cherrypic.domain.notification.event;
 
 import lombok.RequiredArgsConstructor;
-import org.cherrypic.domain.album.event.AlbumDeleteNotificationSendEvent;
+import org.cherrypic.domain.album.dto.event.AlbumDeleteNotificationSendEvent;
 import org.cherrypic.domain.notification.service.NotificationService;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;

cherrypic-api/src/main/java/org/cherrypic/domain/tempalbum/controller/TempAlbumController.java

@@ -49,4 +49,11 @@ public ResponseEntity<Void> tempAlbumUpdate(
         tempAlbumService.updateTempAlbum(tempAlbumId, request);
         return ResponseEntity.noContent().build();
     }
+
+    @DeleteMapping("/{tempAlbumId}")
+    @Operation(summary = "임시 앨범 삭제", description = "임시 앨범을 삭제합니다.")
+    public ResponseEntity<Void> tempAlbumDelete(@PathVariable Long tempAlbumId) {
+        tempAlbumService.deleteTempAlbum(tempAlbumId);
+        return ResponseEntity.noContent().build();
+    }
 }

cherrypic-api/src/main/java/org/cherrypic/domain/tempalbum/dto/event/TempAlbumDeleteEvent.java

@@ -0,0 +1,9 @@
+package org.cherrypic.domain.tempalbum.dto.event;
+
+import org.cherrypic.tempalbum.entity.TempAlbum;
+
+public record TempAlbumDeleteEvent(Long tempAlbumId) {
+    public static TempAlbumDeleteEvent of(TempAlbum tempAlbum) {
+        return new TempAlbumDeleteEvent(tempAlbum.getId());
+    }
+}

cherrypic-api/src/main/java/org/cherrypic/domain/tempalbum/event/TempAlbumImagesDeleteEvent.java → cherrypic-api/src/main/java/org/cherrypic/domain/tempalbum/dto/event/TempAlbumImagesDeleteEvent.java

@@ -1,4 +1,4 @@
-package org.cherrypic.domain.tempalbum.event;
+package org.cherrypic.domain.tempalbum.dto.event;
 
 import java.util.List;
 

cherrypic-api/src/main/java/org/cherrypic/domain/tempalbum/event/TempAlbumEventListener.java

@@ -1,7 +1,10 @@
 package org.cherrypic.domain.tempalbum.event;
 
 import lombok.RequiredArgsConstructor;
+import org.cherrypic.domain.tempalbum.dto.event.TempAlbumDeleteEvent;
+import org.cherrypic.domain.tempalbum.dto.event.TempAlbumImagesDeleteEvent;
 import org.cherrypic.s3.S3Util;
+import org.cherrypic.s3.enums.ImageType;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.event.TransactionPhase;
@@ -18,4 +21,10 @@ public class TempAlbumEventListener {
     public void handleTempAlbumImagesDeleteEvent(TempAlbumImagesDeleteEvent event) {
         s3Util.deleteAllByUrls(event.tempImageUrls());
     }
+
+    @Async
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    public void handleTempAlbumDeleteEvent(TempAlbumDeleteEvent event) {
+        s3Util.deleteAllByImageTypeAndTargetId(ImageType.TEMP_ALBUM_IMAGE, event.tempAlbumId());
+    }
 }

cherrypic-api/src/main/java/org/cherrypic/domain/tempalbum/repository/TempAlbumImageRepository.java

@@ -2,5 +2,12 @@
 
 import org.cherrypic.tempalbum.entity.TempAlbumImage;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
-public interface TempAlbumImageRepository extends JpaRepository<TempAlbumImage, Long> {}
+public interface TempAlbumImageRepository extends JpaRepository<TempAlbumImage, Long> {
+
+    @Modifying(clearAutomatically = true)
+    @Query("delete from TempAlbumImage i where i.tempAlbum.id = :tempAlbumId")
+    void deleteAllByTempAlbumId(Long tempAlbumId);
+}

cherrypic-api/src/main/java/org/cherrypic/domain/tempalbum/repository/TempAlbumRepository.java

@@ -4,12 +4,11 @@
 import org.cherrypic.tempalbum.entity.TempAlbum;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 public interface TempAlbumRepository extends JpaRepository<TempAlbum, Long> {
 
     long countByMemberId(Long memberId);
 
-    @Query("SELECT t FROM TempAlbum t WHERE t.member.id = :memberId ORDER BY t.id DESC")
-    List<TempAlbum> findAllByMemberIdOrderByIdDesc(@Param("memberId") Long memberId);
+    @Query("select t from TempAlbum t where t.member.id = :memberId order by t.id desc")
+    List<TempAlbum> findAllByMemberIdOrderByIdDesc(Long memberId);
 }

cherrypic-api/src/main/java/org/cherrypic/domain/tempalbum/service/TempAlbumService.java

@@ -15,4 +15,6 @@ public interface TempAlbumService {
     void updateTempAlbum(Long tempAlbumId, TempAlbumUpdateRequest request);
 
     TempAlbumInfoResponse getTempAlbum(Long tempAlbumId);
+
+    void deleteTempAlbum(Long tempAlbumId);
 }

cherrypic-api/src/main/java/org/cherrypic/domain/tempalbum/service/TempAlbumServiceImpl.java

@@ -3,17 +3,21 @@
 import java.util.List;
 import java.util.Objects;
 import lombok.RequiredArgsConstructor;
+import org.cherrypic.domain.tempalbum.dto.event.TempAlbumDeleteEvent;
 import org.cherrypic.domain.tempalbum.dto.request.TempAlbumCreateRequest;
 import org.cherrypic.domain.tempalbum.dto.request.TempAlbumUpdateRequest;
 import org.cherrypic.domain.tempalbum.dto.response.TempAlbumCreateResponse;
 import org.cherrypic.domain.tempalbum.dto.response.TempAlbumInfoResponse;
 import org.cherrypic.domain.tempalbum.dto.response.TempAlbumListResponse;
 import org.cherrypic.domain.tempalbum.exception.TempAlbumErrorCode;
+import org.cherrypic.domain.tempalbum.repository.TempAlbumImageRepository;
 import org.cherrypic.domain.tempalbum.repository.TempAlbumRepository;
 import org.cherrypic.exception.CustomException;
 import org.cherrypic.global.util.MemberUtil;
 import org.cherrypic.member.entity.Member;
+import org.cherrypic.s3.S3Util;
 import org.cherrypic.tempalbum.entity.TempAlbum;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -23,8 +27,12 @@
 public class TempAlbumServiceImpl implements TempAlbumService {
 
     private final MemberUtil memberUtil;
+    private final S3Util s3Util;
 
     private final TempAlbumRepository tempAlbumRepository;
+    private final TempAlbumImageRepository tempAlbumImageRepository;
+
+    private final ApplicationEventPublisher eventPublisher;
 
     @Override
     @Transactional
@@ -74,6 +82,19 @@ public TempAlbumInfoResponse getTempAlbum(Long tempAlbumId) {
                 tempAlbum.getWebUrl());
     }
 
+    @Override
+    @Transactional
+    public void deleteTempAlbum(Long tempAlbumId) {
+        final Member currentMember = memberUtil.getCurrentMember();
+        final TempAlbum tempAlbum = getTempAlbumById(tempAlbumId);
+
+        validateTempAlbumOwner(tempAlbum, currentMember.getId());
+
+        eventPublisher.publishEvent(TempAlbumDeleteEvent.of(tempAlbum));
+        tempAlbumImageRepository.deleteAllByTempAlbumId(tempAlbum.getId());
+        tempAlbumRepository.delete(tempAlbum);
+    }
+
     private void validateTempAlbumCreateLimit(Member member) {
         long count = tempAlbumRepository.countByMemberId(member.getId());
         if (count >= 5) {

cherrypic-api/src/test/java/org/cherrypic/album/service/AlbumServiceTest.java

@@ -15,22 +15,22 @@
 import org.cherrypic.album.entity.Album;
 import org.cherrypic.album.entity.InvitationCode;
 import org.cherrypic.album.enums.AlbumType;
+import org.cherrypic.domain.album.dto.event.AlbumDeleteNotificationSendEvent;
+import org.cherrypic.domain.album.dto.event.AlbumImagesDeleteEvent;
 import org.cherrypic.domain.album.dto.request.AlbumCreateRequest;
 import org.cherrypic.domain.album.dto.request.AlbumUpdateRequest;
 import org.cherrypic.domain.album.dto.response.AlbumInfoResponse;
 import org.cherrypic.domain.album.dto.response.AlbumListResponse;
 import org.cherrypic.domain.album.dto.response.InvitationLinkCreateResponse;
-import org.cherrypic.domain.album.event.AlbumDeleteNotificationSendEvent;
-import org.cherrypic.domain.album.event.AlbumImagesDeleteEvent;
 import org.cherrypic.domain.album.exception.AlbumErrorCode;
 import org.cherrypic.domain.album.repository.AlbumRepository;
 import org.cherrypic.domain.album.repository.InvitationCodeRepository;
 import org.cherrypic.domain.album.service.AlbumService;
 import org.cherrypic.domain.event.repository.EventImageRepository;
 import org.cherrypic.domain.event.repository.EventRepository;
 import org.cherrypic.domain.favorites.repository.FavoritesRepository;
-import org.cherrypic.domain.image.event.ImageDeleteEvent;
-import org.cherrypic.domain.image.event.ImagesDeleteEvent;
+import org.cherrypic.domain.image.dto.event.ImageDeleteEvent;
+import org.cherrypic.domain.image.dto.event.ImagesDeleteEvent;
 import org.cherrypic.domain.image.repository.ImageRepository;
 import org.cherrypic.domain.member.repository.MemberRepository;
 import org.cherrypic.domain.notification.repository.NotificationRepository;

cherrypic-api/src/test/java/org/cherrypic/event/service/EventServiceTest.java

@@ -25,7 +25,7 @@
 import org.cherrypic.domain.event.repository.EventImageRepository;
 import org.cherrypic.domain.event.repository.EventRepository;
 import org.cherrypic.domain.event.service.EventService;
-import org.cherrypic.domain.image.event.ImageDeleteEvent;
+import org.cherrypic.domain.image.dto.event.ImageDeleteEvent;
 import org.cherrypic.domain.image.exception.ImageErrorCode;
 import org.cherrypic.domain.image.repository.ImageRepository;
 import org.cherrypic.domain.member.repository.MemberRepository;

cherrypic-api/src/test/java/org/cherrypic/image/service/ImageServiceTest.java

@@ -15,16 +15,16 @@
 import org.cherrypic.domain.event.exception.EventErrorCode;
 import org.cherrypic.domain.event.repository.EventImageRepository;
 import org.cherrypic.domain.event.repository.EventRepository;
+import org.cherrypic.domain.image.dto.event.ImagesDeleteEvent;
 import org.cherrypic.domain.image.dto.request.*;
 import org.cherrypic.domain.image.dto.response.*;
-import org.cherrypic.domain.image.event.ImagesDeleteEvent;
 import org.cherrypic.domain.image.exception.ImageErrorCode;
 import org.cherrypic.domain.image.repository.ImageRepository;
 import org.cherrypic.domain.image.service.ImageService;
 import org.cherrypic.domain.member.repository.MemberRepository;
 import org.cherrypic.domain.participant.repository.ParticipantRepository;
 import org.cherrypic.domain.subscription.repository.SubscriptionRepository;
-import org.cherrypic.domain.tempalbum.event.TempAlbumImagesDeleteEvent;
+import org.cherrypic.domain.tempalbum.dto.event.TempAlbumImagesDeleteEvent;
 import org.cherrypic.domain.tempalbum.exception.TempAlbumErrorCode;
 import org.cherrypic.domain.tempalbum.repository.TempAlbumImageRepository;
 import org.cherrypic.domain.tempalbum.repository.TempAlbumRepository;

cherrypic-api/src/test/java/org/cherrypic/member/service/MemberServiceTest.java

@@ -4,7 +4,7 @@
 
 import org.cherrypic.IntegrationTest;
 import org.cherrypic.RedisCleaner;
-import org.cherrypic.domain.image.event.ImageDeleteEvent;
+import org.cherrypic.domain.image.dto.event.ImageDeleteEvent;
 import org.cherrypic.domain.member.dto.request.FcmTokenSaveRequest;
 import org.cherrypic.domain.member.dto.request.MemberProfileUpdateRequest;
 import org.cherrypic.domain.member.dto.response.MemberInfoResponse;

cherrypic-api/src/test/java/org/cherrypic/tempalbum/controller/TempAlbumControllerTest.java

@@ -304,4 +304,51 @@ class 임시_앨범_개별_조회_요청_시 {
                     .andExpect(jsonPath("$.data.message").value("임시 앨범 소유자가 아닌 경우 권한이 없습니다."));
         }
     }
+
+    @Nested
+    class 임시_앨범_삭제_요청_시 {
+
+        @Test
+        void 유효한_요청이면_임시_앨범을_삭제한다() throws Exception {
+            // given
+            willDoNothing().given(tempAlbumService).deleteTempAlbum(1L);
+
+            // when & then
+            ResultActions perform = mockMvc.perform(delete("/temp-albums/1"));
+
+            perform.andExpect(status().isNoContent())
+                    .andExpect(jsonPath("$.success").value(true))
+                    .andExpect(jsonPath("$.status").value(HttpStatus.NO_CONTENT.value()));
+        }
+
+        @Test
+        void 임시_앨범이_존재하지_않는_경우_예외가_발생한다() throws Exception {
+            // given
+            willThrow(new CustomException(TempAlbumErrorCode.TEMP_ALBUM_NOT_FOUND))
+                    .given(tempAlbumService)
+                    .deleteTempAlbum(1L);
+
+            // when & then
+            ResultActions perform = mockMvc.perform(delete("/temp-albums/1"));
+
+            perform.andExpect(status().isNotFound())
+                    .andExpect(jsonPath("$.success").value(false))
+                    .andExpect(jsonPath("$.status").value(HttpStatus.NOT_FOUND.value()));
+        }
+
+        @Test
+        void 임시_앨범_소유자가_아닌_경우_예외가_발생한다() throws Exception {
+            // given
+            willThrow(new CustomException(TempAlbumErrorCode.NOT_TEMP_ALBUM_OWNER))
+                    .given(tempAlbumService)
+                    .deleteTempAlbum(1L);
+
+            // when & then
+            ResultActions perform = mockMvc.perform(delete("/temp-albums/1"));
+
+            perform.andExpect(status().isForbidden())
+                    .andExpect(jsonPath("$.success").value(false))
+                    .andExpect(jsonPath("$.status").value(HttpStatus.FORBIDDEN.value()));
+        }
+    }
 }