NBC-finalProject
diff --git a/‎.github/workflows/service-deploy.yml‎
Lines changed: 6 additions & 6 deletions b/‎.github/workflows/service-deploy.yml‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎cs25-batch/src/main/java/com/example/cs25batch/batch/component/reader/RedisStreamReader.java‎
Lines changed: 9 additions & 9 deletions b/‎cs25-batch/src/main/java/com/example/cs25batch/batch/component/reader/RedisStreamReader.java‎
Lines changed: 9 additions & 9 deletions
diff --git a/‎cs25-batch/src/main/java/com/example/cs25batch/batch/service/TodayQuizService.java‎
Lines changed: 41 additions & 34 deletions b/‎cs25-batch/src/main/java/com/example/cs25batch/batch/service/TodayQuizService.java‎
Lines changed: 41 additions & 34 deletions
diff --git a/‎cs25-batch/src/main/java/com/example/cs25batch/config/RateLimiterConfig.java‎
Lines changed: 0 additions & 35 deletions b/‎cs25-batch/src/main/java/com/example/cs25batch/config/RateLimiterConfig.java‎
Lines changed: 0 additions & 35 deletions
diff --git a/‎cs25-batch/src/main/java/com/example/cs25batch/sender/JavaMailSenderStrategy.java‎
Lines changed: 17 additions & 0 deletions b/‎cs25-batch/src/main/java/com/example/cs25batch/sender/JavaMailSenderStrategy.java‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎cs25-batch/src/main/java/com/example/cs25batch/sender/MailSenderStrategy.java‎
Lines changed: 3 additions & 0 deletions b/‎cs25-batch/src/main/java/com/example/cs25batch/sender/MailSenderStrategy.java‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎cs25-batch/src/main/java/com/example/cs25batch/sender/SesMailSenderStrategy.java‎
Lines changed: 17 additions & 0 deletions b/‎cs25-batch/src/main/java/com/example/cs25batch/sender/SesMailSenderStrategy.java‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎cs25-batch/src/main/java/com/example/cs25batch/sender/context/MailSenderContext.java‎
Lines changed: 14 additions & 1 deletion b/‎cs25-batch/src/main/java/com/example/cs25batch/sender/context/MailSenderContext.java‎
Lines changed: 14 additions & 1 deletion
diff --git a/‎cs25-batch/src/main/resources/application.properties‎
Lines changed: 0 additions & 3 deletions b/‎cs25-batch/src/main/resources/application.properties‎
Lines changed: 0 additions & 3 deletions
@@ -1,4 +1,3 @@
-
 # 워크 플로우 이름
 name: CD - Docker Build & Deploy to EC2
 
@@ -56,6 +55,7 @@ jobs:
           echo "CLAUDE_API_KEY=${{ secrets.CLAUDE_API_KEY }}" >> .env
           echo "AWS_SES_ACCESS_KEY=${{ secrets.AWS_SES_ACCESS_KEY }}" >> .env
           echo "AWS_SES_SECRET_KEY=${{ secrets.AWS_SES_SECRET_KEY }}" >> .env
+          echo "BRAVE_API_KEY=${{ secrets.BRAVE_API_KEY }}" >> .env
 
       # EC2 접속 후 .env 파일 업로드
       - name: Upload .env to EC2
@@ -79,31 +79,31 @@ jobs:
             
             echo "[1] 현재 nginx가 사용하는 포트 확인"
             CURRENT_PORT=$(grep -o 'proxy_pass http://localhost:[0-9]*;' /etc/nginx/conf.d/api.conf | grep -o '[0-9]*')
-      
+            
             if [ "$CURRENT_PORT" = "8080" ]; then
             NEW_PORT=8081
             OLD_CONTAINER=cs25-8080
             else
             NEW_PORT=8080
             OLD_CONTAINER=cs25-8081
             fi
-      
+            
             echo "[2] 새로운 포트($NEW_PORT)로 컨테이너 실행"
             docker pull baekjonghyun/cs25-service:latest
             docker run -d \
             --name cs25-$NEW_PORT \
             --env-file .env \
             -p $NEW_PORT:8080 \
             baekjonghyun/cs25-service:latest
-      
+            
             echo "[3] nginx 설정 포트 교체 및 reload"
             sudo sed -i "s/$CURRENT_PORT/$NEW_PORT/" /etc/nginx/conf.d/api.conf
             sudo nginx -t && sudo nginx -s reload
-      
+            
             echo "[4] 이전 컨테이너 종료 및 삭제"
             docker stop $OLD_CONTAINER || echo "No previous container"
             docker rm $OLD_CONTAINER || echo "No previous container"
-      
+            
             echo "[✔] 무중단 배포 완료! 현재 포트: $NEW_PORT"
 
 
 
@@ -1,5 +1,6 @@
 package com.example.cs25batch.batch.component.reader;
 
+import com.example.cs25batch.sender.context.MailSenderContext;
 import io.github.bucket4j.Bucket;
 import java.time.Duration;
 import java.util.HashMap;
@@ -9,6 +10,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.connection.stream.Consumer;
 import org.springframework.data.redis.connection.stream.MapRecord;
 import org.springframework.data.redis.connection.stream.ReadOffset;
@@ -18,27 +20,25 @@
 import org.springframework.stereotype.Component;
 
 @Slf4j
+@RequiredArgsConstructor
 @Component("redisConsumeReader")
 public class RedisStreamReader implements ItemReader<Map<String, String>> {
 
     private static final String STREAM = "quiz-email-stream";
     private static final String GROUP = "mail-consumer-group";
     private static final String CONSUMER = "mail-worker";
 
-    private final StringRedisTemplate redisTemplate;
-    private final Bucket bucket;
+    @Value("${mail.strategy:javaBatchMailSender}")
+    private String strategyKey;
 
-    public RedisStreamReader(
-        StringRedisTemplate redisTemplate,
-        @Qualifier("bucketEmail") Bucket bucket
-    ) {
-        this.redisTemplate = redisTemplate;
-        this.bucket = bucket;
-    }
+    private final StringRedisTemplate redisTemplate;
+    private final MailSenderContext mailSenderContext;
 
     @Override
     public Map<String, String> read() throws InterruptedException {
         //long start = System.currentTimeMillis();
+        Bucket bucket = mailSenderContext.getBucket(strategyKey);
+
         while (!bucket.tryConsume(1)) {
             Thread.sleep(200); //토큰을 얻을 때까지 간격을 두고 재시도
         }
 
@@ -1,5 +1,6 @@
 package com.example.cs25batch.batch.service;
 
+import com.example.cs25entity.domain.mail.repository.MailLogRepository;
 import com.example.cs25entity.domain.quiz.entity.Quiz;
 import com.example.cs25entity.domain.quiz.enums.QuizFormatType;
 import com.example.cs25entity.domain.quiz.enums.QuizLevel;
@@ -8,12 +9,12 @@
 import com.example.cs25entity.domain.quiz.repository.QuizRepository;
 import com.example.cs25entity.domain.subscription.entity.Subscription;
 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.time.LocalDate;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -30,6 +31,7 @@ public class TodayQuizService {
     private final QuizRepository quizRepository;
     private final SubscriptionRepository subscriptionRepository;
     private final UserQuizAnswerRepository userQuizAnswerRepository;
+    private final MailLogRepository mailLogRepository;
     private final SesMailService mailService;
 
     @Transactional
@@ -39,48 +41,53 @@ public Quiz getTodayQuizBySubscription(Subscription subscription) {
         Long subscriptionId = subscription.getId();
 
         // 2. 유저 정답률 계산, 내가 푼 문제 아이디값
-        List<UserQuizAnswer> answerHistory = userQuizAnswerRepository.findBySubscriptionIdAndQuizCategoryId(
-            subscriptionId, parentCategoryId);
-        int quizCount = answerHistory.size(); // 사용자가 지금까지 푼 문제 수
-        int totalCorrect = 0;
-        Set<Long> solvedQuizIds = new HashSet<>();
-
-        for (UserQuizAnswer answer : answerHistory) {
-            if (answer.getIsCorrect()) {
-                totalCorrect++;
-            }
-            solvedQuizIds.add(answer.getQuiz().getId());
-        }
+        Double accuracyResult = userQuizAnswerRepository.getCorrectRate(subscriptionId,
+                parentCategoryId);
+        double accuracy = accuracyResult != null ? accuracyResult : 100.0;
+
+        Set<Long> sentQuizIds = mailLogRepository.findDistinctQuiz_IdBySubscription_Id(subscriptionId);
+        int quizCount = sentQuizIds.size(); // 사용자가 지금까지 푼 문제 수
 
-        double accuracy =
-            quizCount == 0 ? 100.0 : ((double) totalCorrect / quizCount) * 100.0;
         // 6. 서술형 주기 판단 (풀이 횟수 기반)
-        boolean isEssayDay = quizCount % 3 == 2; //일단 3배수일때 한번씩은 서술( 조정 필요하면 나중에 하는거롤)
+        boolean isEssayDay = quizCount % 4 == 3; //일단 3배수일때 한번씩은 서술(0,1,2 객관식 / 3서술형)
 
-        List<QuizFormatType> targetTypes = isEssayDay
-            ? List.of(QuizFormatType.SUBJECTIVE)
-            : List.of(QuizFormatType.MULTIPLE_CHOICE);
+        QuizFormatType targetType = isEssayDay
+                ? QuizFormatType.SUBJECTIVE
+                : QuizFormatType.MULTIPLE_CHOICE;
 
         // 3. 정답률 기반 난이도 바운더리 설정
         List<QuizLevel> allowedDifficulties = getAllowedDifficulties(accuracy);
 
+        // 8. 오프셋 계산 (풀이 수 기준)
+        long seed = LocalDate.now().toEpochDay() + subscriptionId;
+        int offset = (int) (seed % 20);
+
         // 7. 필터링 조건으로 문제 조회(대분류, 난이도, 내가푼문제 제외, 제외할 카테고리 제외하고, 문제 타입 전부 조건으로)
-        List<Quiz> candidateQuizzes = quizRepository.findAvailableQuizzesUnderParentCategory(
-            parentCategoryId,
-            allowedDifficulties,
-            solvedQuizIds,
-            //excludedCategoryIds,
-            targetTypes
-        ); //한개만뽑기(find first)
-
-        if (candidateQuizzes.isEmpty()) { // 뽀ㅃ을문제없을때
-            throw new QuizException(QuizExceptionCode.NO_QUIZ_EXISTS_ERROR);
+
+        Quiz todayQuiz = quizRepository.findAvailableQuizzesUnderParentCategory(
+                parentCategoryId,
+                allowedDifficulties,
+                sentQuizIds,
+                //excludedCategoryIds,
+                targetType,
+                offset
+        );
+
+        // offset이 너무 커서 결과가 없을 수 있으므로, offset=0으로 한 번 더 조회
+        if (todayQuiz == null && offset > 0) {
+            todayQuiz = quizRepository.findAvailableQuizzesUnderParentCategory(
+                    parentCategoryId,
+                    allowedDifficulties,
+                    sentQuizIds,
+                    targetType,
+                    0
+            );
+        }
+        if (todayQuiz == null) {
+            throw new QuizException(QuizExceptionCode.QUIZ_VALIDATION_FAILED_ERROR);
         }
 
-        // 8. 오프셋 계산 (풀이 수 기준)
-        long seed = LocalDate.now().toEpochDay() + subscriptionId;
-        int offset = (int) (seed % candidateQuizzes.size());
-        return candidateQuizzes.get(offset);
+        return todayQuiz;
     }
 
 
 
@@ -2,16 +2,33 @@
 
 import com.example.cs25batch.batch.dto.MailDto;
 import com.example.cs25batch.batch.service.JavaMailService;
+import io.github.bucket4j.Bandwidth;
+import io.github.bucket4j.Bucket;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
+import java.time.Duration;
+
 @Component("javaBatchMailSender")
 @RequiredArgsConstructor
 public class JavaMailSenderStrategy implements MailSenderStrategy{
     private final JavaMailService javaMailService;
+    private final Bucket bucket = Bucket.builder()
+            .addLimit(
+                    Bandwidth.builder()
+                            .capacity(4)
+                            .refillGreedy(2, Duration.ofMillis(500))
+                            .build()
+            )
+            .build();
 
     @Override
     public void sendQuizMail(MailDto mailDto) {
         javaMailService.sendQuizEmail(mailDto.getSubscription(), mailDto.getQuiz());  // 커스텀 메서드로 정의
     }
+
+    @Override
+    public Bucket getBucket() {
+        return bucket;
+    }
 }
@@ -1,7 +1,10 @@
 package com.example.cs25batch.sender;
 
 import com.example.cs25batch.batch.dto.MailDto;
+import io.github.bucket4j.Bucket;
 
 public interface MailSenderStrategy {
     void sendQuizMail(MailDto mailDto);
+
+    Bucket getBucket();
 }
@@ -2,17 +2,34 @@
 
 import com.example.cs25batch.batch.dto.MailDto;
 import com.example.cs25batch.batch.service.SesMailService;
+import io.github.bucket4j.Bandwidth;
+import io.github.bucket4j.Bucket;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
+import java.time.Duration;
+
 @RequiredArgsConstructor
 @Component("sesMailSender")
 public class SesMailSenderStrategy implements MailSenderStrategy{
 
     private final SesMailService sesMailService;
+    private final Bucket bucket = Bucket.builder()
+            .addLimit(
+                    Bandwidth.builder()
+                            .capacity(14)
+                            .refillGreedy(7, Duration.ofMillis(500))
+                            .build()
+            )
+            .build();
 
     @Override
     public void sendQuizMail(MailDto mailDto) {
         sesMailService.sendQuizEmail(mailDto.getSubscription(), mailDto.getQuiz());
     }
+
+    @Override
+    public Bucket getBucket() {
+        return bucket;
+    }
 }
@@ -3,6 +3,8 @@
 import com.example.cs25batch.batch.dto.MailDto;
 import com.example.cs25batch.sender.MailSenderStrategy;
 import java.util.Map;
+
+import io.github.bucket4j.Bucket;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
@@ -12,10 +14,21 @@ public class MailSenderContext {
     private final Map<String, MailSenderStrategy> strategyMap;
 
     public void send(MailDto dto, String strategyKey) {
+        MailSenderStrategy strategy = getValidStrategy(strategyKey);
+        strategy.sendQuizMail(dto);
+    }
+
+    public Bucket getBucket(String strategyKey) {
+        MailSenderStrategy strategy = getValidStrategy(strategyKey);
+        return strategy.getBucket();
+    }
+
+    private MailSenderStrategy getValidStrategy(String strategyKey) {
         MailSenderStrategy strategy = strategyMap.get(strategyKey);
         if (strategy == null) {
             throw new IllegalArgumentException("메일 전략이 존재하지 않습니다: " + strategyKey);
         }
-        strategy.sendQuizMail(dto);
+        return strategy;
     }
+
 }
@@ -43,7 +43,4 @@ server.forward-headers-strategy=framework
 #mail
 mail.strategy=sesMailSender
 #mail.strategy=javaBatchMailSender
-mail.ratelimiter.capacity=14
-mail.ratelimiter.refill=7
-mail.ratelimiter.millis=1000
 server.error.whitelabel.enabled=false
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,10 @@`
`1`	`1`	`package com.example.cs25batch.sender;`
`2`	`2`
`3`	`3`	`import com.example.cs25batch.batch.dto.MailDto;`
	`4`	`+import io.github.bucket4j.Bucket;`
`4`	`5`
`5`	`6`	`public interface MailSenderStrategy {`
`6`	`7`	`void sendQuizMail(MailDto mailDto);`
	`8`	`+`
	`9`	`+ Bucket getBucket();`
`7`	`10`	`}`