[BE] refactor: 세션을 가져오는 역할을 ReviewGroupSessionResolver에 위임

backend/src/main/java/reviewme/config/WebConfig.java

@@ -1,16 +1,21 @@
 package reviewme.config;
 
 import java.util.List;
+import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import reviewme.global.HeaderPropertyArgumentResolver;
+import reviewme.reviewgroup.controller.ReviewGroupSessionResolver;
+import reviewme.reviewgroup.service.ReviewGroupService;
 
 @Configuration
+@RequiredArgsConstructor
 public class WebConfig implements WebMvcConfigurer {
 
+    private final ReviewGroupService reviewGroupService;
+
     @Override
     public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
-        resolvers.add(new HeaderPropertyArgumentResolver());
+        resolvers.add(new ReviewGroupSessionResolver(reviewGroupService));
     }
 }

backend/src/main/java/reviewme/highlight/controller/HighlightController.java

@@ -6,9 +6,10 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.SessionAttribute;
 import reviewme.highlight.service.HighlightService;
 import reviewme.highlight.service.dto.HighlightsRequest;
+import reviewme.reviewgroup.controller.ReviewGroupSession;
+import reviewme.reviewgroup.domain.ReviewGroup;
 
 @RestController
 @RequiredArgsConstructor
@@ -19,9 +20,9 @@ public class HighlightController {
     @PostMapping("/v2/highlight")
     public ResponseEntity<Void> highlight(
             @Valid @RequestBody HighlightsRequest request,
-            @SessionAttribute("reviewRequestCode") String reviewRequestCode
+            @ReviewGroupSession ReviewGroup reviewGroup
     ) {
-        highlightService.highlight(request, reviewRequestCode);
+        highlightService.highlight(request, reviewGroup);
         return ResponseEntity.ok().build();
     }
 }

backend/src/main/java/reviewme/highlight/service/HighlightService.java

@@ -15,25 +15,20 @@
 import reviewme.highlight.service.validator.HighlightValidator;
 import reviewme.review.domain.Answer;
 import reviewme.review.repository.AnswerRepository;
-import reviewme.review.service.exception.ReviewGroupNotFoundByReviewRequestCodeException;
-import reviewme.reviewgroup.repository.ReviewGroupRepository;
+import reviewme.reviewgroup.domain.ReviewGroup;
 
 @Service
 @RequiredArgsConstructor
 public class HighlightService {
 
     private final HighlightRepository highlightRepository;
-    private final ReviewGroupRepository reviewGroupRepository;
     private final AnswerRepository answerRepository;
 
     private final HighlightValidator highlightValidator;
 
     @Transactional
-    public void highlight(HighlightsRequest request, String reviewRequestCode) {
-        long reviewGroupId = reviewGroupRepository.findByReviewRequestCode(reviewRequestCode)
-                .orElseThrow(() -> new ReviewGroupNotFoundByReviewRequestCodeException(reviewRequestCode))
-                .getId();
-
+    public void highlight(HighlightsRequest request, ReviewGroup reviewGroup) {
+        long reviewGroupId = reviewGroup.getId();
         highlightValidator.validate(request, reviewGroupId);
         deleteOldHighlight(request.questionId(), reviewGroupId);
         saveNewHighlight(request);

backend/src/main/java/reviewme/review/controller/ReviewController.java

@@ -10,17 +10,18 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.SessionAttribute;
-import reviewme.review.service.ReviewGatheredLookupService;
 import reviewme.review.service.ReviewDetailLookupService;
+import reviewme.review.service.ReviewGatheredLookupService;
 import reviewme.review.service.ReviewListLookupService;
 import reviewme.review.service.ReviewRegisterService;
 import reviewme.review.service.ReviewSummaryService;
 import reviewme.review.service.dto.request.ReviewRegisterRequest;
 import reviewme.review.service.dto.response.detail.ReviewDetailResponse;
 import reviewme.review.service.dto.response.gathered.ReviewsGatheredBySectionResponse;
-import reviewme.review.service.dto.response.list.ReceivedReviewsSummaryResponse;
 import reviewme.review.service.dto.response.list.ReceivedReviewsResponse;
+import reviewme.review.service.dto.response.list.ReceivedReviewsSummaryResponse;
+import reviewme.reviewgroup.controller.ReviewGroupSession;
+import reviewme.reviewgroup.domain.ReviewGroup;
 
 @RestController
 @RequiredArgsConstructor
@@ -42,37 +43,36 @@ public ResponseEntity<Void> createReview(@Valid @RequestBody ReviewRegisterReque
     public ResponseEntity<ReceivedReviewsResponse> findReceivedReviews(
             @RequestParam(required = false) Long lastReviewId,
             @RequestParam(required = false) Integer size,
-            @SessionAttribute("reviewRequestCode") String reviewRequestCode
+            @ReviewGroupSession ReviewGroup reviewGroup
     ) {
-        ReceivedReviewsResponse response = reviewListLookupService.getReceivedReviews(
-                lastReviewId, size, reviewRequestCode);
+        ReceivedReviewsResponse response = reviewListLookupService.getReceivedReviews(lastReviewId, size, reviewGroup);
         return ResponseEntity.ok(response);
     }
 
     @GetMapping("/v2/reviews/{id}")
     public ResponseEntity<ReviewDetailResponse> findReceivedReviewDetail(
             @PathVariable long id,
-            @SessionAttribute("reviewRequestCode") String reviewRequestCode
+            @ReviewGroupSession ReviewGroup reviewGroup
     ) {
-        ReviewDetailResponse response = reviewDetailLookupService.getReviewDetail(id, reviewRequestCode);
+        ReviewDetailResponse response = reviewDetailLookupService.getReviewDetail(id, reviewGroup);
         return ResponseEntity.ok(response);
     }
 
     @GetMapping("/v2/reviews/summary")
     public ResponseEntity<ReceivedReviewsSummaryResponse> findReceivedReviewOverview(
-            @SessionAttribute("reviewRequestCode") String reviewRequestCode
+            @ReviewGroupSession ReviewGroup reviewGroup
     ) {
-        ReceivedReviewsSummaryResponse response = reviewSummaryService.getReviewSummary(reviewRequestCode);
+        ReceivedReviewsSummaryResponse response = reviewSummaryService.getReviewSummary(reviewGroup);
         return ResponseEntity.ok(response);
     }
 
     @GetMapping("/v2/reviews/gather")
     public ResponseEntity<ReviewsGatheredBySectionResponse> getReceivedReviewsBySectionId(
             @RequestParam("sectionId") long sectionId,
-            @SessionAttribute("reviewRequestCode") String reviewRequestCode
+            @ReviewGroupSession ReviewGroup reviewGroup
     ) {
-        ReviewsGatheredBySectionResponse response = reviewGatheredLookupService.getReceivedReviewsBySectionId(
-                reviewRequestCode, sectionId);
+        ReviewsGatheredBySectionResponse response =
+                reviewGatheredLookupService.getReceivedReviewsBySectionId(reviewGroup, sectionId);
         return ResponseEntity.ok(response);
     }
 }

backend/src/main/java/reviewme/review/service/ReviewDetailLookupService.java

@@ -6,27 +6,20 @@
 import reviewme.review.domain.Review;
 import reviewme.review.repository.ReviewRepository;
 import reviewme.review.service.dto.response.detail.ReviewDetailResponse;
-import reviewme.review.service.exception.ReviewGroupNotFoundByReviewRequestCodeException;
 import reviewme.review.service.exception.ReviewNotFoundByIdAndGroupException;
 import reviewme.review.service.mapper.ReviewDetailMapper;
 import reviewme.reviewgroup.domain.ReviewGroup;
-import reviewme.reviewgroup.repository.ReviewGroupRepository;
 
 @Service
 @Transactional(readOnly = true)
 @AllArgsConstructor
 public class ReviewDetailLookupService {
 
     private final ReviewRepository reviewRepository;
-    private final ReviewGroupRepository reviewGroupRepository;
-
     private final ReviewDetailMapper reviewDetailMapper;
 
     @Transactional(readOnly = true)
-    public ReviewDetailResponse getReviewDetail(long reviewId, String reviewRequestCode) {
-        ReviewGroup reviewGroup = reviewGroupRepository.findByReviewRequestCode(reviewRequestCode)
-                .orElseThrow(() -> new ReviewGroupNotFoundByReviewRequestCodeException(reviewRequestCode));
-
+    public ReviewDetailResponse getReviewDetail(long reviewId, ReviewGroup reviewGroup) {
         Review review = reviewRepository.findByIdAndReviewGroupId(reviewId, reviewGroup.getId())
                 .orElseThrow(() -> new ReviewNotFoundByIdAndGroupException(reviewId, reviewGroup.getId()));
 

backend/src/main/java/reviewme/review/service/ReviewGatheredLookupService.java

@@ -12,11 +12,9 @@
 import reviewme.review.domain.Answer;
 import reviewme.review.repository.AnswerRepository;
 import reviewme.review.service.dto.response.gathered.ReviewsGatheredBySectionResponse;
-import reviewme.review.service.exception.ReviewGroupNotFoundByReviewRequestCodeException;
 import reviewme.review.service.exception.SectionNotFoundInTemplateException;
 import reviewme.review.service.mapper.ReviewGatherMapper;
 import reviewme.reviewgroup.domain.ReviewGroup;
-import reviewme.reviewgroup.repository.ReviewGroupRepository;
 import reviewme.template.domain.Section;
 import reviewme.template.repository.SectionRepository;
 
@@ -28,25 +26,18 @@ public class ReviewGatheredLookupService {
 
     private final QuestionRepository questionRepository;
     private final AnswerRepository answerRepository;
-    private final ReviewGroupRepository reviewGroupRepository;
     private final SectionRepository sectionRepository;
 
     private final ReviewGatherMapper reviewGatherMapper;
 
     @Transactional(readOnly = true)
-    public ReviewsGatheredBySectionResponse getReceivedReviewsBySectionId(String reviewRequestCode, long sectionId) {
-        ReviewGroup reviewGroup = getReviewGroupOrThrow(reviewRequestCode);
+    public ReviewsGatheredBySectionResponse getReceivedReviewsBySectionId(ReviewGroup reviewGroup, long sectionId) {
         Section section = getSectionOrThrow(sectionId, reviewGroup);
         Map<Question, List<Answer>> questionAnswers = getQuestionAnswers(section, reviewGroup);
 
         return reviewGatherMapper.mapToReviewsGatheredBySection(questionAnswers);
     }
 
-    private ReviewGroup getReviewGroupOrThrow(String reviewRequestCode) {
-        return reviewGroupRepository.findByReviewRequestCode(reviewRequestCode)
-                .orElseThrow(() -> new ReviewGroupNotFoundByReviewRequestCodeException(reviewRequestCode));
-    }
-
     private Section getSectionOrThrow(long sectionId, ReviewGroup reviewGroup) {
         return sectionRepository.findByIdAndTemplateId(sectionId, reviewGroup.getTemplateId())
                 .orElseThrow(() -> new SectionNotFoundInTemplateException(sectionId, reviewGroup.getTemplateId()));

backend/src/main/java/reviewme/review/service/ReviewListLookupService.java

@@ -7,24 +7,18 @@
 import reviewme.review.repository.ReviewRepository;
 import reviewme.review.service.dto.response.list.ReceivedReviewsResponse;
 import reviewme.review.service.dto.response.list.ReviewListElementResponse;
-import reviewme.review.service.exception.ReviewGroupNotFoundByReviewRequestCodeException;
 import reviewme.review.service.mapper.ReviewListMapper;
 import reviewme.reviewgroup.domain.ReviewGroup;
-import reviewme.reviewgroup.repository.ReviewGroupRepository;
 
 @Service
 @RequiredArgsConstructor
 public class ReviewListLookupService {
 
-    private final ReviewGroupRepository reviewGroupRepository;
     private final ReviewRepository reviewRepository;
     private final ReviewListMapper reviewListMapper;
 
     @Transactional(readOnly = true)
-    public ReceivedReviewsResponse getReceivedReviews(Long lastReviewId, Integer size, String reviewRequestCode) {
-        ReviewGroup reviewGroup = reviewGroupRepository.findByReviewRequestCode(reviewRequestCode)
-                .orElseThrow(() -> new ReviewGroupNotFoundByReviewRequestCodeException(reviewRequestCode));
-
+    public ReceivedReviewsResponse getReceivedReviews(Long lastReviewId, Integer size, ReviewGroup reviewGroup) {
         PageSize pageSize = new PageSize(size);
         List<ReviewListElementResponse> reviewListResponse
                 = reviewListMapper.mapToReviewList(reviewGroup, lastReviewId, pageSize.getSize());

backend/src/main/java/reviewme/review/service/ReviewSummaryService.java

@@ -5,22 +5,16 @@
 import org.springframework.transaction.annotation.Transactional;
 import reviewme.review.repository.ReviewRepository;
 import reviewme.review.service.dto.response.list.ReceivedReviewsSummaryResponse;
-import reviewme.review.service.exception.ReviewGroupNotFoundByReviewRequestCodeException;
 import reviewme.reviewgroup.domain.ReviewGroup;
-import reviewme.reviewgroup.repository.ReviewGroupRepository;
 
 @Service
 @RequiredArgsConstructor
 public class ReviewSummaryService {
 
-    private final ReviewGroupRepository reviewGroupRepository;
     private final ReviewRepository reviewRepository;
 
     @Transactional(readOnly = true)
-    public ReceivedReviewsSummaryResponse getReviewSummary(String reviewRequestCode) {
-        ReviewGroup reviewGroup = reviewGroupRepository.findByReviewRequestCode(reviewRequestCode)
-                .orElseThrow(() -> new ReviewGroupNotFoundByReviewRequestCodeException(reviewRequestCode));
-
+    public ReceivedReviewsSummaryResponse getReviewSummary(ReviewGroup reviewGroup) {
         int totalReviewCount = reviewRepository.countByReviewGroupId(reviewGroup.getId());
 
         return new ReceivedReviewsSummaryResponse(

backend/src/main/java/reviewme/reviewgroup/controller/ReviewGroupSession.java

@@ -0,0 +1,11 @@
+package reviewme.reviewgroup.controller;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ReviewGroupSession {
+}

backend/src/main/java/reviewme/reviewgroup/controller/ReviewGroupSessionNotFoundException.java

@@ -0,0 +1,12 @@
+package reviewme.reviewgroup.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import reviewme.global.exception.BadRequestException;
+
+@Slf4j
+public class ReviewGroupSessionNotFoundException extends BadRequestException {
+
+    public ReviewGroupSessionNotFoundException() {
+        super("리뷰 그룹 세션이 존재하지 않아요.");
+    }
+}

backend/src/main/java/reviewme/reviewgroup/controller/ReviewGroupSessionResolver.java

@@ -0,0 +1,42 @@
+package reviewme.reviewgroup.controller;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import lombok.RequiredArgsConstructor;
+import org.springframework.core.MethodParameter;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+import reviewme.reviewgroup.domain.ReviewGroup;
+import reviewme.reviewgroup.service.ReviewGroupService;
+
+@RequiredArgsConstructor
+public class ReviewGroupSessionResolver implements HandlerMethodArgumentResolver {
+
+    private static final String SESSION_KEY = "reviewRequestCode";
+
+    private final ReviewGroupService reviewGroupService;
+
+    @Override
+    public boolean supportsParameter(MethodParameter parameter) {
+        return parameter.hasParameterAnnotation(ReviewGroupSession.class);
+    }
+
+    @Override
+    public ReviewGroup resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
+                                       NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
+        HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class);
+        HttpSession session = request.getSession(false);
+
+        // 세션이 없거나, 세션 안에 reviewRequestCode가 존재하지 않는 경우
+        if (session == null) {
+            throw new ReviewGroupSessionNotFoundException();
+        }
+        String reviewRequestCode = (String) session.getAttribute(SESSION_KEY);
+        if (reviewRequestCode == null) {
+            throw new ReviewGroupSessionNotFoundException();
+        }
+        return reviewGroupService.getReviewGroupByReviewRequestCode(reviewRequestCode);
+    }
+}