[feat] 투표 삭제 api 개발

.github/workflows/cd-workflow-prod.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 'main'
+      - 'develop'
 
 permissions:
   contents: read

src/main/java/konkuk/thip/common/exception/code/ErrorCode.java

@@ -99,6 +99,8 @@ public enum ErrorCode implements ResponseCode {
     VOTE_NOT_FOUND(HttpStatus.NOT_FOUND, 110000, "존재하지 않는 VOTE 입니다."),
     VOTE_CANNOT_BE_OVERVIEW(HttpStatus.BAD_REQUEST, 110001, "총평이 될 수 없는 VOTE 입니다."),
     INVALID_VOTE_PAGE_RANGE(HttpStatus.BAD_REQUEST, 110002, "VOTE의 page 값이 유효하지 않습니다."),
+    VOTE_ACCESS_FORBIDDEN(HttpStatus.FORBIDDEN, 110003, "투표 접근 권한이 없습니다."),
+
 
     /**
      * 120000 : voteItem error

src/main/java/konkuk/thip/common/swagger/SwaggerResponseDescription.java

@@ -159,6 +159,11 @@ public enum SwaggerResponseDescription {
             VOTE_ITEM_NOT_VOTED_CANNOT_CANCEL,
             VOTE_ITEM_COUNT_CANNOT_BE_NEGATIVE
     ))),
+    VOTE_DELETE(new LinkedHashSet<>(Set.of(
+            ROOM_ACCESS_FORBIDDEN,
+            VOTE_NOT_FOUND,
+            VOTE_ACCESS_FORBIDDEN
+    ))),
 
 
     // FEED

src/main/java/konkuk/thip/feed/adapter/out/persistence/FeedCommandPersistenceAdapter.java

@@ -75,7 +75,7 @@ public Long save(Feed feed) {
 
     @Override
     public Long update(Feed feed) {
-        FeedJpaEntity feedJpaEntity = feedJpaRepository.findById(feed.getId())
+        FeedJpaEntity feedJpaEntity = feedJpaRepository.findByPostIdAndStatus(feed.getId(),ACTIVE)
                 .orElseThrow(() -> new EntityNotFoundException(FEED_NOT_FOUND));
         feedJpaEntity.updateFrom(feed);
 
@@ -115,7 +115,7 @@ private void applyFeedTags(Feed feed, FeedJpaEntity feedJpaEntity) {
     public void saveSavedFeed(Long userId, Long feedId) {
         UserJpaEntity user = userJpaRepository.findById(userId)
                 .orElseThrow(() -> new EntityNotFoundException(USER_NOT_FOUND));
-        FeedJpaEntity feed = feedJpaRepository.findById(feedId)
+        FeedJpaEntity feed = feedJpaRepository.findByPostIdAndStatus(feedId,ACTIVE)
                 .orElseThrow(() -> new EntityNotFoundException(FEED_NOT_FOUND));
         SavedFeedJpaEntity entity = SavedFeedJpaEntity.builder()
                 .userJpaEntity(user)
@@ -131,7 +131,7 @@ public void deleteSavedFeed(Long userId, Long feedId) {
 
     @Override
     public void delete(Feed feed) {
-        FeedJpaEntity feedJpaEntity = feedJpaRepository.findById(feed.getId())
+        FeedJpaEntity feedJpaEntity = feedJpaRepository.findByPostIdAndStatus(feed.getId(),ACTIVE)
                 .orElseThrow(() -> new EntityNotFoundException(FEED_NOT_FOUND));
 
         feedTagJpaRepository.deleteAllByFeedId(feedJpaEntity.getPostId());

src/main/java/konkuk/thip/record/adapter/out/persistence/RecordCommandPersistenceAdapter.java

@@ -50,7 +50,7 @@ public Optional<Record> findById(Long id) {
 
     @Override
     public void delete(Record record) {
-        RecordJpaEntity recordJpaEntity = recordJpaRepository.findById(record.getId()).orElseThrow(
+        RecordJpaEntity recordJpaEntity = recordJpaRepository.findByPostIdAndStatus(record.getId(),ACTIVE).orElseThrow(
                 () -> new EntityNotFoundException(RECORD_NOT_FOUND)
         );
 
@@ -60,7 +60,7 @@ public void delete(Record record) {
 
     @Override
     public void update(Record record) {
-        RecordJpaEntity recordJpaEntity = recordJpaRepository.findById(record.getId()).orElseThrow(
+        RecordJpaEntity recordJpaEntity = recordJpaRepository.findByPostIdAndStatus(record.getId(),ACTIVE).orElseThrow(
                 () -> new EntityNotFoundException(RECORD_NOT_FOUND)
         );
 

src/main/java/konkuk/thip/vote/adapter/in/web/VoteCommandController.java

@@ -10,16 +10,17 @@
 import konkuk.thip.vote.adapter.in.web.request.VoteCreateRequest;
 import konkuk.thip.vote.adapter.in.web.request.VoteRequest;
 import konkuk.thip.vote.adapter.in.web.response.VoteCreateResponse;
+import konkuk.thip.vote.adapter.in.web.response.VoteDeleteResponse;
 import konkuk.thip.vote.adapter.in.web.response.VoteResponse;
 import konkuk.thip.vote.application.port.in.VoteCreateUseCase;
+import konkuk.thip.vote.application.port.in.VoteDeleteUseCase;
 import konkuk.thip.vote.application.port.in.VoteUseCase;
 import konkuk.thip.vote.application.port.in.dto.VoteResult;
+import konkuk.thip.vote.application.port.in.dto.VoteDeleteCommand;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import static konkuk.thip.common.swagger.SwaggerResponseDescription.RECORD_DELETE;
 import static konkuk.thip.common.swagger.SwaggerResponseDescription.VOTE;
 
 @Tag(name = "Vote Command API", description = "투표 상태변경 관련 API")
@@ -28,6 +29,7 @@
 public class VoteCommandController {
 
     private final VoteCreateUseCase voteCreateUseCase;
+    private final VoteDeleteUseCase voteDeleteUseCase;
     private final VoteUseCase voteUseCase;
 
     @Operation(
@@ -59,4 +61,17 @@ public BaseResponse<VoteResponse> vote(
         VoteResult voteResult = voteUseCase.vote(request.toCommand(userId, roomId, voteId));
         return BaseResponse.ok(VoteResponse.of(voteResult.postId(), voteResult.roomId(), voteResult.voteItems()));
     }
+
+    @Operation(
+            summary = "투표 삭제",
+            description = "사용자가 투표를 삭제합니다."
+    )
+    @ExceptionDescription(RECORD_DELETE)
+    @DeleteMapping("/rooms/{roomId}/vote/{voteId}")
+    public BaseResponse<VoteDeleteResponse> deleteVote(
+            @Parameter(description = "삭제하려는 투표 ID", example = "1") @PathVariable("voteId") final Long voteId,
+            @Parameter(description = "삭제하려는 투표가 작성된 모임 ID", example = "1") @PathVariable("roomId") final Long roomId,
+            @Parameter(hidden = true) @UserId final Long userId) {
+        return BaseResponse.ok(VoteDeleteResponse.of(voteDeleteUseCase.deleteVote(new VoteDeleteCommand(roomId, voteId, userId))));
+    }
 }

src/main/java/konkuk/thip/vote/adapter/in/web/response/VoteDeleteResponse.java

@@ -0,0 +1,7 @@
+package konkuk.thip.vote.adapter.in.web.response;
+
+public record VoteDeleteResponse(Long roomId) {
+    public static VoteDeleteResponse of(Long roomId) {
+        return new VoteDeleteResponse(roomId);
+    }
+}

src/main/java/konkuk/thip/vote/adapter/out/jpa/VoteJpaEntity.java

@@ -48,4 +48,9 @@ public VoteJpaEntity updateFrom(Vote vote) {
     public void updateLikeCount(int likeCount) {
         this.likeCount = likeCount;
     }
+
+    @VisibleForTesting
+    public void updateCommentCount(int commentCount) {
+        this.commentCount = commentCount;
+    }
 }

src/main/java/konkuk/thip/vote/adapter/out/persistence/VoteCommandPersistenceAdapter.java

@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import static konkuk.thip.common.entity.StatusType.ACTIVE;
 import static konkuk.thip.common.exception.code.ErrorCode.*;
 
 @Repository
@@ -58,7 +59,7 @@ public void saveAllVoteItems(List<VoteItem> voteItems) {
         if (voteItems.isEmpty()) return;
 
         Long voteId = voteItems.get(0).getVoteId();
-        VoteJpaEntity voteJpaEntity = voteJpaRepository.findById(voteId).orElseThrow(
+        VoteJpaEntity voteJpaEntity = voteJpaRepository.findByPostIdAndStatus(voteId,ACTIVE).orElseThrow(
                 () -> new EntityNotFoundException(VOTE_NOT_FOUND)
         );
 
@@ -71,7 +72,7 @@ public void saveAllVoteItems(List<VoteItem> voteItems) {
 
     @Override
     public Optional<Vote> findById(Long id) {
-        return voteJpaRepository.findById(id)
+        return voteJpaRepository.findByPostIdAndStatus(id,ACTIVE)
                 .map(voteMapper::toDomainEntity);
     }
 
@@ -135,10 +136,23 @@ public void updateVoteItem(VoteItem voteItem) {
         voteItemJpaRepository.save(voteItemJpaEntity.updateFrom(voteItem));
     }
 
+    @Override
+    public void delete(Vote vote) {
+        VoteJpaEntity voteJpaEntity = voteJpaRepository.findByPostIdAndStatus(vote.getId(),ACTIVE).orElseThrow(
+                () -> new EntityNotFoundException(VOTE_NOT_FOUND)
+        );
+
+        voteParticipantJpaRepository.deleteAllByVoteId(voteJpaEntity.getPostId());
+        voteItemJpaRepository.deleteAllByVoteId(voteJpaEntity.getPostId());
+
+        voteJpaEntity.softDelete();
+        voteJpaRepository.save(voteJpaEntity);
+    }
+
 
     @Override
     public void updateVote(Vote vote) {
-        VoteJpaEntity voteJpaEntity = voteJpaRepository.findById(vote.getId()).orElseThrow(
+        VoteJpaEntity voteJpaEntity = voteJpaRepository.findByPostIdAndStatus(vote.getId(),ACTIVE).orElseThrow(
                 () -> new EntityNotFoundException(VOTE_NOT_FOUND)
         );
 

src/main/java/konkuk/thip/vote/adapter/out/persistence/repository/VoteItemJpaRepository.java

@@ -2,10 +2,17 @@
 
 import konkuk.thip.vote.adapter.out.jpa.VoteItemJpaEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
 public interface VoteItemJpaRepository extends JpaRepository<VoteItemJpaEntity, Long> {
 
     List<VoteItemJpaEntity> findAllByVoteJpaEntity_PostId(Long voteId);
+
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query("DELETE FROM VoteItemJpaEntity vi WHERE vi.voteJpaEntity.postId = :voteId")
+    void deleteAllByVoteId(@Param("voteId") Long voteId);
 }

src/main/java/konkuk/thip/vote/adapter/out/persistence/repository/VoteJpaRepository.java

@@ -1,8 +1,11 @@
 package konkuk.thip.vote.adapter.out.persistence.repository;
 
+import konkuk.thip.common.entity.StatusType;
 import konkuk.thip.vote.adapter.out.jpa.VoteJpaEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface VoteJpaRepository extends JpaRepository<VoteJpaEntity, Long>, VoteQueryRepository {
+import java.util.Optional;
 
+public interface VoteJpaRepository extends JpaRepository<VoteJpaEntity, Long>, VoteQueryRepository {
+    Optional<VoteJpaEntity> findByPostIdAndStatus(Long postId, StatusType status);
 }

src/main/java/konkuk/thip/vote/adapter/out/persistence/repository/VoteParticipantJpaRepository.java

@@ -2,7 +2,9 @@
 
 import konkuk.thip.vote.adapter.out.jpa.VoteParticipantJpaEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
@@ -11,4 +13,16 @@
 public interface VoteParticipantJpaRepository extends JpaRepository<VoteParticipantJpaEntity, Long>, VoteParticipantQueryRepository {
     @Query("SELECT vp FROM VoteParticipantJpaEntity vp WHERE vp.userJpaEntity.userId = :userId AND vp.voteItemJpaEntity.voteItemId = :voteItemId")
     Optional<VoteParticipantJpaEntity> findVoteParticipantByUserIdAndVoteItemId(Long userId, Long voteItemId);
+
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query("""
+       DELETE FROM VoteParticipantJpaEntity vp
+       WHERE vp.voteItemJpaEntity.voteItemId IN (
+            SELECT vi.voteItemId
+            FROM VoteItemJpaEntity vi
+            WHERE vi.voteJpaEntity.postId = :voteId
+       )
+       """)
+    void deleteAllByVoteId(@Param("voteId") Long voteId);
+
 }

src/main/java/konkuk/thip/vote/application/port/in/VoteDeleteUseCase.java

@@ -0,0 +1,7 @@
+package konkuk.thip.vote.application.port.in;
+
+import konkuk.thip.vote.application.port.in.dto.VoteDeleteCommand;
+
+public interface VoteDeleteUseCase {
+    Long deleteVote(VoteDeleteCommand command);
+}

src/main/java/konkuk/thip/vote/application/port/in/dto/VoteDeleteCommand.java

@@ -0,0 +1,10 @@
+package konkuk.thip.vote.application.port.in.dto;
+
+public record VoteDeleteCommand(
+        Long roomId,
+
+        Long voteId,
+
+        Long userId
+) {
+}

src/main/java/konkuk/thip/vote/application/port/out/VoteCommandPort.java

@@ -44,4 +44,6 @@ default VoteItem getVoteItemByIdOrThrow(Long id) {
     void deleteVoteParticipant(VoteParticipant voteParticipant);
 
     void updateVoteItem(VoteItem voteItem);
+
+    void delete(Vote vote);
 }

src/main/java/konkuk/thip/vote/application/service/VoteDeleteService.java

@@ -0,0 +1,46 @@
+package konkuk.thip.vote.application.service;
+
+import jakarta.transaction.Transactional;
+import konkuk.thip.comment.application.port.out.CommentCommandPort;
+import konkuk.thip.post.application.port.out.PostLikeCommandPort;
+import konkuk.thip.room.application.service.validator.RoomParticipantValidator;
+import konkuk.thip.vote.application.port.in.VoteDeleteUseCase;
+import konkuk.thip.vote.application.port.in.dto.VoteDeleteCommand;
+import konkuk.thip.vote.application.port.out.VoteCommandPort;
+import konkuk.thip.vote.domain.Vote;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class VoteDeleteService implements VoteDeleteUseCase {
+
+    private final VoteCommandPort voteCommandPort;
+    private final CommentCommandPort commentCommandPort;
+    private final PostLikeCommandPort postLikeCommandPort;
+
+    private final RoomParticipantValidator roomParticipantValidator;
+
+    @Override
+    @Transactional
+    public Long deleteVote(VoteDeleteCommand command) {
+
+        // 1. 방 참여자 검증
+        roomParticipantValidator.validateUserIsRoomMember(command.roomId(), command.userId());
+
+        // 2. 투표 조회 및 검증
+        Vote vote = voteCommandPort.getByIdOrThrow(command.voteId());
+        // 2-1. 투표 삭제 권한 검증
+        vote.validateDeletable(command.userId(),command.roomId());
+
+        // 3. 투표 삭제
+        // 3-1. 투표 게시글 댓글 삭제
+        commentCommandPort.softDeleteAllByPostId(command.voteId());
+        // 3-2. 투표 게시글 좋아요 삭제
+        postLikeCommandPort.deleteAllByPostId(command.voteId());
+        // 3-3. 투표 삭제
+        voteCommandPort.delete(vote);
+
+        return command.roomId();
+    }
+}

src/main/java/konkuk/thip/vote/domain/Vote.java

@@ -90,4 +90,21 @@ private void checkCommentCountNotUnderflow() {
             throw new InvalidStateException(COMMENT_COUNT_UNDERFLOW);
         }
     }
+
+    private void validateCreator(Long userId) {
+        if (!this.creatorId.equals(userId)) {
+            throw new InvalidStateException(VOTE_ACCESS_FORBIDDEN, new IllegalArgumentException("투표 작성자만 투표를 수정/삭제할 수 있습니다."));
+        }
+    }
+
+    public void validateDeletable(Long userId,Long roomId) {
+        validateRoomId(roomId);
+        validateCreator(userId);
+    }
+
+    private void validateRoomId(Long roomId) {
+        if (!this.roomId.equals(roomId)) {
+            throw new InvalidStateException(VOTE_ACCESS_FORBIDDEN, new IllegalArgumentException("투표가 해당 방에 속하지 않습니다."));
+        }
+    }
 }

src/test/java/konkuk/thip/common/util/TestEntityFactory.java

@@ -190,6 +190,14 @@ public static VoteJpaEntity createVote(UserJpaEntity user, RoomJpaEntity room) {
                 .build();
     }
 
+    public static VoteItemJpaEntity createVoteItem(String itemName, VoteJpaEntity vote) {
+        return VoteItemJpaEntity.builder()
+                .itemName(itemName)
+                .count(0)
+                .voteJpaEntity(vote)
+                .build();
+    }
+
     public static CommentJpaEntity createComment(PostJpaEntity post, UserJpaEntity user,PostType postType) {
         return CommentJpaEntity.builder()
                 .content("댓글 내용")

src/test/java/konkuk/thip/feed/adapter/in/web/FeedDeleteAPITest.java

@@ -118,10 +118,12 @@ void deleteFeed_success() throws Exception {
         assertThat(commentJpaRepository.findById(comment.getCommentId()).get().getStatus()).isEqualTo(INACTIVE);
 
         // 5) 댓글 좋아요 삭제
-        long commentLikeCountAfter = commentLikeJpaRepository.count();
-        assertThat(commentLikeCountAfter).isEqualTo(0);
+        assertThat(commentLikeJpaRepository.count()).isEqualTo(0);
 
         // 6) 피드 저장 관계 삭제
         assertTrue(savedFeedJpaRepository.findAll().isEmpty());
+
+        // 7) 게시글 좋아요(PostLike) 삭제
+        assertThat(postLikeJpaRepository.count()).isEqualTo(0);
     }
 }

src/test/java/konkuk/thip/record/adapter/in/web/RecordDeleteAPITest.java

@@ -101,7 +101,10 @@ void deleteRecord_success() throws Exception {
         assertThat(commentJpaRepository.findByCommentIdAndStatus(comment.getCommentId(),INACTIVE)).isPresent();
 
         // 3) 댓글 좋아요 삭제
-        long commentLikeCountAfter = commentLikeJpaRepository.count();
-        assertThat(commentLikeCountAfter).isEqualTo(0);
+        assertThat(commentLikeJpaRepository.count()).isEqualTo(0);
+
+        // 4) 게시글 좋아요(PostLike) 삭제
+        assertThat(postLikeJpaRepository.count()).isEqualTo(0);
+
     }
 }

src/test/java/konkuk/thip/record/domain/RecordTest.java

@@ -200,7 +200,7 @@ void validateDeletable_byOtherRoomId_throws(){
     }
 
     @Test
-    @DisplayName("validateDeletable: 피드의 작성자면서, 전달된 roomId가 기록의 roomId와 일치할 경우 기록을 삭제 할 수 있다.")
+    @DisplayName("validateDeletable: 기록의 작성자면서, 전달된 roomId가 기록의 roomId와 일치할 경우 기록을 삭제 할 수 있다.")
     void validateDeletable_byCreator_byRoomId_Success(){
         Record record = createWithCommentRecord();
         assertDoesNotThrow(() -> record.validateDeletable(CREATOR_ID,ROOM_ID));