🚀 마실 삭제 API 추가

🚀 마실 삭제 API 추가

src/main/java/team/silvertown/masil/masil/controller/MasilController.java

@@ -14,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -139,4 +140,19 @@ public ResponseEntity<MasilDetailResponse> getById(
         return ResponseEntity.ok(response);
     }
 
+    @DeleteMapping("/api/v1/masils/{id}")
+    @Operation(summary = "마실 삭제")
+    @ApiResponse(responseCode = "204")
+    public ResponseEntity<Void> deleteById(
+        @AuthenticationPrincipal
+        Long userId,
+        @PathVariable
+        Long id
+    ) {
+        masilService.deleteById(userId, id);
+
+        return ResponseEntity.noContent()
+            .build();
+    }
+
 }

src/main/java/team/silvertown/masil/masil/repository/MasilPinRepository.java

@@ -1,8 +1,15 @@
 package team.silvertown.masil.masil.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import team.silvertown.masil.masil.domain.Masil;
 import team.silvertown.masil.masil.domain.MasilPin;
 
 public interface MasilPinRepository extends JpaRepository<MasilPin, Long> {
 
+    @Modifying
+    @Query("DELETE FROM MasilPin mp WHERE mp.masil = :masil")
+    void deleteAllByMasil(Masil masil);
+
 }

src/main/java/team/silvertown/masil/masil/repository/MasilQueryRepositoryImpl.java

@@ -26,8 +26,9 @@ public class MasilQueryRepositoryImpl implements MasilQueryRepository {
     private static final int DEFAULT_RECENT_SIZE = 10;
 
     private final JPAQueryFactory jpaQueryFactory;
-    private final QMasil masil = QMasil.masil;
+    private final QMasil qMasil = QMasil.masil;
 
+    @Override
     public List<Masil> findRecent(User user, Integer size) {
         int limit = DEFAULT_RECENT_SIZE;
 
@@ -36,10 +37,10 @@ public List<Masil> findRecent(User user, Integer size) {
         }
 
         return jpaQueryFactory
-            .selectFrom(masil)
-            .where(masil.user.eq(user))
+            .selectFrom(qMasil)
+            .where(qMasil.user.eq(user))
             .limit(limit)
-            .orderBy(masil.id.desc())
+            .orderBy(qMasil.id.desc())
             .fetch();
     }
 
@@ -50,15 +51,15 @@ public List<MasilDailyDto> findInGivenPeriod(
         OffsetDateTime endDateTime
     ) {
         BooleanBuilder condition = new BooleanBuilder();
-        StringTemplate startDate = convertToLocalDate(masil.startedAt);
+        StringTemplate startDate = convertToLocalDate(qMasil.startedAt);
 
-        condition.and(masil.user.eq(user))
-            .and(masil.startedAt.between(startDateTime, endDateTime));
+        condition.and(qMasil.user.eq(user))
+            .and(qMasil.startedAt.between(startDateTime, endDateTime));
 
         return jpaQueryFactory
-            .selectFrom(masil)
+            .selectFrom(qMasil)
             .where(condition)
-            .orderBy(masil.startedAt.asc())
+            .orderBy(qMasil.startedAt.asc())
             .transform(
                 GroupBy.groupBy(startDate)
                     .as(projectDailyDetail())
@@ -80,13 +81,13 @@ private GroupExpression<MasilDailyDetailDto, List<MasilDailyDetailDto>> projectD
         return GroupBy.list(
             Projections.constructor(
                 MasilDailyDetailDto.class,
-                masil.id,
-                masil.address,
-                masil.content,
-                masil.thumbnailUrl,
-                masil.distance,
-                masil.totalTime,
-                masil.calories
+                qMasil.id,
+                qMasil.address,
+                qMasil.content,
+                qMasil.thumbnailUrl,
+                qMasil.distance,
+                qMasil.totalTime,
+                qMasil.calories
             )
         );
     }

src/main/java/team/silvertown/masil/masil/service/MasilService.java

@@ -68,6 +68,19 @@ public MasilDetailResponse getById(Long userId, Long id) {
         return MasilDetailResponse.from(masil, pins);
     }
 
+    @Transactional
+    public void deleteById(Long userId, Long id) {
+        User user = userRepository.findById(userId)
+            .orElseThrow(getNotFoundException(MasilErrorCode.USER_NOT_FOUND));
+        Masil masil = masilRepository.findById(id)
+            .orElseThrow(getNotFoundException(MasilErrorCode.MASIL_NOT_FOUND));
+
+        MasilValidator.validateMasilOwner(masil, user);
+
+        masilPinRepository.deleteAllByMasil(masil);
+        masilRepository.delete(masil);
+    }
+
     @Transactional(readOnly = true)
     public RecentMasilResponse getRecent(Long userId, Integer size) {
         User user = userRepository.findById(userId)

src/test/java/team/silvertown/masil/masil/service/MasilServiceTest.java

@@ -11,6 +11,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -213,6 +214,83 @@ void setUp() {
         assertThat(response.isEmpty()).isTrue();
     }
 
+    @Test
+    void 비회원_사용자일_경우_마실_삭제에_실패한다() {
+        // given
+        long invalidUserId = MasilTexture.getRandomId();
+        Masil masil = masilRepository.save(MasilTexture.createDependentMasil(user, 10000));
+        List<MasilPin> masilPins = MasilTexture.createDependentMasilPins(masil, user.getId(), 10);
+
+        masilPinRepository.saveAll(masilPins);
+        entityManager.clear();
+
+        masilRepository.save(masil);
+        masilPinRepository.saveAll(masilPins);
+        entityManager.clear();
+
+        // when
+        ThrowingCallable deleteById = () -> masilService.deleteById(invalidUserId, masil.getId());
+
+        // then
+        assertThatExceptionOfType(DataNotFoundException.class)
+            .isThrownBy(deleteById)
+            .withMessage(MasilErrorCode.USER_NOT_FOUND.getMessage());
+    }
+
+    @Test
+    void 존재하지_않는_마실일_경우_삭제에_실패한다() {
+        // given
+        long invalidMasilId = MasilTexture.getRandomId();
+
+        // when
+        ThrowingCallable deleteById = () -> masilService.deleteById(user.getId(), invalidMasilId);
+
+        // then
+        assertThatExceptionOfType(DataNotFoundException.class)
+            .isThrownBy(deleteById)
+            .withMessage(MasilErrorCode.MASIL_NOT_FOUND.getMessage());
+    }
+
+    @Test
+    void 로그인한_사용자와_마실_소유자가_다르면_마실_삭제에_실패한다() {
+        // given
+        User differntUser = userRepository.save(UserTexture.createValidUser());
+        Masil masil = masilRepository.save(MasilTexture.createDependentMasil(user, 10000));
+        List<MasilPin> masilPins = MasilTexture.createDependentMasilPins(masil, user.getId(), 10);
+
+        masilPinRepository.saveAll(masilPins);
+        entityManager.clear();
+
+        masilPinRepository.saveAll(masilPins);
+        entityManager.clear();
+
+        // when
+        ThrowingCallable deleteById = () -> masilService.deleteById(differntUser.getId(), masil.getId());
+
+        // then
+        assertThatExceptionOfType(ForbiddenException.class)
+            .isThrownBy(deleteById)
+            .withMessage(MasilErrorCode.USER_NOT_AUTHORIZED_FOR_MASIL.getMessage());
+    }
+
+    @Test
+    void 마실_삭제에_성공한다() {
+        // given
+        Masil masil = masilRepository.save(MasilTexture.createDependentMasil(user, 10000));
+        List<MasilPin> masilPins = MasilTexture.createDependentMasilPins(masil, user.getId(), 10);
+
+        masilPinRepository.saveAll(masilPins);
+        entityManager.clear();
+
+        // when
+        masilService.deleteById(user.getId(), masil.getId());
+
+        // then
+        Optional<Masil> actual = masilRepository.findById(masil.getId());
+
+        assertThat(actual).isEmpty();
+    }
+
     @ParameterizedTest
     @ValueSource(ints = {5, 10, 15})
     void 최근_마실_조회를_성공한다(int masilSize) {