[FEATURE] 유저의 데일리 질문을 월별로 조회할 수 있도록 변경 (#110)

* feat : 유저가 남긴 데일리 답변의 개수를 모든 카테고리별로 조회하도록 변경 #107 * spotless Apply #107 * feat : 유저가 남긴 데일리 답변을 월별로 조회하도록 변경 #107 * edit : 어노테이션 삭제 #107 * spotless Apply #107
Team-TIFY · Nov 24, 2023 · 476d587 · 476d587
1 parent e3fcd0c
commit 476d587
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 43 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -41,4 +41,6 @@ out/
 
 Domain/src/main/generated/**/*.java
 
-.DS_Store
+.DS_Store
+
+AuthKey_N47B75FLFP.p8
diff --git a/Api/src/main/java/tify/server/api/user/controller/UserController.java b/Api/src/main/java/tify/server/api/user/controller/UserController.java
@@ -239,15 +239,12 @@ public Long getMyDailyQuestionCountList(
         return retrieveMyDailyAnswerUseCase.countByCategory(userId, dailyQuestionCategory);
     }
 
-    @Operation(summary = "유저가 답변한 데일리 질문에 대한 답변을 카테고리별로 조회합니다.")
+    @Operation(summary = "유저가 답변한 데일리 질문에 대한 답변을 월별로 카테고리를 이용해 조회합니다.")
     @GetMapping("/daily-answer/{userId}")
-    public SliceResponse<MyDailyQuestionAnswerVo> getMyDailyAnswerList(
-            @PathVariable Long userId,
-            @RequestParam DailyQuestionCategory dailyQuestionCategory,
-            @ParameterObject @PageableDefault Pageable pageable) {
+    public List<List<MyDailyQuestionAnswerVo>> getMyDailyAnswerList(
+            @PathVariable Long userId, @RequestParam DailyQuestionCategory dailyQuestionCategory) {
 
-        return SliceResponse.of(
-                retrieveMyDailyAnswerUseCase.execute(userId, dailyQuestionCategory, pageable));
+        return retrieveMyDailyAnswerUseCase.execute(userId, dailyQuestionCategory);
     }
 
     @Operation(summary = "새로운 친구 목록을 조회합니다.")

diff --git a/Api/src/main/java/tify/server/api/user/model/dto/vo/MyDailyQuestionAnswerVo.java b/Api/src/main/java/tify/server/api/user/model/dto/vo/MyDailyQuestionAnswerVo.java
@@ -11,7 +11,10 @@
 @Builder
 public class MyDailyQuestionAnswerVo {
 
-    @Schema(description = "답변한 날짜입니다.", example = "20000101")
+    @Schema(description = "답변한 월입니다.", example = "1")
+    private final int month;
+
+    @Schema(description = "답변한 날짜입니다.", example = "2023-08-22T01:46:30.000+00:00")
     private final Timestamp answerTime;
 
     @Schema(description = "질문의 id(pk)값입니다.", example = "1")
@@ -28,7 +31,8 @@ public class MyDailyQuestionAnswerVo {
 
     public static MyDailyQuestionAnswerVo from(DailyQuestionAnswerVo dailyQuestionAnswerVo) {
         return MyDailyQuestionAnswerVo.builder()
-                .answerTime(dailyQuestionAnswerVo.getDailyQuestion().getCreatedAt())
+                .month(dailyQuestionAnswerVo.getMonth())
+                .answerTime(dailyQuestionAnswerVo.getAnswer().getCreatedAt())
                 .questionId(dailyQuestionAnswerVo.getDailyQuestion().getId())
                 .question(dailyQuestionAnswerVo.getDailyQuestion().getContent())
                 .answerId(dailyQuestionAnswerVo.getAnswer().getId())

diff --git a/Api/src/main/java/tify/server/api/user/service/RetrieveMyDailyAnswerUseCase.java b/Api/src/main/java/tify/server/api/user/service/RetrieveMyDailyAnswerUseCase.java
@@ -4,8 +4,6 @@
 import java.util.Arrays;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Slice;
 import tify.server.api.user.model.dto.vo.MyDailyQuestionAnswerVo;
 import tify.server.api.user.model.dto.vo.UserDailyQuestionAnswerVo;
 import tify.server.core.annotation.UseCase;
@@ -18,11 +16,11 @@ public class RetrieveMyDailyAnswerUseCase {
 
     private final AnswerAdaptor answerAdaptor;
 
-    public Slice<MyDailyQuestionAnswerVo> execute(
-            Long userId, DailyQuestionCategory dailyQuestionCategory, Pageable pageable) {
-        return answerAdaptor
-                .searchMyAnswer(userId, dailyQuestionCategory, pageable)
-                .map(MyDailyQuestionAnswerVo::from);
+    public List<List<MyDailyQuestionAnswerVo>> execute(
+            Long userId, DailyQuestionCategory dailyQuestionCategory) {
+        return answerAdaptor.searchMyAnswer(userId, dailyQuestionCategory).stream()
+                .map(list -> list.stream().map(MyDailyQuestionAnswerVo::from).toList())
+                .toList();
     }
 
     public List<UserDailyQuestionAnswerVo> countByAllCategory(Long userId) {

diff --git a/Domain/src/main/java/tify/server/domain/domains/question/adaptor/AnswerAdaptor.java b/Domain/src/main/java/tify/server/domain/domains/question/adaptor/AnswerAdaptor.java
@@ -1,10 +1,10 @@
 package tify.server.domain.domains.question.adaptor;
 
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import tify.server.core.annotation.Adaptor;
 import tify.server.domain.domains.question.domain.Answer;
@@ -46,9 +46,13 @@ public Slice<AnswerVo> searchAnswer(Long userId, AnswerCondition answerCondition
         return answerRepository.searchToPage(userId, answerCondition);
     }
 
-    public Slice<DailyQuestionAnswerVo> searchMyAnswer(
-            Long userId, DailyQuestionCategory dailyQuestionCategory, Pageable pageable) {
-        return answerRepository.searchMyAnswerToPage(userId, dailyQuestionCategory, pageable);
+    public List<List<DailyQuestionAnswerVo>> searchMyAnswer(
+            Long userId, DailyQuestionCategory dailyQuestionCategory) {
+        List<List<DailyQuestionAnswerVo>> list = new ArrayList<>();
+        for (int i = 1; i <= 12; i++) {
+            list.add(answerRepository.searchMyAnswerToPage(userId, dailyQuestionCategory, i));
+        }
+        return list;
     }
 
     public Long queryUserAnswerCountByDailyQuestionCategory(

diff --git a/...in/src/main/java/tify/server/domain/domains/question/dto/model/DailyQuestionAnswerVo.java b/...in/src/main/java/tify/server/domain/domains/question/dto/model/DailyQuestionAnswerVo.java
@@ -10,6 +10,8 @@
 @AllArgsConstructor
 public class DailyQuestionAnswerVo {
 
+    private int month;
+
     private DailyQuestion dailyQuestion;
 
     private Answer answer;

diff --git a/.../src/main/java/tify/server/domain/domains/question/repository/AnswerCustomRepository.java b/.../src/main/java/tify/server/domain/domains/question/repository/AnswerCustomRepository.java
@@ -2,7 +2,6 @@
 
 
 import java.util.List;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import tify.server.domain.domains.question.domain.DailyQuestionCategory;
 import tify.server.domain.domains.question.dto.condition.AnswerCondition;
@@ -17,6 +16,6 @@ public interface AnswerCustomRepository {
 
     Long countMyAnswerByDailyQuestionCategory(Long userId, List<Long> dailyQuestionIdList);
 
-    Slice<DailyQuestionAnswerVo> searchMyAnswerToPage(
-            Long userId, DailyQuestionCategory dailyQuestionCategory, Pageable pageable);
+    List<DailyQuestionAnswerVo> searchMyAnswerToPage(
+            Long userId, DailyQuestionCategory dailyQuestionCategory, int month);
 }
diff --git a/.../main/java/tify/server/domain/domains/question/repository/AnswerCustomRepositoryImpl.java b/.../main/java/tify/server/domain/domains/question/repository/AnswerCustomRepositoryImpl.java
@@ -10,7 +10,6 @@
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import tify.server.domain.common.util.SliceUtil;
 import tify.server.domain.domains.question.domain.DailyQuestionCategory;
@@ -67,24 +66,24 @@ public Long countMyAnswerByDailyQuestionCategory(Long userId, List<Long> dailyQu
     }
 
     @Override
-    public Slice<DailyQuestionAnswerVo> searchMyAnswerToPage(
-            Long userId, DailyQuestionCategory dailyQuestionCategory, Pageable pageable) {
+    public List<DailyQuestionAnswerVo> searchMyAnswerToPage(
+            Long userId, DailyQuestionCategory dailyQuestionCategory, int month) {
 
-        List<DailyQuestionAnswerVo> dailyQuestionAnswerVoList =
-                queryFactory
-                        .select(
-                                Projections.constructor(
-                                        DailyQuestionAnswerVo.class, dailyQuestion, answer))
-                        .from(answer)
-                        .join(dailyQuestion)
-                        .on(answer.questionId.eq(dailyQuestion.id))
-                        .where(
-                                answer.userId.eq(userId),
-                                dailyQuestion.category.eq(dailyQuestionCategory))
-                        .offset(pageable.getOffset())
-                        .limit(pageable.getPageSize() + 1)
-                        .fetch();
-
-        return SliceUtil.valueOf(dailyQuestionAnswerVoList, pageable);
+        return queryFactory
+                .select(
+                        Projections.constructor(
+                                DailyQuestionAnswerVo.class,
+                                answer.createdAt.month(),
+                                dailyQuestion,
+                                answer))
+                .from(answer)
+                .join(dailyQuestion)
+                .on(answer.questionId.eq(dailyQuestion.id))
+                .where(
+                        answer.userId.eq(userId),
+                        dailyQuestion.category.eq(dailyQuestionCategory),
+                        answer.createdAt.month().eq(month))
+                .orderBy(answer.createdAt.desc())
+                .fetch();
     }
 }