Merge pull request #144 from Team-Umbba/feat/#123-reroll_question

[FEAT] 질문 새로고침 구현
Team-Umbba · Mar 28, 2024 · 0284a50 · 0284a50
2 parents db17b9a + faf6494
commit 0284a50
Show file tree

Hide file tree

Showing 14 changed files with 193 additions and 37 deletions.
diff --git a/umbba-api/src/main/java/sopt/org/umbba/api/controller/advice/ControllerExceptionAdvice.java b/umbba-api/src/main/java/sopt/org/umbba/api/controller/advice/ControllerExceptionAdvice.java
@@ -198,11 +198,8 @@ protected ResponseEntity<ApiResponse> handleCustomException(CustomException e, f
 
         if (e.getHttpStatus() == 501) {
             notificationService.sendExceptionToSlack(e, request);
-            return ResponseEntity.status(e.getHttpStatus())
-                    .body(ApiResponse.error(ErrorType.NEED_MORE_QUESTION));
-        } else {
-            return ResponseEntity.status(e.getHttpStatus())
-                    .body(ApiResponse.error(e.getErrorType(), e.getMessage()));
         }
+        return ResponseEntity.status(e.getHttpStatus())
+                    .body(ApiResponse.error(e.getErrorType(), e.getMessage()));
     }
 }
diff --git a/...in/java/sopt/org/umbba/api/controller/closer/dto/request/TodayCloserAnswerRequestDto.java b/...in/java/sopt/org/umbba/api/controller/closer/dto/request/TodayCloserAnswerRequestDto.java
@@ -12,15 +12,10 @@
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class TodayCloserAnswerRequestDto {
 
     @Min(value = 1, message = "답변은 1 혹은 2여야 합니다.")
     @Max(value = 2, message = "답변은 1 혹은 2여야 합니다.")
     int answer;
-
-    public static TodayCloserAnswerRequestDto of (int answer) {
-        return new TodayCloserAnswerRequestDto(answer);
-    }
 }
diff --git a/umbba-api/src/main/java/sopt/org/umbba/api/controller/qna/QnAController.java b/umbba-api/src/main/java/sopt/org/umbba/api/controller/qna/QnAController.java
@@ -6,6 +6,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import sopt.org.umbba.api.config.jwt.JwtProvider;
+import sopt.org.umbba.api.controller.qna.dto.request.RerollChangeRequestDto;
 import sopt.org.umbba.api.controller.qna.dto.request.TodayAnswerRequestDto;
 import sopt.org.umbba.api.controller.qna.dto.response.*;
 import sopt.org.umbba.api.service.qna.QnAService;
@@ -33,8 +34,8 @@ public ApiResponse<TodayQnAResponseDto> getTodayQna(Principal principal) {
     @PostMapping("/qna/answer")
     @ResponseStatus(HttpStatus.CREATED)
     public ApiResponse answerTodayQuestion(
-            Principal principal,
-            @Valid @RequestBody final TodayAnswerRequestDto request) {
+        Principal principal,
+        @Valid @RequestBody final TodayAnswerRequestDto request) {
 
         qnAService.answerTodayQuestion(JwtProvider.getUserFromPrincial(principal), request);
 
@@ -45,7 +46,7 @@ public ApiResponse answerTodayQuestion(
     @GetMapping("/qna/answer/remind")
     @ResponseStatus(HttpStatus.OK)
     public ApiResponse remindQuestion(
-            Principal principal) {
+        Principal principal) {
 
         qnAService.remindQuestion(JwtProvider.getUserFromPrincial(principal));
 
@@ -55,21 +56,21 @@ public ApiResponse remindQuestion(
     @GetMapping("/qna/list/{sectionId}")
     @ResponseStatus(HttpStatus.OK)
     public ApiResponse<List<QnAListResponseDto>> getQnaList(
-            Principal principal,
-            @PathVariable(name = "sectionId") Long sectionId) {
+        Principal principal,
+        @PathVariable(name = "sectionId") Long sectionId) {
 
         return ApiResponse.success(SuccessType.GET_QNA_LIST_SUCCESS,
-                qnAService.getQnaList(JwtProvider.getUserFromPrincial(principal), sectionId));
+            qnAService.getQnaList(JwtProvider.getUserFromPrincial(principal), sectionId));
     }
 
     @GetMapping("/qna/{qnaId}")
     @ResponseStatus(HttpStatus.OK)
     public ApiResponse<SingleQnAResponseDto> getSingleQna(
-            Principal principal,
-            @PathVariable(name = "qnaId") Long qnaId) {
+        Principal principal,
+        @PathVariable(name = "qnaId") Long qnaId) {
 
         return ApiResponse.success(SuccessType.GET_SINGLE_QNA_SUCCESS,
-                qnAService.getSingleQna(JwtProvider.getUserFromPrincial(principal), qnaId));
+            qnAService.getSingleQna(JwtProvider.getUserFromPrincial(principal), qnaId));
     }
 
     @PatchMapping("/qna/restart")
@@ -106,4 +107,16 @@ public ApiResponse<FirstEntryResponseDto> firstEntry(Principal principal) {
         return ApiResponse.success(SuccessType.GET_USER_FIRST_ENTRY_SUCCESS, qnAService.updateUserFirstEntry(getUserFromPrincial(principal)));
     }
 
+    @GetMapping("/reroll/check")
+    @ResponseStatus(HttpStatus.OK)
+    public ApiResponse<RerollCheckResponseDto> rerollCheck(Principal principal) {
+        return ApiResponse.success(SuccessType.GET_REROLL_CHECK_SUCCESS, qnAService.rerollCheck(getUserFromPrincial(principal)));
+    }
+
+    @PatchMapping("/reroll/change")
+    @ResponseStatus(HttpStatus.OK)
+    public ApiResponse rerollChange(Principal principal, @RequestBody RerollChangeRequestDto request) {
+        qnAService.rerollChange(getUserFromPrincial(principal), request.getQuestionId());
+        return ApiResponse.success(SuccessType.REROLL_CHANGE_SUCCESS);
+    }
 }
diff --git a/...i/src/main/java/sopt/org/umbba/api/controller/qna/dto/request/RerollChangeRequestDto.java b/...i/src/main/java/sopt/org/umbba/api/controller/qna/dto/request/RerollChangeRequestDto.java
@@ -0,0 +1,15 @@
+package sopt.org.umbba.api.controller.qna.dto.request;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class RerollChangeRequestDto {
+
+    Long questionId;
+}
diff --git a/...pi/src/main/java/sopt/org/umbba/api/controller/qna/dto/request/TodayAnswerRequestDto.java b/...pi/src/main/java/sopt/org/umbba/api/controller/qna/dto/request/TodayAnswerRequestDto.java
@@ -8,14 +8,9 @@
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class TodayAnswerRequestDto {
 
     @NotBlank // null, "", " "을 모두 허용하지 X
     String answer;
-
-    public static TodayAnswerRequestDto of (String answer) {
-        return new TodayAnswerRequestDto(answer);
-    }
 }
diff --git a/.../src/main/java/sopt/org/umbba/api/controller/qna/dto/response/RerollCheckResponseDto.java b/.../src/main/java/sopt/org/umbba/api/controller/qna/dto/response/RerollCheckResponseDto.java
@@ -0,0 +1,30 @@
+package sopt.org.umbba.api.controller.qna.dto.response;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Builder;
+import lombok.Getter;
+import sopt.org.umbba.domain.domain.qna.QnA;
+import sopt.org.umbba.domain.domain.qna.Question;
+
+@Getter
+@Builder
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class RerollCheckResponseDto {
+
+    private Long questionId;
+    private String childQuestion;
+    private String parentQuestion;
+    private String section;
+    private String topic;
+
+    public static RerollCheckResponseDto of(Question question) {
+        return RerollCheckResponseDto.builder()
+            .questionId(question.getId())
+            .childQuestion(question.getChildQuestion())
+            .parentQuestion(question.getParentQuestion())
+            .section(question.getSection().getValue())
+            .topic(question.getTopic())
+            .build();
+    }
+}
diff --git a/umbba-api/src/main/java/sopt/org/umbba/api/service/closer/CloserService.java b/umbba-api/src/main/java/sopt/org/umbba/api/service/closer/CloserService.java
@@ -71,7 +71,7 @@ public TodayCloserQnAResponseDto getTodayCloserQnA(Long userId) {
     @Transactional
     public void addFirstCloserQnA(Parentchild parentchild) {
         CloserQuestion firstCloserQuestion = closerQuestionRepository.findRandomExceptIds(new ArrayList<>())
-                .orElseThrow(() -> new CustomException(ErrorType.NOT_FOUND_CLOSER_QUESTION));
+                .orElseThrow(() -> new CustomException(ErrorType.NO_MORE_CLOSER_QUESTION));
 
         CloserQnA newCloserQnA = CloserQnA.builder()
                 .closerQuestion(firstCloserQuestion)
@@ -117,7 +117,7 @@ public void passToNextCloserQnA(Long userId) {
             } else if (parentchild.getCloserChildCount() == parentchild.getCloserParentCount()) {
                 parentchild.addCloserChildCount();
                 CloserQuestion newCloserQuestion = closerQuestionRepository.findRandomExceptIds(getCloserQuestionIds(parentchild))
-                        .orElseThrow(() -> new CustomException(ErrorType.NOT_FOUND_CLOSER_QUESTION));
+                        .orElseThrow(() -> new CustomException(ErrorType.NO_MORE_CLOSER_QUESTION));
                 CloserQnA newCloserQnA = CloserQnA.builder()
                         .closerQuestion(newCloserQuestion)
                         .isParentAnswer(false)
@@ -134,7 +134,7 @@ public void passToNextCloserQnA(Long userId) {
             } else if (parentchild.getCloserParentCount() == parentchild.getCloserChildCount()) {
                 parentchild.addCloserParentCount();
                 CloserQuestion newCloserQuestion = closerQuestionRepository.findRandomExceptIds(getCloserQuestionIds(parentchild))
-                        .orElseThrow(() -> new CustomException(ErrorType.NOT_FOUND_CLOSER_QUESTION));
+                        .orElseThrow(() -> new CustomException(ErrorType.NO_MORE_CLOSER_QUESTION));
                 CloserQnA newCloserQnA = CloserQnA.builder()
                         .closerQuestion(newCloserQuestion)
                         .isParentAnswer(false)

diff --git a/umbba-api/src/main/java/sopt/org/umbba/api/service/qna/QnAService.java b/umbba-api/src/main/java/sopt/org/umbba/api/service/qna/QnAService.java
@@ -26,6 +26,8 @@
 
 import javax.validation.constraints.NotNull;
 
+import java.time.Duration;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
@@ -252,7 +254,7 @@ public void filterAllQuestion(Long userId) {
         // 가까워지기 QnA도 추가
         if (parentchild.getCloserQnaList().isEmpty()) {
             CloserQuestion firstCloserQuestion = closerQuestionRepository.findRandomExceptIds(new ArrayList<>())
-                    .orElseThrow(() -> new CustomException(ErrorType.NOT_FOUND_CLOSER_QUESTION));
+                    .orElseThrow(() -> new CustomException(ErrorType.NO_MORE_CLOSER_QUESTION));
 
             CloserQnA newCloserQnA = CloserQnA.builder()
                     .closerQuestion(firstCloserQuestion)
@@ -452,6 +454,9 @@ public void restartQna(Long userId) {
                 .map(qna -> qna.getQuestion().getId())
                 .collect(Collectors.toList());
 
+        // 2.5 새로고침으로 버린 블랙리스트 질문 제외하기
+        doneQuestionIds.addAll(parentchild.getQuestionBlackList());
+
         // 5. 이 경우 아예 추가될 질문이 없으므로 예외 발생시킴
         List<Question> targetQuestions = questionRepository.findByTypeInAndIdNotIn(types, doneQuestionIds);
         if (targetQuestions.isEmpty()) {
@@ -460,8 +465,8 @@ public void restartQna(Long userId) {
 
         QuestionSection section = qnaList.get(parentchild.getCount() - 1).getQuestion().getSection();
         List<Question> differentSectionQuestions = targetQuestions.stream()
-                .filter(question -> !question.getSection().equals(section))
-                .collect(Collectors.toList());
+            .filter(question -> !question.getSection().equals(section))
+            .collect(Collectors.toList());
 
         Random random = new Random();
         Question randomQuestion;
@@ -471,8 +476,8 @@ public void restartQna(Long userId) {
         } else {
             // 4. 없다면 동일한 section의 질문 중에서라도 랜덤하게 추출
             List<Question> equalSectionQuestions = targetQuestions.stream()
-                    .filter(question -> !question.getSection().equals(section))
-                    .collect(Collectors.toList());
+                .filter(question -> question.getSection().equals(section))
+                .collect(Collectors.toList());
             randomQuestion = equalSectionQuestions.get(random.nextInt(equalSectionQuestions.size()));
         }
 
@@ -487,6 +492,87 @@ public void restartQna(Long userId) {
         parentchild.addCount();
     }
 
+    public RerollCheckResponseDto rerollCheck(Long userId) {
+        User user = getUserById(userId);
+        Parentchild parentchild = user.getParentChild();
+
+        // 7일 이후가 아닌 경우 질문 새로고침 불가능
+        if (parentchild.getCount() <= 7) {
+            throw new CustomException(ErrorType.INVALID_REROLL_BEFORE_SEVEN);
+        }
+        // 답변이 진행됐을 경우 질문 새로고침 불가능
+        List<QnA> qnaList = parentchild.getQnaList();
+        QnA currentQnA = qnaList.get(parentchild.getCount() - 1);
+        if (currentQnA.isParentAnswer() || currentQnA.isChildAnswer()) {
+            throw new CustomException(ErrorType.INVALID_REROLL_AFTER_ANSWER);
+        }
+
+        // 1. 메인 타입과 미사용 타입에 대해서 불러오기
+        List<QuestionType> types = Arrays.asList(MAIN, YET);
+
+        // 2. 내가 이미 주고받은 질문 제외하기
+        List<Long> doneQuestionIds = qnaList.stream()
+            .map(qna -> qna.getQuestion().getId())
+            .collect(Collectors.toList());
+
+        // 2.5 새로고침으로 버린 블랙리스트 질문 제외하기
+        doneQuestionIds.addAll(parentchild.getQuestionBlackList());
+
+        // 5. 이 경우 아예 추가될 질문이 없으므로 예외 발생시킴
+        List<Question> targetQuestions = questionRepository.findByTypeInAndIdNotIn(types, doneQuestionIds);
+        if (targetQuestions.isEmpty()) {
+            throw new CustomException(NEED_MORE_QUESTION);
+        }
+
+        QuestionSection section = qnaList.get(parentchild.getCount() - 1).getQuestion().getSection();
+        List<Question> equalSectionQuestions = targetQuestions.stream()
+            .filter(question -> question.getSection().equals(section))
+            .collect(Collectors.toList());
+
+        Random random = new Random();
+        Question randomQuestion;
+        if (!equalSectionQuestions.isEmpty()) {
+            // 3. 최근에 주고받은 질문의 section과 같은 질문들 중에서 랜덤하게 추출
+            randomQuestion = equalSectionQuestions.get(random.nextInt(equalSectionQuestions.size()));
+        } else {
+            // 4. 없다면 다른 section의 질문 중에서라도 랜덤하게 추출
+            List<Question> differentSectionQuestions = targetQuestions.stream()
+                .filter(question -> !question.getSection().equals(section))
+                .collect(Collectors.toList());
+            randomQuestion = differentSectionQuestions.get(random.nextInt(differentSectionQuestions.size()));
+        }
+
+        return RerollCheckResponseDto.of(randomQuestion);
+    }
+
+    @Transactional
+    public void rerollChange(Long userId, Long questionId) {
+        User user = getUserById(userId);
+        Question question = questionRepository.findById(questionId)
+            .orElseThrow(() -> new CustomException(ErrorType.NOT_FOUND_QUESTION));
+
+        // 하루에 한번만 질문 새로고침 가능
+        LocalDateTime lastRerollChange = user.getLastRerollChange();
+        LocalDateTime now = LocalDateTime.now();
+        if (lastRerollChange != null) {
+            Duration duration = Duration.between(lastRerollChange, now);
+            long hoursPassed = duration.toHours();
+
+            if (hoursPassed < 24) {
+                throw new CustomException(ErrorType.INVALID_REROLL_ONCE_A_DAY);
+            }
+        }
+
+        Parentchild parentchild = user.getParentChild();
+        List<QnA> qnaList = parentchild.getQnaList();
+        QnA currentQnA = qnaList.get(parentchild.getCount() - 1);
+
+        // 새로고침으로 버린 질문은 블랙리스트에 추가
+        parentchild.addQuestionBlackList(currentQnA.getQuestion().getId());
+        currentQnA.changeQuestion(question);
+        user.updateLastRerollChange();
+    }
+
     @NotNull
     private Parentchild getParentchild(Long userId) {
         Parentchild parentchild = getUserById(userId).getParentChild();

diff --git a/umbba-common/src/main/java/sopt/org/umbba/common/exception/ErrorType.java b/umbba-common/src/main/java/sopt/org/umbba/common/exception/ErrorType.java
@@ -40,6 +40,12 @@ public enum ErrorType {
     // Closer
     INVALID_COUNT_STATUS(HttpStatus.BAD_REQUEST, "count 조건으로 인해 다음 가까워지기 질문으로 넘어갈 수 없습니다."),
 
+    // Reroll
+    INVALID_REROLL_BEFORE_SEVEN(HttpStatus.BAD_REQUEST, "7일 이후에만 질문 새로고침을 할 수 있습니다."),
+    INVALID_REROLL_AFTER_ANSWER(HttpStatus.BAD_REQUEST, "답변이 진행되기 이전에만 질문 새로고침을 할 수 있습니다."),
+    INVALID_REROLL_ONCE_A_DAY(HttpStatus.BAD_REQUEST, "하루에 한번만 질문 새로고침을 할 수 있습니다."),
+
+
     /**
      * 401 UNAUTHORIZED
      */
@@ -67,7 +73,7 @@ public enum ErrorType {
     PARENTCHILD_HAVE_NO_OPPONENT(HttpStatus.NOT_FOUND, "부모자식 관계에 1명만 참여하고 있습니다."),
     NOT_FOUND_SECTION(HttpStatus.NOT_FOUND, "해당 아이디와 일치하는 섹션이 없습니다."),
     NOT_FOUND_ALBUM(HttpStatus.NOT_FOUND, "존재하지 않는 앨범입니다."),
-    NOT_FOUND_CLOSER_QUESTION(HttpStatus.NOT_FOUND, "일치하는 가까워지기 질문이 없습니다."),
+    NOT_FOUND_QUESTION(HttpStatus.NOT_FOUND, "해당 아이디와 일치하는 Question 데이터가 없습니다."),
 
     /**
      * About Apple (HttpStatus 고민)
@@ -105,9 +111,8 @@ public enum ErrorType {
      * 501 NOT_IMPLEMENTED
      */
     NEED_MORE_QUESTION(HttpStatus.NOT_IMPLEMENTED, "남은 질문이 없습니다. 질문을 추가해주세요."),
+    NO_MORE_CLOSER_QUESTION(HttpStatus.NOT_IMPLEMENTED, "남은 가까워지기 질문이 없습니다."),
     MAX_LIMIT_ALBUM_UPLOAD(HttpStatus.NOT_IMPLEMENTED, "한 부모자식마다 최대 15개의 업로드까지만 허용합니다."),
-
-
     ;
 
     private final HttpStatus httpStatus;

diff --git a/umbba-common/src/main/java/sopt/org/umbba/common/exception/SuccessType.java b/umbba-common/src/main/java/sopt/org/umbba/common/exception/SuccessType.java
@@ -36,6 +36,8 @@ public enum SuccessType {
     GET_TODAY_CLOSER_QNA_SUCCESS(HttpStatus.OK, "오늘의 가까워지기 문답 조회에 성공했습니다."),
     ANSWER_TODAY_CLOSER_QUESTION_SUCCESS(HttpStatus.OK, "오늘의 가까워지기 문답에 답변을 완료하였습니다."),
     PASS_TO_NEXT_CLOSER_QUESTION_SUCCESS(HttpStatus.OK, "다음 가까워지기 문답으로 넘어가는 데에 성공했습니다."),
+    GET_REROLL_CHECK_SUCCESS(HttpStatus.OK, "새로고침 할 수 있는 질문 조회에 성공했습니다."),
+    REROLL_CHANGE_SUCCESS(HttpStatus.OK, "질문 새로고침이 완료되었습니다."),
 
     /**
      * 201 CREATED

diff --git a/...rc/main/java/sopt/org/umbba/domain/domain/closer/repository/CloserQuestionRepository.java b/...rc/main/java/sopt/org/umbba/domain/domain/closer/repository/CloserQuestionRepository.java
@@ -18,7 +18,7 @@ default Optional<CloserQuestion> findRandomExceptIds(List<Long> ids) {
         List<CloserQuestion> allQuestions = findAll();
 
         if (allQuestions.isEmpty()) {
-            throw new CustomException(ErrorType.NOT_FOUND_CLOSER_QUESTION);
+            throw new CustomException(ErrorType.NO_MORE_CLOSER_QUESTION);
         }
         if (ids.isEmpty()) {
             int randomIndex = random.nextInt(allQuestions.size());

diff --git a/umbba-domain/src/main/java/sopt/org/umbba/domain/domain/parentchild/Parentchild.java b/umbba-domain/src/main/java/sopt/org/umbba/domain/domain/parentchild/Parentchild.java
@@ -39,6 +39,14 @@ public class Parentchild extends AuditingTimeEntity {
     @OneToMany(mappedBy = "parentchild", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
     private final List<Album> albumList = new ArrayList<>();
 
+    @Column(name = "question_id", nullable = false)
+    @ElementCollection
+    private List<Long> questionBlackList;
+
+    public void addQuestionBlackList(Long questionId) {
+        questionBlackList.add(questionId);
+    }
+
     @Column(nullable = false)
     private int count;