refactor : 푼 문제 리스트도 반환 (#187)

Author: minjee2758

gradlew

@@ -5,6 +5,7 @@
 
 public record DailyCorrectCount(
     LocalDate date,
-    Long count,
+    int count,
     Set<Long> problemIds
-) {  }
+) {
+}

src/main/java/org/ezcode/codetest/domain/submission/dto/DailyCorrectCount.java

@@ -1,22 +1,25 @@
 package org.ezcode.codetest.infrastructure.persistence.repository.submission.query;
 
 
+import java.sql.Date;
 import java.time.LocalDate;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.ezcode.codetest.domain.submission.dto.DailyCorrectCount;
 import org.ezcode.codetest.domain.submission.model.entity.QUserProblemResult;
 import org.springframework.stereotype.Repository;
-
-import com.querydsl.core.group.GroupBy;
-import com.querydsl.core.types.Projections;
-import com.querydsl.core.types.dsl.NumberExpression;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @Repository
 @RequiredArgsConstructor
 public class UserProblemResultQueryRepositoryImpl implements UserProblemResultQueryRepository{
@@ -28,25 +31,34 @@ public List<DailyCorrectCount> countCorrectByUserGroupedByDate(Long userId) {
 
         QUserProblemResult upr = QUserProblemResult.userProblemResult;
 
-        var date = Expressions.dateTemplate(LocalDate.class, "DATE({0})", upr.modifiedAt);
-        NumberExpression<Long> countDistinctProblem = upr.problem.id.countDistinct();
+        var date = Expressions.dateTemplate(Date.class, "DATE({0})", upr.modifiedAt);
 
-        return queryFactory
+        var results = queryFactory
+            .select(date, upr.problem.id)
             .from(upr)
             .where(
                 upr.user.id.eq(userId),
                 upr.isCorrect.eq(true)
             )
             .orderBy(date.asc())
-            .transform(
-                GroupBy.groupBy(date).list(
-                    Projections.constructor(
-                        DailyCorrectCount.class,
-                        date,
-                        countDistinctProblem,
-                        GroupBy.set(upr.problem.id)
-                    )
+            .fetch();
+
+        Map<LocalDate, Set<Long>> problemIdsByDate = results.stream()
+            .collect(Collectors.groupingBy(
+                tuple -> Objects.requireNonNull(tuple.get(0, Date.class)).toLocalDate(),
+                LinkedHashMap::new,
+                Collectors.mapping(
+                    tuple -> tuple.get(1, Long.class),
+                    Collectors.toSet()
                 )
-            );
+            ));
+
+        return problemIdsByDate.entrySet().stream()
+            .map(entry -> new DailyCorrectCount(
+                entry.getKey(),
+                entry.getValue().size(),
+                entry.getValue()
+            ))
+            .collect(Collectors.toList());
     }
 }