Refactor[poll]:pollvote object->dto

Author: GarakChoi

backend/src/main/java/com/ai/lawyer/domain/poll/dto/PollTopDto.java

@@ -0,0 +1,16 @@
+package com.ai.lawyer.domain.poll.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.Builder;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class PollTopDto {
+    private Long pollId;
+    private Long voteCount;
+}
+

backend/src/main/java/com/ai/lawyer/domain/poll/repository/PollVoteRepositoryCustom.java

@@ -4,13 +4,17 @@
 import com.ai.lawyer.domain.poll.entity.PollVote;
 import org.springframework.data.domain.Pageable;
 import java.util.List;
+import com.ai.lawyer.domain.poll.dto.PollAgeStaticsDto;
+import com.ai.lawyer.domain.poll.dto.PollGenderStaticsDto;
+import com.ai.lawyer.domain.poll.dto.PollTopDto;
+import com.ai.lawyer.domain.poll.dto.PollStaticsDto;
 
 public interface PollVoteRepositoryCustom {
-    List<Object[]> findTopPollByStatus(Poll.PollStatus status);
-    List<Object[]> findTopNPollByStatus(Poll.PollStatus status, Pageable pageable);
+    List<PollTopDto> findTopPollByStatus(Poll.PollStatus status);
+    List<PollTopDto> findTopNPollByStatus(Poll.PollStatus status, Pageable pageable);
     Long countByPollId(Long pollId);
     Long countByPollOptionId(Long pollOptionId);
-    List<Object[]> countStaticsByPollOptionIds(List<Long> pollOptionIds);
-    List<Object[]> getOptionAgeStatics(Long pollId);
-    List<Object[]> getOptionGenderStatics(Long pollId);
+    List<PollAgeStaticsDto.AgeGroupCountDto> getOptionAgeStatics(Long pollId);
+    List<PollGenderStaticsDto.GenderCountDto> getOptionGenderStatics(Long pollId);
+    List<PollStaticsDto> countStaticsByPollOptionIds(List<Long> pollOptionIds);
 }

backend/src/main/java/com/ai/lawyer/domain/poll/repository/PollVoteRepositoryImpl.java

@@ -1,5 +1,6 @@
 package com.ai.lawyer.domain.poll.repository;
 
+import com.ai.lawyer.domain.member.entity.Member;
 import com.ai.lawyer.domain.poll.entity.Poll;
 import com.ai.lawyer.domain.poll.entity.QPoll;
 import com.ai.lawyer.domain.poll.entity.QPollOptions;
@@ -13,6 +14,11 @@
 
 import java.util.List;
 
+import com.ai.lawyer.domain.poll.dto.PollAgeStaticsDto.AgeGroupCountDto;
+import com.ai.lawyer.domain.poll.dto.PollGenderStaticsDto.GenderCountDto;
+import com.ai.lawyer.domain.poll.dto.PollTopDto;
+import com.ai.lawyer.domain.poll.dto.PollStaticsDto;
+
 @Repository
 @RequiredArgsConstructor
 public class PollVoteRepositoryImpl implements PollVoteRepositoryCustom {
@@ -23,19 +29,24 @@ public class PollVoteRepositoryImpl implements PollVoteRepositoryCustom {
     private final QMember member = QMember.member;
 
     @Override
-    public List<Object[]> findTopPollByStatus(Poll.PollStatus status) {
+    public List<PollTopDto> findTopPollByStatus(Poll.PollStatus status) {
         List<Tuple> tuples = queryFactory.select(poll.getPollId(), pollVote.count())
                 .from(pollVote)
                 .join(pollVote.getPoll(), poll)
                 .where(poll.getStatus().eq(status))
                 .groupBy(poll.getPollId())
                 .orderBy(pollVote.count().desc())
                 .fetch();
-        return tuples.stream().map(Tuple::toArray).toList();
+        return tuples.stream()
+                .map(t -> new PollTopDto(
+                        t.get(0, Long.class),
+                        t.get(1, Long.class)
+                ))
+                .toList();
     }
 
     @Override
-    public List<Object[]> findTopNPollByStatus(Poll.PollStatus status, Pageable pageable) {
+    public List<PollTopDto> findTopNPollByStatus(Poll.PollStatus status, Pageable pageable) {
         List<Tuple> tuples = queryFactory.select(poll.getPollId(), pollVote.count())
                 .from(pollVote)
                 .join(pollVote.getPoll(), poll)
@@ -45,7 +56,12 @@ public List<Object[]> findTopNPollByStatus(Poll.PollStatus status, Pageable page
                 .offset(pageable.getOffset())
                 .limit(pageable.getPageSize())
                 .fetch();
-        return tuples.stream().map(Tuple::toArray).toList();
+        return tuples.stream()
+                .map(t -> new PollTopDto(
+                        t.get(0, Long.class),
+                        t.get(1, Long.class)
+                ))
+                .toList();
     }
 
     @Override
@@ -67,19 +83,47 @@ public Long countByPollOptionId(Long pollOptionId) {
     }
 
     @Override
-    public List<Object[]> countStaticsByPollOptionIds(List<Long> pollOptionIds) {
-        List<Tuple> tuples = queryFactory.select(pollOptions.getPollItemsId(), member.getGender(), member.getAge(), pollVote.count())
+    public List<PollStaticsDto> countStaticsByPollOptionIds(List<Long> pollOptionIds) {
+        List<Tuple> tuples = queryFactory.select(
+                pollOptions.getPollItemsId(),
+                member.getGender(),
+                member.getAge(),
+                pollVote.count())
                 .from(pollVote)
                 .join(pollVote.getPollOptions(), pollOptions)
                 .join(pollVote.getMember(), member)
                 .where(pollOptions.getPollItemsId().in(pollOptionIds))
                 .groupBy(pollOptions.getPollItemsId(), member.getGender(), member.getAge())
                 .fetch();
-        return tuples.stream().map(Tuple::toArray).toList();
+        return tuples.stream()
+                .map(t -> {
+                    String gender = t.get(1, String.class);
+                    Integer age = t.get(2, Integer.class);
+                    String ageGroup = getAgeGroup(age);
+                    Long voteCount = t.get(3, Long.class);
+                    return PollStaticsDto.builder()
+                            .gender(gender)
+                            .ageGroup(ageGroup)
+                            .voteCount(voteCount)
+                            .build();
+                })
+                .toList();
+    }
+
+    private String getAgeGroup(Integer age) {
+        if (age == null) return "기타";
+        if (age < 20) return "10대";
+        if (age < 30) return "20대";
+        if (age < 40) return "30대";
+        if (age < 50) return "40대";
+        if (age < 60) return "50대";
+        if (age < 70) return "60대";
+        if (age < 80) return "70대";
+        return "80대 이상";
     }
 
     @Override
-    public List<Object[]> getOptionAgeStatics(Long pollId) {
+    public List<AgeGroupCountDto> getOptionAgeStatics(Long pollId) {
         List<Tuple> tuples = queryFactory.select(
                 pollOptions.getOption(),
                 new com.querydsl.core.types.dsl.CaseBuilder()
@@ -107,11 +151,17 @@ public List<Object[]> getOptionAgeStatics(Long pollId) {
                                 .when(member.getAge().lt(80)).then("70대")
                                 .otherwise("80대 이상"))
                 .fetch();
-        return tuples.stream().map(Tuple::toArray).toList();
+        return tuples.stream()
+                .map(t -> new AgeGroupCountDto(
+                        t.get(0, String.class),
+                        t.get(1, String.class),
+                        t.get(2, Long.class)
+                ))
+                .toList();
     }
 
     @Override
-    public List<Object[]> getOptionGenderStatics(Long pollId) {
+    public List<GenderCountDto> getOptionGenderStatics(Long pollId) {
         List<Tuple> tuples = queryFactory.select(
                 pollOptions.getOption(),
                 member.getGender(),
@@ -122,6 +172,12 @@ public List<Object[]> getOptionGenderStatics(Long pollId) {
                 .where(pollOptions.getPoll().getPollId().eq(pollId))
                 .groupBy(pollOptions.getOption(), member.getGender())
                 .fetch();
-        return tuples.stream().map(Tuple::toArray).toList();
+        return tuples.stream()
+                .map(t -> new GenderCountDto(
+                        t.get(0, String.class),
+                        t.get(1, Member.Gender.class).name(),
+                        t.get(2, Long.class)
+                ))
+                .toList();
     }
 }

backend/src/main/java/com/ai/lawyer/domain/poll/service/PollServiceImpl.java

@@ -1,8 +1,8 @@
 package com.ai.lawyer.domain.poll.service;
 
+import com.ai.lawyer.domain.poll.dto.*;
 import com.ai.lawyer.domain.poll.entity.*;
 import com.ai.lawyer.domain.poll.repository.*;
-import com.ai.lawyer.domain.poll.dto.PollDto;
 import com.ai.lawyer.domain.member.entity.Member;
 import com.ai.lawyer.domain.post.dto.PostDto;
 import com.ai.lawyer.domain.post.entity.Post;
@@ -16,21 +16,12 @@
 import org.springframework.web.server.ResponseStatusException;
 
 import java.util.*;
-import com.ai.lawyer.domain.poll.dto.PollCreateDto;
-import com.ai.lawyer.domain.poll.dto.PollForPostDto;
-import com.ai.lawyer.domain.poll.dto.PollOptionCreateDto;
-import com.ai.lawyer.domain.poll.dto.PollStaticsDto;
-import com.ai.lawyer.domain.poll.dto.PollOptionDto;
-import com.ai.lawyer.domain.poll.dto.PollVoteDto;
-import com.ai.lawyer.domain.poll.dto.PollUpdateDto;
+
 import com.ai.lawyer.domain.poll.entity.Poll;
 
 import org.springframework.data.domain.Pageable;
 import java.time.LocalDateTime;
 
-import com.ai.lawyer.domain.poll.dto.PollGenderStaticsDto;
-import com.ai.lawyer.domain.poll.dto.PollStaticsResponseDto;
-import com.ai.lawyer.domain.poll.dto.PollAgeStaticsDto;
 import com.ai.lawyer.global.util.AuthUtil;
 
 @Service
@@ -178,19 +169,12 @@ public PollStaticsResponseDto getPollStatics(Long pollId) {
             PollOptions opt = options.get(i);
             optionMap.put(opt.getOption(), opt);
         }
-        // age 통계 그룹핑
-        List<Object[]> optionAgeRaw = pollVoteRepository.getOptionAgeStatics(pollId);
+        List<PollAgeStaticsDto.AgeGroupCountDto> optionAgeRaw = pollVoteRepository.getOptionAgeStatics(pollId);
         java.util.Map<Long, java.util.List<PollAgeStaticsDto.AgeGroupCountDto>> ageGroupMap = new java.util.HashMap<>();
-        for (Object[] arr : optionAgeRaw) {
-            String option = arr[0] != null ? arr[0].toString() : null;
-            PollOptions opt = optionMap.get(option);
+        for (PollAgeStaticsDto.AgeGroupCountDto dto : optionAgeRaw) {
+            PollOptions opt = optionMap.get(dto.getOption());
             if (opt == null) continue;
             Long pollItemsId = opt.getPollItemsId();
-            PollAgeStaticsDto.AgeGroupCountDto dto = PollAgeStaticsDto.AgeGroupCountDto.builder()
-                    .option(option)
-                    .ageGroup(arr[1] != null ? arr[1].toString() : null)
-                    .voteCount(arr[2] != null ? ((Number) arr[2]).longValue() : 0L)
-                    .build();
             ageGroupMap.computeIfAbsent(pollItemsId, k -> new java.util.ArrayList<>()).add(dto);
         }
         java.util.List<PollAgeStaticsDto> optionAgeStatics = new java.util.ArrayList<>();
@@ -202,19 +186,12 @@ public PollStaticsResponseDto getPollStatics(Long pollId) {
                     .ageGroupCounts(ageGroupMap.getOrDefault(opt.getPollItemsId(), java.util.Collections.emptyList()))
                     .build());
         }
-        // gender 통계 그룹핑
-        List<Object[]> optionGenderRaw = pollVoteRepository.getOptionGenderStatics(pollId);
+        List<PollGenderStaticsDto.GenderCountDto> optionGenderRaw = pollVoteRepository.getOptionGenderStatics(pollId);
         java.util.Map<Long, java.util.List<PollGenderStaticsDto.GenderCountDto>> genderGroupMap = new java.util.HashMap<>();
-        for (Object[] arr : optionGenderRaw) {
-            String option = arr[0] != null ? arr[0].toString() : null;
-            PollOptions opt = optionMap.get(option);
+        for (PollGenderStaticsDto.GenderCountDto dto : optionGenderRaw) {
+            PollOptions opt = optionMap.get(dto.getOption());
             if (opt == null) continue;
             Long pollItemsId = opt.getPollItemsId();
-            PollGenderStaticsDto.GenderCountDto dto = PollGenderStaticsDto.GenderCountDto.builder()
-                    .option(option)
-                    .gender(arr[1] != null ? arr[1].toString() : null)
-                    .voteCount(arr[2] != null ? ((Number) arr[2]).longValue() : 0L)
-                    .build();
             genderGroupMap.computeIfAbsent(pollItemsId, k -> new java.util.ArrayList<>()).add(dto);
         }
         java.util.List<PollGenderStaticsDto> optionGenderStatics = new java.util.ArrayList<>();
@@ -236,7 +213,7 @@ public PollStaticsResponseDto getPollStatics(Long pollId) {
                 .build();
     }
 
-    // 최대 7일 동안 투표 가능 (초기 요구사항)
+    // 최대 7일 동안 투표 가능
     @Override
     public void closePoll(Long pollId) {
         Poll poll = pollRepository.findById(pollId)
@@ -268,7 +245,7 @@ public void deletePoll(Long pollId, Long memberId) {
 
     @Override
     public PollDto getTopPollByStatus(PollDto.PollStatus status, Long memberId) {
-        List<Object[]> result = pollVoteRepository.findTopPollByStatus(Poll.PollStatus.valueOf(status.name()));
+        List<PollTopDto> result = pollVoteRepository.findTopPollByStatus(Poll.PollStatus.valueOf(status.name()));
         if (result.isEmpty()) {
             // 종료된 투표가 없으면 빈 PollDto 반환
             return PollDto.builder()
@@ -282,18 +259,18 @@ public PollDto getTopPollByStatus(PollDto.PollStatus status, Long memberId) {
                     .totalVoteCount(0L)
                     .build();
         }
-        Long pollId = (Long) result.get(0)[0];
+        Long pollId = result.get(0).getPollId();
         return getPoll(pollId, memberId);
     }
 
     @Override
     public List<PollDto> getTopNPollsByStatus(PollDto.PollStatus status, int n, Long memberId) {
         Pageable pageable = org.springframework.data.domain.PageRequest.of(0, n);
-        List<Object[]> result = pollVoteRepository.findTopNPollByStatus(
+        List<PollTopDto> result = pollVoteRepository.findTopNPollByStatus(
                 com.ai.lawyer.domain.poll.entity.Poll.PollStatus.valueOf(status.name()), pageable);
         List<PollDto> pollDtos = new java.util.ArrayList<>();
-        for (Object[] row : result) {
-            Long pollId = (Long) row[0];
+        for (PollTopDto row : result) {
+            Long pollId = row.getPollId();
             pollDtos.add(status == PollDto.PollStatus.CLOSED
                     ? getPollWithStatistics(pollId, memberId)
                     : getPoll(pollId, memberId));
@@ -455,18 +432,8 @@ private PollDto convertToDto(Poll poll, Long memberId, boolean withStatistics) {
             }
             List<PollStaticsDto> statics = null;
             if (withStatistics && poll.getStatus() == Poll.PollStatus.CLOSED) {
-                List<Object[]> staticsRaw = pollVoteRepository.countStaticsByPollOptionIds(List.of(option.getPollItemsId()));
-                statics = staticsRaw.stream()
-                        .map(arr -> {
-                            String gender = arr[1] != null ? arr[1].toString() : null;
-                            Integer age = arr[2] != null ? ((Number) arr[2]).intValue() : null;
-                            String ageGroup = getAgeGroup(age);
-                            return PollStaticsDto.builder()
-                                    .gender(gender)
-                                    .ageGroup(ageGroup)
-                                    .voteCount((Long) arr[3])
-                                    .build();
-                        }).toList();
+                List<PollStaticsDto> staticsRaw = pollVoteRepository.countStaticsByPollOptionIds(List.of(option.getPollItemsId()));
+                statics = staticsRaw;
             }
             optionDtos.add(PollOptionDto.builder()
                     .pollItemsId(option.getPollItemsId())