NBC-finalProject
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 1 addition & 0 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎cs25-batch/src/main/java/com/example/cs25batch/batch/service/TodayQuizService.java‎
Lines changed: 28 additions & 27 deletions b/‎cs25-batch/src/main/java/com/example/cs25batch/batch/service/TodayQuizService.java‎
Lines changed: 28 additions & 27 deletions
diff --git a/‎cs25-batch/src/main/resources/application.properties‎
Lines changed: 2 additions & 1 deletion b/‎cs25-batch/src/main/resources/application.properties‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎cs25-common/src/main/resources/application.properties‎
Lines changed: 2 additions & 1 deletion b/‎cs25-common/src/main/resources/application.properties‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎cs25-entity/src/main/java/com/example/cs25entity/domain/quiz/exception/QuizExceptionCode.java‎
Lines changed: 1 addition & 1 deletion b/‎cs25-entity/src/main/java/com/example/cs25entity/domain/quiz/exception/QuizExceptionCode.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎cs25-entity/src/main/java/com/example/cs25entity/domain/quiz/repository/QuizCustomRepositoryImpl.java‎
Lines changed: 2 additions & 13 deletions b/‎cs25-entity/src/main/java/com/example/cs25entity/domain/quiz/repository/QuizCustomRepositoryImpl.java‎
Lines changed: 2 additions & 13 deletions
diff --git a/‎cs25-entity/src/main/java/com/example/cs25entity/domain/user/exception/UserExceptionCode.java‎
Lines changed: 1 addition & 1 deletion b/‎cs25-entity/src/main/java/com/example/cs25entity/domain/user/exception/UserExceptionCode.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎cs25-entity/src/main/java/com/example/cs25entity/domain/user/repository/UserRepository.java‎
Lines changed: 3 additions & 6 deletions b/‎cs25-entity/src/main/java/com/example/cs25entity/domain/user/repository/UserRepository.java‎
Lines changed: 3 additions & 6 deletions
diff --git a/‎cs25-entity/src/main/java/com/example/cs25entity/domain/userQuizAnswer/exception/UserQuizAnswerExceptionCode.java‎
Lines changed: 6 additions & 5 deletions b/‎cs25-entity/src/main/java/com/example/cs25entity/domain/userQuizAnswer/exception/UserQuizAnswerExceptionCode.java‎
Lines changed: 6 additions & 5 deletions
diff --git a/‎cs25-entity/src/main/java/com/example/cs25entity/domain/userQuizAnswer/repository/UserQuizAnswerCustomRepository.java‎
Lines changed: 4 additions & 1 deletion b/‎cs25-entity/src/main/java/com/example/cs25entity/domain/userQuizAnswer/repository/UserQuizAnswerCustomRepository.java‎
Lines changed: 4 additions & 1 deletion
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - dev
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
 
@@ -10,9 +10,9 @@
 import com.example.cs25entity.domain.subscription.repository.SubscriptionRepository;
 import com.example.cs25entity.domain.userQuizAnswer.entity.UserQuizAnswer;
 import com.example.cs25entity.domain.userQuizAnswer.repository.UserQuizAnswerRepository;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -37,23 +37,24 @@ public Quiz getTodayQuizBySubscription(Subscription subscription) {
         Long parentCategoryId = subscription.getCategory().getId(); // 대분류 ID
         Long subscriptionId = subscription.getId();
 
-        // 2. 유저 정답률 계산
-        List<UserQuizAnswer> answerHistory = userQuizAnswerRepository.findByUserIdAndQuizCategoryId(
+        // 2. 유저 정답률 계산, 내가 푼 문제 아이디값
+        List<UserQuizAnswer> answerHistory = userQuizAnswerRepository.findBySubscriptionIdAndQuizCategoryId(
             subscriptionId, parentCategoryId);
-        double accuracy = calculateAccuracy(answerHistory);
+        int quizCount = answerHistory.size(); // 사용자가 지금까지 푼 문제 수
+        int totalCorrect = 0;
+        Set<Long> solvedQuizIds = new HashSet<>();
 
-        // 5. 내가 푼 문제 ID
-        Set<Long> solvedQuizIds = answerHistory.stream()
-            .map(a -> a.getQuiz().getId())
-            .collect(Collectors.toSet());
+        for (UserQuizAnswer answer : answerHistory) {
+            if (answer.getIsCorrect()) {
+                totalCorrect++;
+            }
+            solvedQuizIds.add(answer.getQuiz().getId());
+        }
 
+        double accuracy =
+            quizCount == 0 ? 100.0 : ((double) totalCorrect / quizCount) * 100.0;
         // 6. 서술형 주기 판단 (풀이 횟수 기반)
-        int quizCount = answerHistory.size(); // 사용자가 지금까지 푼 문제 수
-        boolean isEssayDay = quizCount % 3 == 2; //일단 3배수일때 한번씩은 서술 뽑아줘야함( 조정 필요하면 나중에 하는거롤)
-
-//        List<QuizFormatType> targetTypes = isEssayDay
-//            ? List.of(QuizFormatType.SUBJECTIVE)
-//            : List.of(QuizFormatType.MULTIPLE_CHOICE, QuizFormatType.SHORT_ANSWER);
+        boolean isEssayDay = quizCount % 3 == 2; //일단 3배수일때 한번씩은 서술( 조정 필요하면 나중에 하는거롤)
 
         List<QuizFormatType> targetTypes = isEssayDay
             ? List.of(QuizFormatType.SUBJECTIVE)
@@ -93,19 +94,19 @@ private List<QuizLevel> getAllowedDifficulties(double accuracy) {
         }
     }
 
-    private double calculateAccuracy(List<UserQuizAnswer> answers) {
-        if (answers.isEmpty()) {
-            return 100.0;
-        }
-
-        int totalCorrect = 0;
-        for (UserQuizAnswer answer : answers) {
-            if (answer.getIsCorrect()) {
-                totalCorrect++;
-            }
-        }
-        return ((double) totalCorrect / answers.size()) * 100.0;
-    }
+//    private double calculateAccuracy(List<UserQuizAnswer> answers) {
+//        if (answers.isEmpty()) {
+//            return 100.0;
+//        }
+//
+//        int totalCorrect = 0;
+//        for (UserQuizAnswer answer : answers) {
+//            if (answer.getIsCorrect()) {
+//                totalCorrect++;
+//            }
+//        }
+//        return ((double) totalCorrect / answers.size()) * 100.0;
+//    }
 
 
     @Transactional
 
@@ -45,4 +45,5 @@ mail.strategy=sesMailSender
 #mail.strategy=javaBatchMailSender
 mail.ratelimiter.capacity=14
 mail.ratelimiter.refill=7
-mail.ratelimiter.millis=1000
+mail.ratelimiter.millis=1000
+server.error.whitelabel.enabled=false
@@ -38,4 +38,5 @@ server.tomcat.mbeanregistry.enabled=true
 spring.batch.jdbc.initialize-schema=always
 spring.batch.job.enabled=false
 # Nginx
-server.forward-headers-strategy=framework
+server.forward-headers-strategy=framework
+server.error.whitelabel.enabled=false
@@ -9,7 +9,7 @@
 public enum QuizExceptionCode {
 
     NOT_FOUND_ERROR(false, HttpStatus.NOT_FOUND, "해당 퀴즈를 찾을 수 없습니다"),
-    QUIZ_CATEGORY_NOT_FOUND_ERROR(false, HttpStatus.NOT_FOUND, "QuizCategory 를 찾을 수 없습니다"),
+    QUIZ_CATEGORY_NOT_FOUND_ERROR(false, HttpStatus.NOT_FOUND, "해당 퀴즈 카테고리를 찾을 수 없습니다"),
     PARENT_QUIZ_CATEGORY_NOT_FOUND_ERROR(false, HttpStatus.NOT_FOUND, "대분류 QuizCategory 를 찾을 수 없습니다"),
     QUIZ_CATEGORY_ALREADY_EXISTS_ERROR(false, HttpStatus.CONFLICT, "이미 해당 카테고리가 존재합니다"),
     JSON_PARSING_FAILED_ERROR(false, HttpStatus.BAD_REQUEST, "JSON 파싱 실패"),
 
@@ -25,29 +25,18 @@ public List<Quiz> findAvailableQuizzesUnderParentCategory(Long parentCategoryId,
         QQuiz quiz = QQuiz.quiz;
         QQuizCategory category = QQuizCategory.quizCategory;
 
-        // 1. 소분류 ID들 가져오기
-        List<Long> subCategoryIds = queryFactory
-            .select(category.id)
-            .from(category)
-            .where(category.parent.id.eq(parentCategoryId))
-            .fetch();
-
-        if (subCategoryIds.isEmpty()) {
-            return List.of();
-        }
-
         // 2. 퀴즈 조회
         BooleanBuilder builder = new BooleanBuilder()
-            .and(quiz.category.id.in(subCategoryIds)) //내가 정한 카테고리에
+            .and(quiz.category.parent.id.eq(parentCategoryId)) //내가 정한 카테고리에
             .and(quiz.level.in(difficulties)) //정해진 난이도 그룹안에있으면서
             .and(quiz.type.in(targetTypes)); //퀴즈 타입은 이거야
 
         if (!solvedQuizIds.isEmpty()) {
             builder.and(quiz.id.notIn(solvedQuizIds)); //혹시라도 구독자가 문제를 푼 이력잉 ㅣㅆ으면 그것도 제외해야햄
         }
-
         return queryFactory
             .selectFrom(quiz)
+            .join(quiz.category, category)
             .where(builder)
             .limit(20)
             .fetch();
 
@@ -7,7 +7,7 @@
 @Getter
 @RequiredArgsConstructor
 public enum UserExceptionCode {
-    EMAIL_DUPLICATION(false, HttpStatus.CONFLICT, "이미 사용중인 이메일입니다."),
+    EMAIL_DUPLICATION(false, HttpStatus.CONFLICT, "해당 이메일로 구독을 사용중입니다. 다른 소셜 로그인을 사용해주세요."),
     EVENT_CRUD_FAILED(false, HttpStatus.INTERNAL_SERVER_ERROR, "이벤트 값을 레디스에 읽기/저장 실패했으요"),
     LOCK_FAILED(false, HttpStatus.CONFLICT, "요청 시간 초과, 락 획득 실패"),
     INVALID_ROLE(false, HttpStatus.BAD_REQUEST, "역할 값이 잘못되었습니다."),
 
@@ -21,12 +21,9 @@ public interface UserRepository extends JpaRepository<User, Long> {
 //    @Query("SELECT u FROM User u LEFT JOIN FETCH u.subscription WHERE u.email = :email")
 //    Optional<User> findUserWithSubscriptionByEmail(String email);
 
-    default void validateSocialJoinEmail(String email, SocialType socialType) {
-        findByEmail(email).ifPresent(existingUser -> {
-            if (!existingUser.getSocialType().equals(socialType)) {
-                throw new UserException(UserExceptionCode.EMAIL_DUPLICATION);
-            }
-        });
+    default Optional<User> validateSocialJoinEmail(String email, SocialType socialType) {
+        return findByEmail(email)
+            .filter(existingUser -> existingUser.getSocialType().equals(socialType));
     }
 
     Optional<User> findBySubscription(Subscription subscription);
 
@@ -8,14 +8,15 @@
 @RequiredArgsConstructor
 public enum UserQuizAnswerExceptionCode {
     //예시임
-    NOT_FOUND_ANSWER(false, HttpStatus.NOT_FOUND, "해당 답변을 찾을 수 없습니다"),
-    EVENT_OUT_OF_STOCK(false, HttpStatus.GONE, "당첨자가 모두 나왔습니다. 다음 기회에 다시 참여해주세요"),
-    EVENT_CRUD_FAILED(false, HttpStatus.INTERNAL_SERVER_ERROR, "이벤트 값을 레디스에 읽기/저장 실패했으요"),
+    NOT_FOUND_ANSWER(false, HttpStatus.NOT_FOUND, "해당 답변을 찾을 수 없습니다."),
+    EVENT_OUT_OF_STOCK(false, HttpStatus.GONE, "당첨자가 모두 나왔습니다. 다음 기회에 다시 참여해주세요."),
+    EVENT_CRUD_FAILED(false, HttpStatus.INTERNAL_SERVER_ERROR, "이벤트 값을 레디스에 읽기/저장 실패했습니다."),
     LOCK_FAILED(false, HttpStatus.CONFLICT, "요청 시간 초과, 락 획득 실패"),
-    INVALID_EVENT(false, HttpStatus.BAD_REQUEST, "지금은 이벤트에 참여할 수 없어요"),
+    INVALID_EVENT(false, HttpStatus.BAD_REQUEST, "지금은 이벤트에 참여할 수 없습니다."),
     DUPLICATED_ANSWER(false, HttpStatus.BAD_REQUEST, "이미 제출한 문제입니다."),
     DUPLICATED_EVENT_ID(false, HttpStatus.BAD_REQUEST, "중복되는 이벤트 ID 입니다."),
-    INVALID_ANSWER(false, HttpStatus.BAD_REQUEST, "비정상적인 접근입니다. 관리자에게 문의해주세요.");
+    CORRECT_STATUS_INVALID_ANSWER(false, HttpStatus.BAD_REQUEST, "정답여부가 정상적으로 처리되지 않았습니다. 메일로 문의해주세요."),
+    AI_ANSWER_INVALID_ANSWER(false, HttpStatus.BAD_REQUEST, "답변한 서술형 문제가 정상적으로 처리되지 않았습니다. 메일로 문의해주세요.");
 
     private final boolean isSuccess;
     private final HttpStatus httpStatus;
 
@@ -8,11 +8,14 @@
 import java.util.Set;
 
 public interface UserQuizAnswerCustomRepository {
-    
+
     List<UserAnswerDto> findUserAnswerByQuizId(Long quizId);
 
     List<UserQuizAnswer> findByUserIdAndQuizCategoryId(Long userId, Long quizCategoryId);
 
+    List<UserQuizAnswer> findBySubscriptionIdAndQuizCategoryId(Long subscriptionId,
+        Long quizCategoryId);
+
     Set<Long> findRecentSolvedCategoryIds(Long userId, Long parentCategoryId, LocalDate afterDate);
 
     UserQuizAnswer findUserQuizAnswerBySerialIds(String quizId, String subscriptionId);