[Feat] 내가 만든 투표 목록 조회 API 개발 (#57)

soonge2 · web-flow · commit c8466ac8e669 · 2025-05-06T15:04:30.000+09:00
* feat: 내가 만든 투표 목록용 커서 파서 추가 (#37) * refactor: 투표 리스트 응답 DTO를 기능별 패키지로 분리 (active, mine, participated) (#37) * feat: 내가 만든 투표 목록 조회 API 응답 DTO 생성 (#37) * feat: 내가 만든 투표 목록 조회용 QueryDSL 리포지토리 구현 (#37) * refactor: 공개 그룹 조회 로직 GroupService로 분리 (#37) * feat: VoteOptionResultWithId DTO 추가 (voteId 포함) (#37) * feat: 내가 만든 투표 목록 조회 서비스 로직 구현 (#37) - getMyVotes 서비스 구현 - VoteResultService.getResultsWithVoteId() 메서드 추가 및 사용 - 투표에 대해 결과 집계 포함한 응답 구성 * feat: 내가 만든 투표 목록 조회 API 컨트롤러 구현 (#37) * refactor: VoteResultService를 사용해 getVoteResult 결과 집계 로직 분리 (#37) * feat: 커서에 포함된 voteId 유효성 검증 추가 (#37) - MyVote 목록 조회 시 전달된 커서의 voteId가 실제로 존재하는지 확인 - 존재하지 않으면 404(VOTE_NOT_FOUND) 예외 발생시킴 - 불필요한 쿼리 실행 방지 및 에러 원인 명확화
diff --git a/src/main/java/com/moa/moa_server/domain/global/cursor/CreatedAtVoteIdCursor.java b/src/main/java/com/moa/moa_server/domain/global/cursor/CreatedAtVoteIdCursor.java
@@ -0,0 +1,38 @@
+package com.moa.moa_server.domain.global.cursor;
+
+import com.moa.moa_server.domain.vote.handler.VoteErrorCode;
+import com.moa.moa_server.domain.vote.handler.VoteException;
+import lombok.extern.slf4j.Slf4j;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+@Slf4j
+public record CreatedAtVoteIdCursor(LocalDateTime createdAt, Long voteId) {
+
+    /**
+     * "createdAt_voteId" 형식의 커서를 파싱
+     */
+    public static CreatedAtVoteIdCursor parse(String cursor) {
+        try {
+            String[] parts = cursor.split("_");
+            if (parts.length != 2) {
+                log.warn("[VoteMineCursor#parse] Cursor must contain exactly two parts.");
+                throw new VoteException(VoteErrorCode.INVALID_CURSOR_FORMAT);
+            }
+            return new CreatedAtVoteIdCursor(
+                    LocalDateTime.parse(parts[0]),
+                    Long.parseLong(parts[1])
+            );
+        } catch (DateTimeParseException | NumberFormatException e) {
+            log.warn("[VoteMineCursor#parse] Failed to parse cursor '{}': {}", cursor, e.toString());
+            throw new VoteException(VoteErrorCode.INVALID_CURSOR_FORMAT);
+        }
+    }
+
+    public String encode() {
+        DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+        return createdAt.format(formatter) + "_" + voteId;
+    }
+}
diff --git a/src/main/java/com/moa/moa_server/domain/group/service/GroupService.java b/src/main/java/com/moa/moa_server/domain/group/service/GroupService.java
@@ -0,0 +1,20 @@
+package com.moa.moa_server.domain.group.service;
+
+import com.moa.moa_server.domain.group.entity.Group;
+import com.moa.moa_server.domain.group.repository.GroupRepository;
+import com.moa.moa_server.domain.vote.handler.VoteErrorCode;
+import com.moa.moa_server.domain.vote.handler.VoteException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class GroupService {
+
+    private final GroupRepository groupRepository;
+
+    public Group getPublicGroup() {
+        return groupRepository.findById(1L)
+                .orElseThrow(() -> new VoteException(VoteErrorCode.GROUP_NOT_FOUND));
+    }
+}
diff --git a/src/main/java/com/moa/moa_server/domain/vote/controller/VoteController.java b/src/main/java/com/moa/moa_server/domain/vote/controller/VoteController.java
@@ -5,7 +5,8 @@
 import com.moa.moa_server.domain.vote.dto.request.VoteSubmitRequest;
 import com.moa.moa_server.domain.vote.dto.response.VoteCreateResponse;
 import com.moa.moa_server.domain.vote.dto.response.VoteDetailResponse;
-import com.moa.moa_server.domain.vote.dto.response.list.VoteListResponse;
+import com.moa.moa_server.domain.vote.dto.response.active.ActiveVoteResponse;
+import com.moa.moa_server.domain.vote.dto.response.mine.MyVoteResponse;
 import com.moa.moa_server.domain.vote.dto.response.result.VoteResultResponse;
 import com.moa.moa_server.domain.vote.service.VoteService;
 import lombok.RequiredArgsConstructor;
@@ -62,12 +63,24 @@ public ResponseEntity<ApiResponse> getVoteResult(
     }
 
     @GetMapping
-    public VoteListResponse getActiveVotes(
+    public ResponseEntity<ApiResponse> getActiveVotes(
             @AuthenticationPrincipal Long userId,
-            @RequestParam(required = false) Integer groupId,
+            @RequestParam(required = false) Long groupId,
             @RequestParam(required = false) String cursor,
             @RequestParam(required = false) Integer size
     ) {
-        return voteService.getActiveVotes(userId, groupId, cursor, size);
+        ActiveVoteResponse response = voteService.getActiveVotes(userId, groupId, cursor, size);
+        return ResponseEntity.ok(new ApiResponse("SUCCESS", response));
+    }
+
+    @GetMapping("/mine")
+    public ResponseEntity<ApiResponse> getMyVotes(
+            @AuthenticationPrincipal Long userId,
+            @RequestParam(required = false) Long groupId,
+            @RequestParam(required = false) String cursor,
+            @RequestParam(required = false) Integer size
+    ) {
+        MyVoteResponse response = voteService.getMyVotes(userId, groupId, cursor, size);
+        return ResponseEntity.ok(new ApiResponse("SUCCESS", response));
     }
 }
diff --git a/src/main/java/com/moa/moa_server/domain/vote/dto/response/active/ActiveVoteItem.java b/src/main/java/com/moa/moa_server/domain/vote/dto/response/active/ActiveVoteItem.java
@@ -1,10 +1,10 @@
-package com.moa.moa_server.domain.vote.dto.response.list;
+package com.moa.moa_server.domain.vote.dto.response.active;
 
 import com.moa.moa_server.domain.vote.entity.Vote;
 
 import java.time.LocalDateTime;
 
-public record VoteListItem(
+public record ActiveVoteItem(
         Long voteId,
         Long groupId,
         String authorNickname,
@@ -16,8 +16,8 @@ public record VoteListItem(
         String voteType
 ) {
 
-    public static VoteListItem from(Vote vote) {
-        return new VoteListItem(
+    public static ActiveVoteItem from(Vote vote) {
+        return new ActiveVoteItem(
                 vote.getId(),
                 vote.getGroup().getId(),
                 vote.getUser().getNickname(),
diff --git a/src/main/java/com/moa/moa_server/domain/vote/dto/response/active/ActiveVoteResponse.java b/src/main/java/com/moa/moa_server/domain/vote/dto/response/active/ActiveVoteResponse.java
@@ -0,0 +1,10 @@
+package com.moa.moa_server.domain.vote.dto.response.active;
+
+import java.util.List;
+
+public record ActiveVoteResponse(
+        List<ActiveVoteItem> votes,
+        String nextCursor,
+        boolean hasNext,
+        int size
+) {}
diff --git a/src/main/java/com/moa/moa_server/domain/vote/dto/response/list/VoteListResponse.java b/src/main/java/com/moa/moa_server/domain/vote/dto/response/list/VoteListResponse.java
diff --git a/src/main/java/com/moa/moa_server/domain/vote/dto/response/mine/MyVoteItem.java b/src/main/java/com/moa/moa_server/domain/vote/dto/response/mine/MyVoteItem.java
@@ -0,0 +1,30 @@
+package com.moa.moa_server.domain.vote.dto.response.mine;
+
+import com.moa.moa_server.domain.vote.dto.response.result.VoteOptionResult;
+import com.moa.moa_server.domain.vote.entity.Vote;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+public record MyVoteItem(
+        Long voteId,
+        Long groupId,
+        String content,
+        String voteStatus,
+        LocalDateTime createdAt,
+        LocalDateTime closedAt,
+        List<VoteOptionResultWithId> results
+) {
+
+    public static MyVoteItem from(Vote vote, List<VoteOptionResultWithId> results) {
+        return new MyVoteItem(
+                vote.getId(),
+                vote.getGroup().getId(),
+                vote.getContent(),
+                vote.getVoteStatus().name(),
+                vote.getCreatedAt(),
+                vote.getClosedAt(),
+                results
+        );
+    }
+}
diff --git a/src/main/java/com/moa/moa_server/domain/vote/dto/response/mine/MyVoteResponse.java b/src/main/java/com/moa/moa_server/domain/vote/dto/response/mine/MyVoteResponse.java
@@ -0,0 +1,14 @@
+package com.moa.moa_server.domain.vote.dto.response.mine;
+
+import java.util.List;
+
+public record MyVoteResponse(
+    List<MyVoteItem> votes,
+    String nextCursor,
+    boolean hasNext,
+    int size
+) {
+    public static MyVoteResponse of(List<MyVoteItem> votes, String nextCursor, boolean hasNext) {
+        return new MyVoteResponse(votes, nextCursor, hasNext, votes.size());
+    }
+}
diff --git a/src/main/java/com/moa/moa_server/domain/vote/dto/response/mine/VoteOptionResultWithId.java b/src/main/java/com/moa/moa_server/domain/vote/dto/response/mine/VoteOptionResultWithId.java
@@ -0,0 +1,8 @@
+package com.moa.moa_server.domain.vote.dto.response.mine;
+
+public record VoteOptionResultWithId(
+        Long voteId,
+        int optionNumber,
+        int count,
+        int ratio
+) {}
diff --git a/src/main/java/com/moa/moa_server/domain/vote/repository/VoteRepositoryCustom.java b/src/main/java/com/moa/moa_server/domain/vote/repository/VoteRepositoryCustom.java
@@ -1,5 +1,6 @@
 package com.moa.moa_server.domain.vote.repository;
 
+import com.moa.moa_server.domain.global.cursor.CreatedAtVoteIdCursor;
 import com.moa.moa_server.domain.global.cursor.VoteClosedCursor;
 import com.moa.moa_server.domain.group.entity.Group;
 import com.moa.moa_server.domain.user.entity.User;
@@ -10,4 +11,5 @@
 
 public interface VoteRepositoryCustom {
     List<Vote> findActiveVotes(List<Group> accessibleGroups, @Nullable VoteClosedCursor cursor, @Nullable User user, int size);
+    List<Vote> findMyVotes(User user, List<Group> groups, @Nullable CreatedAtVoteIdCursor cursor, int size);
 }
diff --git a/src/main/java/com/moa/moa_server/domain/vote/repository/impl/VoteRepositoryImpl.java b/src/main/java/com/moa/moa_server/domain/vote/repository/impl/VoteRepositoryImpl.java
@@ -1,5 +1,6 @@
 package com.moa.moa_server.domain.vote.repository.impl;
 
+import com.moa.moa_server.domain.global.cursor.CreatedAtVoteIdCursor;
 import com.moa.moa_server.domain.global.cursor.VoteClosedCursor;
 import com.moa.moa_server.domain.group.entity.Group;
 import com.moa.moa_server.domain.user.entity.User;
@@ -61,4 +62,29 @@ public List<Vote> findActiveVotes(List<Group> accessibleGroups, @Nullable VoteCl
                 .limit(size)
                 .fetch();
     }
+
+    @Override
+    public List<Vote> findMyVotes(User user, List<Group> groups, @Nullable CreatedAtVoteIdCursor cursor, int size) {
+        QVote vote = QVote.vote;
+
+        BooleanBuilder builder = new BooleanBuilder()
+                .and(vote.user.eq(user))
+                .and(vote.deletedAt.isNull())
+                .and(vote.group.in(groups));
+
+        if (cursor != null) {
+            builder.and(
+                    vote.createdAt.lt(cursor.createdAt())
+                            .or(vote.createdAt.eq(cursor.createdAt())
+                                    .and(vote.id.lt(cursor.voteId())))
+            );
+        }
+
+        return queryFactory
+                .selectFrom(vote)
+                .where(builder)
+                .orderBy(vote.createdAt.desc(), vote.id.desc())
+                .limit(size)
+                .fetch();
+    }
 }
diff --git a/src/main/java/com/moa/moa_server/domain/vote/service/VoteResultService.java b/src/main/java/com/moa/moa_server/domain/vote/service/VoteResultService.java
@@ -0,0 +1,65 @@
+package com.moa.moa_server.domain.vote.service;
+
+import com.moa.moa_server.domain.vote.dto.response.mine.VoteOptionResultWithId;
+import com.moa.moa_server.domain.vote.dto.response.result.VoteOptionResult;
+import com.moa.moa_server.domain.vote.entity.Vote;
+import com.moa.moa_server.domain.vote.entity.VoteResponse;
+import com.moa.moa_server.domain.vote.repository.VoteResponseRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@Service
+@RequiredArgsConstructor
+public class VoteResultService {
+
+    private final VoteResponseRepository voteResponseRepository;
+
+    /**
+     * 투표 옵션 결과만 필요한 경우 (optionNumber, count, ratio)
+     */
+    public List<VoteOptionResult> getResults(Vote vote) {
+        return getResultsInternal(vote).stream()
+                .map(r -> new VoteOptionResult(r.optionNumber(), r.count(), r.ratio()))
+                .toList();
+    }
+
+    /**
+     * voteId까지 포함된 결과가 필요한 경우 (MyVote용)
+     */
+    public List<VoteOptionResultWithId> getResultsWithVoteId(Vote vote) {
+        return getResultsInternal(vote).stream()
+                .map(r -> new VoteOptionResultWithId(vote.getId(), r.optionNumber(), r.count(), r.ratio()))
+                .toList();
+    }
+
+    private List<ResultRaw> getResultsInternal(Vote vote) {
+        List<VoteResponse> responses = voteResponseRepository.findAllByVote(vote);
+
+        int totalCount = (int) responses.stream()
+                .filter(vr -> vr.getOptionNumber() > 0)
+                .count();
+
+        Map<Integer, Long> countMap = responses.stream()
+                .filter(vr -> vr.getOptionNumber() > 0)
+                .collect(Collectors.groupingBy(
+                        VoteResponse::getOptionNumber,
+                        Collectors.counting()
+                ));
+
+        return Stream.of(1,2)
+                .map(option -> {
+                    int count = countMap.getOrDefault(option, 0L).intValue();
+                    int ratio = totalCount == 0 ? 0 : (int) ((count * 100.0) / totalCount);
+                    return new ResultRaw(option, count, ratio);
+                })
+                .toList();
+    }
+
+    private record ResultRaw(int optionNumber, int count, int ratio) {}
+
+}
diff --git a/src/main/java/com/moa/moa_server/domain/vote/service/VoteService.java b/src/main/java/com/moa/moa_server/domain/vote/service/VoteService.java
