NBC-finalProject
diff --git a/‎cs25-batch/src/main/java/com/example/cs25batch/batch/service/JavaMailService.java‎
Lines changed: 1 addition & 0 deletions b/‎cs25-batch/src/main/java/com/example/cs25batch/batch/service/JavaMailService.java‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎cs25-batch/src/main/resources/templates/mail-template.html‎
Lines changed: 4 additions & 4 deletions b/‎cs25-batch/src/main/resources/templates/mail-template.html‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎cs25-service/src/main/java/com/example/cs25service/domain/ai/service/AiFeedbackQueueService.java‎
Lines changed: 8 additions & 5 deletions b/‎cs25-service/src/main/java/com/example/cs25service/domain/ai/service/AiFeedbackQueueService.java‎
Lines changed: 8 additions & 5 deletions
diff --git a/‎cs25-service/src/main/java/com/example/cs25service/domain/ai/service/AiFeedbackStreamProcessor.java‎
Lines changed: 37 additions & 82 deletions b/‎cs25-service/src/main/java/com/example/cs25service/domain/ai/service/AiFeedbackStreamProcessor.java‎
Lines changed: 37 additions & 82 deletions
diff --git a/‎cs25-service/src/main/java/com/example/cs25service/domain/ai/service/AiFeedbackStreamWorker.java‎
Lines changed: 3 additions & 25 deletions b/‎cs25-service/src/main/java/com/example/cs25service/domain/ai/service/AiFeedbackStreamWorker.java‎
Lines changed: 3 additions & 25 deletions
diff --git a/‎cs25-service/src/main/java/com/example/cs25service/domain/mail/service/MailService.java‎
Lines changed: 0 additions & 1 deletion b/‎cs25-service/src/main/java/com/example/cs25service/domain/mail/service/MailService.java‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎cs25-service/src/main/java/com/example/cs25service/domain/profile/service/ProfileService.java‎
Lines changed: 5 additions & 0 deletions b/‎cs25-service/src/main/java/com/example/cs25service/domain/profile/service/ProfileService.java‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎cs25-service/src/main/java/com/example/cs25service/domain/security/config/SecurityConfig.java‎
Lines changed: 1 addition & 1 deletion b/‎cs25-service/src/main/java/com/example/cs25service/domain/security/config/SecurityConfig.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎cs25-service/src/main/java/com/example/cs25service/domain/security/jwt/dto/ReissueRequestDto.java‎
Lines changed: 4 additions & 0 deletions b/‎cs25-service/src/main/java/com/example/cs25service/domain/security/jwt/dto/ReissueRequestDto.java‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎cs25-service/src/main/java/com/example/cs25service/domain/security/jwt/provider/JwtTokenProvider.java‎
Lines changed: 1 addition & 5 deletions b/‎cs25-service/src/main/java/com/example/cs25service/domain/security/jwt/provider/JwtTokenProvider.java‎
Lines changed: 1 addition & 5 deletions
@@ -31,6 +31,7 @@ public void sendQuizEmail(Subscription subscription, Quiz quiz) {
             context.setVariable("toEmail", subscription.getEmail());
             context.setVariable("question", quiz.getQuestion());
             context.setVariable("quizLink", MailLinkGenerator.generateQuizLink(subscription.getSerialId(), quiz.getSerialId()));
+            context.setVariable("subscriptionSettings", MailLinkGenerator.generateSubscriptionSettings(subscription.getSerialId()));
             String htmlContent = templateEngine.process("mail-template", context);
 
             MimeMessage message = mailSender.createMimeMessage();
 
@@ -21,9 +21,9 @@
             <!-- Logo and Title in horizontal layout -->
             <table cellpadding="0" cellspacing="0" border="0">
               <tr>
-                <td style="vertical-align: middle; padding-right: 12px;">
-                  <img src="cs25.png" alt="CS25" style="width: 28px; height: 28px;">
-                </td>
+<!--                <td style="vertical-align: middle; padding-right: 12px;">-->
+<!--                  <img src="cs25.png" alt="CS25" style="width: 28px; height: 28px;">-->
+<!--                </td>-->
                 <td style="vertical-align: middle;">
                   <h2 style="font-size: 20px; font-weight: 600; margin: 0; color: #1d4ed8;">오늘의 문제</h2>
                 </td>
@@ -39,7 +39,7 @@ <h2 style="font-size: 20px; font-weight: 600; margin: 0; color: #1d4ed8;">오늘
             <!-- Question Box -->
             <table width="100%" cellpadding="0" cellspacing="0" border="0" style="margin: 40px 0;">
               <tr>
-                <td style="color: white; font-weight: 700; font-size: 28px; line-height: 1.6; margin: 0; text-align: center;">
+                <td style="color: white; font-weight: 700; font-size: 24px; line-height: 1.6; margin: 0; text-align: center;">
                   <span th:text="${question}">관계 대수에 대한 설명으로 틀린 것은?</span>
                 </td>
               </tr>
 
@@ -16,12 +16,13 @@
 public class AiFeedbackQueueService {
 
     public static final String DEDUPLICATION_SET_KEY = "ai-feedback-dedup-set";
+
     private final EmitterRegistry emitterRegistry;
     private final RedisTemplate<String, Object> redisTemplate;
 
-    public void enqueue(Long answerId, SseEmitter emitter, String mode) {
+    public void enqueue(Long answerId, SseEmitter emitter) {
         try {
-            // Redis Set을 통한 중복 체크
+            // Redis Set을 통한 중복 처리 방지
             Long added = redisTemplate.opsForSet()
                 .add(DEDUPLICATION_SET_KEY, String.valueOf(answerId));
             if (added == null || added == 0) {
@@ -34,14 +35,16 @@ public void enqueue(Long answerId, SseEmitter emitter, String mode) {
 
             Map<String, Object> message = new HashMap<>();
             message.put("answerId", answerId);
-            message.put("mode", mode); // word/sentence 모드 구분 추가
 
             redisTemplate.opsForStream().add(RedisStreamConfig.STREAM_KEY, message);
 
         } catch (Exception e) {
+            log.error("Enqueue failed for answerId {}: {}", answerId, e.getMessage(), e);
+
+            // 롤백: emitterRegistry/Redis Set에서 제거
             emitterRegistry.remove(answerId);
-            redisTemplate.opsForSet()
-                .remove(DEDUPLICATION_SET_KEY, String.valueOf(answerId)); // 실패 시 롤백
+            redisTemplate.opsForSet().remove(DEDUPLICATION_SET_KEY, String.valueOf(answerId));
+
             completeWithError(emitter, e);
         }
     }
 
@@ -1,20 +1,20 @@
 package com.example.cs25service.domain.ai.service;
 
-import com.example.cs25entity.domain.quiz.entity.Quiz;
 import com.example.cs25entity.domain.user.entity.User;
 import com.example.cs25entity.domain.user.repository.UserRepository;
-import com.example.cs25entity.domain.userQuizAnswer.entity.UserQuizAnswer;
 import com.example.cs25entity.domain.userQuizAnswer.repository.UserQuizAnswerRepository;
 import com.example.cs25service.domain.ai.client.AiChatClient;
 import com.example.cs25service.domain.ai.exception.AiException;
 import com.example.cs25service.domain.ai.exception.AiExceptionCode;
 import com.example.cs25service.domain.ai.prompt.AiPromptProvider;
 import java.io.IOException;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
+@Slf4j
 @Component
 @RequiredArgsConstructor
 public class AiFeedbackStreamProcessor {
@@ -26,44 +26,14 @@ public class AiFeedbackStreamProcessor {
     private final AiChatClient aiChatClient;
 
     @Transactional
-    public void streamWord(Long answerId, SseEmitter emitter) {
+    public void stream(Long answerId, SseEmitter emitter) {
         try {
-            var answer = prepare(answerId, emitter);
-            if (answer == null) {
-                return;
-            }
-
-            var quiz = answer.getQuiz();
-            var docs = ragService.searchRelevant(quiz.getQuestion(), 3, 0.3);
-            String userPrompt = promptProvider.getFeedbackUser(quiz, answer, docs);
-            String systemPrompt = promptProvider.getFeedbackSystem();
-
-            send(emitter, "AI 응답 대기 중...");
-
-            StringBuilder wordBuffer = new StringBuilder();
-
-            aiChatClient.stream(systemPrompt, userPrompt)
-                .doOnNext(token -> {
-                    wordBuffer.append(token);
-                    if (token.equals(" ") || token.matches("[.,!?]")) {
-                        send(emitter, wordBuffer.toString());
-                        wordBuffer.setLength(0);
-                    }
-                })
-                .doOnComplete(() -> finalizeFeedback(answer, quiz, wordBuffer, emitter))
-                .doOnError(emitter::completeWithError)
-                .subscribe();
-
-        } catch (Exception e) {
-            emitter.completeWithError(e);
-        }
-    }
+            var answer = userQuizAnswerRepository.findById(answerId)
+                .orElseThrow(() -> new AiException(AiExceptionCode.NOT_FOUND_ANSWER));
 
-    @Transactional
-    public void streamSentence(Long answerId, SseEmitter emitter) {
-        try {
-            var answer = prepare(answerId, emitter);
-            if (answer == null) {
+            if (answer.getAiFeedback() != null) {
+                emitter.send(SseEmitter.event().data("이미 처리된 요청입니다."));
+                emitter.complete();
                 return;
             }
 
@@ -84,7 +54,33 @@ public void streamSentence(Long answerId, SseEmitter emitter) {
                         sentenceBuffer.setLength(0);
                     }
                 })
-                .doOnComplete(() -> finalizeFeedback(answer, quiz, sentenceBuffer, emitter))
+                .doOnComplete(() -> {
+                    try {
+                        if (sentenceBuffer.length() > 0) {
+                            send(emitter, sentenceBuffer.toString());
+                        }
+                        send(emitter, "[종료]");
+                        String feedback = sentenceBuffer.toString();
+                        boolean isCorrect = feedback.startsWith("정답");
+
+                        User user = answer.getUser();
+                        if (user != null) {
+                            double score = isCorrect
+                                ? user.getScore() + (quiz.getType().getScore() * quiz.getLevel()
+                                .getExp())
+                                : user.getScore() + 1;
+                            user.updateScore(score);
+                        }
+
+                        answer.updateIsCorrect(isCorrect);
+                        answer.updateAiFeedback(feedback);
+                        userQuizAnswerRepository.save(answer);
+
+                        emitter.complete();
+                    } catch (Exception e) {
+                        emitter.completeWithError(e);
+                    }
+                })
                 .doOnError(emitter::completeWithError)
                 .subscribe();
 
@@ -93,54 +89,13 @@ public void streamSentence(Long answerId, SseEmitter emitter) {
         }
     }
 
-    private UserQuizAnswer prepare(Long answerId, SseEmitter emitter) throws IOException {
-        emitter.onTimeout(emitter::complete);
-        emitter.onError(emitter::completeWithError);
-
-        var answer = userQuizAnswerRepository.findById(answerId)
-            .orElseThrow(() -> new AiException(AiExceptionCode.NOT_FOUND_ANSWER));
-
-        if (answer.getAiFeedback() != null) {
-            emitter.send(SseEmitter.event().data("이미 처리된 요청입니다."));
-            emitter.complete();
-            return null;
-        }
-        return answer;
-    }
-
-    private void finalizeFeedback(UserQuizAnswer answer, Quiz quiz, StringBuilder buffer,
-        SseEmitter emitter) {
-        try {
-            if (buffer.length() > 0) {
-                send(emitter, buffer.toString());
-            }
-
-            String feedback = buffer.toString();
-            boolean isCorrect = feedback.startsWith("정답");
-
-            User user = answer.getUser();
-            if (user != null) {
-                double score = isCorrect
-                    ? user.getScore() + (quiz.getType().getScore() * quiz.getLevel().getExp())
-                    : user.getScore() + 1;
-                user.updateScore(score);
-            }
-
-            answer.updateIsCorrect(isCorrect);
-            answer.updateAiFeedback(feedback);
-            userQuizAnswerRepository.save(answer);
-
-            emitter.complete();
-        } catch (Exception e) {
-            emitter.completeWithError(e);
-        }
-    }
-
     private void send(SseEmitter emitter, String data) {
         try {
             emitter.send(SseEmitter.event().data(data));
         } catch (IOException e) {
+            log.error("SSE send error: {}", e.getMessage(), e);
             emitter.completeWithError(e);
+            throw new RuntimeException(e);
         }
     }
 }
@@ -56,17 +56,8 @@ private void poll(String consumerName) {
                 if (messages != null) {
                     for (MapRecord<String, Object, Object> message : messages) {
                         Long answerId = Long.valueOf(message.getValue().get("answerId").toString());
-                        Object modeObj = message.getValue().get("mode");
-                        if (modeObj == null) {
-                            log.error("Mode is missing for answerId: {}", answerId);
-                            redisTemplate.opsForStream()
-                                .acknowledge(RedisStreamConfig.STREAM_KEY, GROUP_NAME,
-                                    message.getId());
-                            continue;
-                        }
-                        String mode = modeObj.toString();
-
                         SseEmitter emitter = emitterRegistry.get(answerId);
+
                         if (emitter == null) {
                             log.warn("No emitter found for answerId: {}", answerId);
                             redisTemplate.opsForStream()
@@ -75,22 +66,9 @@ private void poll(String consumerName) {
                             continue;
                         }
 
-                        switch (mode) {
-                            case "sentence":
-                                processor.streamSentence(answerId, emitter);
-                                break;
-                            case "word":
-                                processor.streamWord(answerId, emitter);
-                                break;
-                            default:
-                                log.error("Unknown mode: {} for answerId: {}", mode, answerId);
-                                emitterRegistry.remove(answerId);
-                                redisTemplate.opsForSet()
-                                    .remove(AiFeedbackQueueService.DEDUPLICATION_SET_KEY, answerId);
-                                break;
-                        }
-
+                        processor.stream(answerId, emitter);
                         emitterRegistry.remove(answerId);
+
                         redisTemplate.opsForSet()
                             .remove(AiFeedbackQueueService.DEDUPLICATION_SET_KEY, answerId);
 
 
@@ -27,7 +27,6 @@ public void sendVerificationCodeEmail(String toEmail, String code) throws Messag
 
         MimeMessage message = mailSender.createMimeMessage();
         MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
-
         helper.setTo(toEmail);
         helper.setSubject("[CS25] 이메일 인증코드");
         helper.setText(htmlContent, true); // true = HTML
 
@@ -118,6 +118,11 @@ public CategoryUserAnswerRateResponse getUserQuizAnswerCorrectRate(AuthUser auth
             () -> new UserException(UserExceptionCode.NOT_FOUND_USER)
         );
 
+        // 사용자에게 구독정보가 없으면 예외처리
+        if(user.getSubscription() == null) {
+            throw new UserException(UserExceptionCode.NOT_FOUND_SUBSCRIPTION);
+        }
+
         Long userId = user.getId();
 
         //유저 Id에 따른 구독 정보의 대분류 카테고리 조회
 
@@ -73,7 +73,7 @@ public SecurityFilterChain filterChain(HttpSecurity http,
 
                 //로그인이 필요한 서비스만 여기다가 추가하기 (permaiAll 은 패싱 ㄱㄱ)
                 .requestMatchers(HttpMethod.GET, "/users/**").hasAnyRole(PERMITTED_ROLES)
-                .requestMatchers(HttpMethod.POST, "/auth/**").hasAnyRole(PERMITTED_ROLES)
+                .requestMatchers(HttpMethod.POST, "/auth/logout/**").hasAnyRole(PERMITTED_ROLES)
                 .requestMatchers("/admin/**").hasRole("ADMIN")
                 .requestMatchers(HttpMethod.POST, "/crawlers/github/**").hasRole("ADMIN")
 
 
@@ -8,4 +8,8 @@
 public class ReissueRequestDto {
 
     private String refreshToken;
+
+    public ReissueRequestDto(String refreshToken) {
+        this.refreshToken = refreshToken;
+    }
 }
@@ -97,7 +97,7 @@ public boolean validateToken(String token) throws JwtAuthenticationException {
         }
     }
 
-    private Claims parseClaims(String token) throws JwtAuthenticationException {
+    Claims parseClaims(String token) throws JwtAuthenticationException {
         try {
             return Jwts.parser()
                 .verifyWith(key)
@@ -115,10 +115,6 @@ public String getAuthorId(String token) throws JwtAuthenticationException {
         return parseClaims(token).getSubject();
     }
 
-//    public String getEmail(String token) throws JwtAuthenticationException {
-//        return parseClaims(token).get("email", String.class);
-//    }
-
     public String getNickname(String token) throws JwtAuthenticationException {
         return parseClaims(token).get("nickname", String.class);
     }
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,8 @@`
`8`	`8`	`public class ReissueRequestDto {`
`9`	`9`
`10`	`10`	`private String refreshToken;`
	`11`	`+`
	`12`	`+ public ReissueRequestDto(String refreshToken) {`
	`13`	`+ this.refreshToken = refreshToken;`
	`14`	`+ }`
`11`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public boolean validateToken(String token) throws JwtAuthenticationException {`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`100`		`- private Claims parseClaims(String token) throws JwtAuthenticationException {`
	`100`	`+ Claims parseClaims(String token) throws JwtAuthenticationException {`
`101`	`101`	`try {`
`102`	`102`	`return Jwts.parser()`
`103`	`103`	`.verifyWith(key)`
`@@ -115,10 +115,6 @@ public String getAuthorId(String token) throws JwtAuthenticationException {`
`115`	`115`	`return parseClaims(token).getSubject();`
`116`	`116`	`}`
`117`	`117`
`118`		`-// public String getEmail(String token) throws JwtAuthenticationException {`
`119`		`-// return parseClaims(token).get("email", String.class);`
`120`		`-// }`
`121`		`-`
`122`	`118`	`public String getNickname(String token) throws JwtAuthenticationException {`
`123`	`119`	`return parseClaims(token).get("nickname", String.class);`
`124`	`120`	`}`