feat: 모집 공고 API 리팩토링 (#537)

023-dev · web-flow · commit d87d55d9f937 · 2026-05-03T22:45:12.000+09:00
* Align public recruit path with existing API naming The active recruit endpoint was introduced under /recruitments, but the current rollout should avoid broad URL vocabulary changes while frontend integration is pending. Keep the endpoint under /recruit and limit this PR to controller/API spec/test path updates. Constraint: Frontend integration should not absorb URL naming changes yet Rejected: Rename response field recruitments | expands frontend payload contract changes Confidence: high Scope-risk: narrow Tested: ./gradlew cleanTest test --tests org.ject.support.domain.recruit.controller.RecruitControllerTest -x jacocoTestCoverageVerification Not-tested: Full test suite; targeted path-only change Related: #536 * Restore public recruits path for active listings The previous correction used singular /recruit, but the existing public naming is plural /recruits. Keep the active listing endpoint aligned with that existing route vocabulary instead of introducing another URL shape. Constraint: Frontend integration should avoid API URL churn Rejected: Keep /recruit | does not match the existing public route naming Confidence: high Scope-risk: narrow Tested: ./gradlew cleanTest test --tests org.ject.support.domain.recruit.controller.RecruitControllerTest -x jacocoTestCoverageVerification Not-tested: Full test suite; targeted route correction only Related: #536 * Allow question lookup by recruit id Applicants need to continue using the existing /apply/questions URL while the frontend migrates gradually. Extend the current question lookup contract with an optional recruitId query path and keep the legacy jobFamily lookup unchanged. Constraint: Do not introduce a new questions URL in this rollout Rejected: Add /recruitments/{recruitId}/questions | creates frontend URL churn before integration capacity is available Confidence: high Scope-risk: moderate Directive: Keep /apply/questions jobFamily compatibility until the recruitId-based apply flow is fully adopted Tested: ./gradlew cleanTest test --tests org.ject.support.domain.recruit.service.QuestionServiceTest --tests org.ject.support.domain.recruit.repository.QuestionQueryRepositoryTest -x jacocoTestCoverageVerification Not-tested: QuestionControllerTest locally; blocked by Docker/Testcontainers Redis availability Related: #536 * Require recruit id for question lookup The public question lookup contract now identifies the active notice directly, so the controller no longer accepts a parallel jobFamily filter or validates a mixed recruitId/jobFamily condition. The service and query layer follow the same single-key path, which keeps cache entries scoped by recruit id and avoids exposing legacy jobFamily lookup behavior through this API. Constraint: Review feedback requested recruitId as the required question lookup parameter Rejected: Keep jobFamily as an optional compatibility parameter | it preserved ambiguity and required extra mismatch handling Confidence: high Scope-risk: narrow Directive: Do not reintroduce jobFamily-based question lookup without a separate compatibility decision Tested: ./gradlew cleanTest test --tests org.ject.support.domain.recruit.service.QuestionServiceTest --tests org.ject.support.domain.recruit.repository.QuestionQueryRepositoryTest -x jacocoTestCoverageVerification Not-tested: QuestionControllerTest and CacheFallbackIntegrationTest require local Docker/Testcontainers Redis; context load failed before tests ran * Assert question error response code Question lookup errors are serialized through ErrorResponse, whose machine-readable value is exposed as code rather than status. Keeping the test on code makes the missing recruitId case verify the actual error contract instead of a success-response field. Constraint: CodeRabbit identified the stale status-path assertion pattern in the outdated review thread Confidence: high Scope-risk: narrow Tested: ./gradlew cleanTest test --tests org.ject.support.domain.recruit.service.QuestionServiceTest --tests org.ject.support.domain.recruit.repository.QuestionQueryRepositoryTest -x jacocoTestCoverageVerification Not-tested: QuestionControllerTest requires local Docker/Testcontainers Redis; previous runs failed during context loading before assertions * Keep wrapped error status assertion QuestionControllerTest should assert the final API envelope produced by ResponseWrapper. ErrorResponse exposes code internally, but the response advice converts it into ApiResponse.status for clients, so the missing recruitId case must continue to verify status=GLOBAL-10. Constraint: ResponseWrapper wraps ErrorResponse into ApiResponse before serialization Rejected: Assert $.code | that path is not present in the final wrapped response body Confidence: high Scope-risk: narrow Tested: ./gradlew cleanTest test --tests org.ject.support.domain.recruit.service.QuestionServiceTest --tests org.ject.support.domain.recruit.repository.QuestionQueryRepositoryTest -x jacocoTestCoverageVerification Not-tested: QuestionControllerTest requires local Docker/Testcontainers Redis in this environment
diff --git a/src/main/java/org/ject/support/domain/recruit/controller/QuestionApiSpec.java b/src/main/java/org/ject/support/domain/recruit/controller/QuestionApiSpec.java
@@ -2,7 +2,6 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.ject.support.domain.member.JobFamily;
 import org.ject.support.domain.recruit.dto.QuestionResponses;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -11,6 +10,6 @@ public interface QuestionApiSpec {
 
     @Operation(
             summary = "지원서 문항 목록 조회",
-            description = "현재 모집 중인 지원서에 한해, 전달된 직군에 해당하는 문항을 모두 조회합니다.")
-    QuestionResponses findQuestions(@RequestParam JobFamily jobFamily);
+            description = "현재 모집 중인 지원서에 한해, 전달된 모집 공고에 해당하는 문항을 모두 조회합니다.")
+    QuestionResponses findQuestions(@RequestParam Long recruitId);
 }
diff --git a/src/main/java/org/ject/support/domain/recruit/controller/QuestionController.java b/src/main/java/org/ject/support/domain/recruit/controller/QuestionController.java
@@ -1,7 +1,6 @@
 package org.ject.support.domain.recruit.controller;
 
 import lombok.RequiredArgsConstructor;
-import org.ject.support.domain.member.JobFamily;
 import org.ject.support.domain.recruit.dto.QuestionResponses;
 import org.ject.support.domain.recruit.service.QuestionService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -20,7 +19,7 @@ public class QuestionController implements QuestionApiSpec {
     @Override
     @GetMapping
     @PreAuthorize("hasRole('ROLE_APPLY')")
-    public QuestionResponses findQuestions(@RequestParam JobFamily jobFamily) {
-        return questionService.findQuestions(jobFamily);
+    public QuestionResponses findQuestions(@RequestParam Long recruitId) {
+        return questionService.findQuestions(recruitId);
     }
 }
diff --git a/src/main/java/org/ject/support/domain/recruit/controller/RecruitApiSpec.java b/src/main/java/org/ject/support/domain/recruit/controller/RecruitApiSpec.java
@@ -4,7 +4,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.ject.support.domain.recruit.dto.ActiveRecruitmentResponses;
 
-@Tag(name = "Recruitment", description = "모집 공고 API")
+@Tag(name = "Recruit", description = "모집 공고 API")
 public interface RecruitApiSpec {
 
     @Operation(
diff --git a/src/main/java/org/ject/support/domain/recruit/controller/RecruitController.java b/src/main/java/org/ject/support/domain/recruit/controller/RecruitController.java
@@ -8,7 +8,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/recruitments")
+@RequestMapping("/recruits")
 @RequiredArgsConstructor
 public class RecruitController implements RecruitApiSpec {
 
diff --git a/src/main/java/org/ject/support/domain/recruit/repository/QuestionQueryRepository.java b/src/main/java/org/ject/support/domain/recruit/repository/QuestionQueryRepository.java
@@ -1,12 +1,11 @@
 package org.ject.support.domain.recruit.repository;
 
-import org.ject.support.domain.member.JobFamily;
 import org.ject.support.domain.recruit.dto.QuestionResponse;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
 public interface QuestionQueryRepository {
 
-    List<QuestionResponse> findByJobFamilyOfActiveRecruit(LocalDateTime now, JobFamily jobFamily);
+    List<QuestionResponse> findByRecruitIdOfActiveRecruit(LocalDateTime now, Long recruitId);
 }
diff --git a/src/main/java/org/ject/support/domain/recruit/repository/QuestionQueryRepositoryImpl.java b/src/main/java/org/ject/support/domain/recruit/repository/QuestionQueryRepositoryImpl.java
@@ -1,9 +1,9 @@
 package org.ject.support.domain.recruit.repository;
 
 import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
-import org.ject.support.domain.member.JobFamily;
 import org.ject.support.domain.recruit.dto.QQuestionResponse;
 import org.ject.support.domain.recruit.dto.QuestionResponse;
 import org.springframework.stereotype.Repository;
@@ -21,8 +21,15 @@ public class QuestionQueryRepositoryImpl implements QuestionQueryRepository {
     private final JPAQueryFactory queryFactory;
 
     @Override
-    public List<QuestionResponse> findByJobFamilyOfActiveRecruit(final LocalDateTime now,
-                                                                 final JobFamily jobFamily) {
+    public List<QuestionResponse> findByRecruitIdOfActiveRecruit(final LocalDateTime now,
+                                                                final Long recruitId) {
+        return selectQuestions()
+                .where(isWithinRecruitPeriod(now), recruit.id.eq(recruitId))
+                .orderBy(question.sequence.asc())
+                .fetch();
+    }
+
+    private JPAQuery<QuestionResponse> selectQuestions() {
         return queryFactory.select(new QQuestionResponse(
                         question.id,
                         question.sequence,
@@ -36,10 +43,7 @@ public List<QuestionResponse> findByJobFamilyOfActiveRecruit(final LocalDateTime
                         question.maxTextLength,
                         question.maxFileSize))
                 .from(question)
-                .leftJoin(question.recruit, recruit)
-                .where(isWithinRecruitPeriod(now), recruit.jobFamily.eq(jobFamily))
-                .orderBy(question.sequence.asc())
-                .fetch();
+                .leftJoin(question.recruit, recruit);
     }
 
     private BooleanExpression isWithinRecruitPeriod(LocalDateTime now) {
diff --git a/src/main/java/org/ject/support/domain/recruit/service/QuestionService.java b/src/main/java/org/ject/support/domain/recruit/service/QuestionService.java
@@ -1,26 +1,32 @@
 package org.ject.support.domain.recruit.service;
 
 import lombok.RequiredArgsConstructor;
-import org.ject.support.common.util.PeriodAccessible;
-import org.ject.support.domain.member.JobFamily;
 import org.ject.support.domain.recruit.dto.QuestionResponses;
+import org.ject.support.domain.recruit.exception.RecruitErrorCode;
+import org.ject.support.domain.recruit.exception.RecruitException;
 import org.ject.support.domain.recruit.repository.QuestionRepository;
+import org.ject.support.domain.recruit.repository.RecruitRepository;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
 public class QuestionService {
 
     private final QuestionRepository questionRepository;
+    private final RecruitRepository recruitRepository;
 
-    @Cacheable(value = "question", key = "#jobFamily")
-    @PeriodAccessible
+    @Cacheable(value = "question", key = "'RECRUIT:' + #recruitId")
     @Transactional(readOnly = true)
-    public QuestionResponses findQuestions(final JobFamily jobFamily) {
-        return new QuestionResponses(questionRepository.findByJobFamilyOfActiveRecruit(LocalDateTime.now(), jobFamily));
+    public QuestionResponses findQuestions(final Long recruitId) {
+        LocalDateTime now = LocalDateTime.now();
+        Optional.ofNullable(recruitRepository.findActiveRecruitById(recruitId, now))
+                .orElseThrow(() -> new RecruitException(RecruitErrorCode.NOT_FOUND_RECRUIT));
+
+        return new QuestionResponses(questionRepository.findByRecruitIdOfActiveRecruit(now, recruitId));
     }
 }
diff --git a/src/test/java/org/ject/support/common/data/redis/resilience/CacheFallbackIntegrationTest.java b/src/test/java/org/ject/support/common/data/redis/resilience/CacheFallbackIntegrationTest.java
@@ -52,6 +52,8 @@ class CacheFallbackIntegrationTest {
     @Autowired
     private RedisCacheCircuitBreakerProvider circuitBreakerProvider;
 
+    private Recruit recruit;
+
     @BeforeEach
     void setUp() {
         String uniqueSuffix = String.valueOf(System.currentTimeMillis());
@@ -64,7 +66,7 @@ void setUp() {
                 .isRecruiting(true)
                 .build());
 
-        Recruit recruit = Recruit.builder()
+        recruit = Recruit.builder()
                 .startDate(LocalDateTime.now().minusDays(1))
                 .endDate(LocalDateTime.now().plusDays(1))
                 .semester(savedSemester)
@@ -104,7 +106,7 @@ void shouldFallbackToDbWhenRedisIsDown() {
 
         // when: 캐시가 적용된 서비스 메서드 호출
         // Redis가 죽어있으므로 CacheErrorHandler가 예외를 잡고, DB에서 데이터를 가져와야 함
-        QuestionResponses response = questionService.findQuestions(JobFamily.BE);
+        QuestionResponses response = questionService.findQuestions(recruit.getId());
 
         // then
         assertThat(response).isNotNull();
diff --git a/src/test/java/org/ject/support/domain/recruit/controller/QuestionControllerTest.java b/src/test/java/org/ject/support/domain/recruit/controller/QuestionControllerTest.java
@@ -1,6 +1,5 @@
 package org.ject.support.domain.recruit.controller;
 
-import org.assertj.core.api.Assertions;
 import org.ject.support.domain.member.JobFamily;
 import org.ject.support.domain.member.MemberStatus;
 import org.ject.support.domain.member.Role;
@@ -15,7 +14,6 @@
 import org.ject.support.testconfig.AuthenticatedUser;
 import org.ject.support.testconfig.IntegrationTest;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -26,11 +24,13 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.ject.support.domain.recruit.domain.Question.InputType.TEXT;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @IntegrationTest
@@ -57,9 +57,11 @@ class QuestionControllerTest {
     RedisTemplate<String, String> redisTemplate;
 
     Member member;
+    Recruit recruit;
 
     @BeforeEach
     void setUp() {
+        String uniqueSuffix = String.valueOf(System.nanoTime());
         List<Question> questions = List.of(
                 Question.builder().sequence(1).inputType(TEXT).isRequired(true).title("title1").label("label").selectOptions(List.of("a", "b", "c")).build(),
                 Question.builder().sequence(2).inputType(TEXT).isRequired(true).title("title2").label("label").build(),
@@ -69,11 +71,11 @@ void setUp() {
         );
 
         Semester savedSemester = semesterRepository.save(Semester.builder()
-                .name("1기")
+                .name("1기" + uniqueSuffix)
                 .isRecruiting(true)
                 .build());
 
-        Recruit recruit = Recruit.builder()
+        recruit = Recruit.builder()
                 .startDate(LocalDateTime.now().minusDays(1))
                 .endDate(LocalDateTime.now().plusDays(1))
                 .semester(savedSemester)
@@ -87,7 +89,7 @@ void setUp() {
         recruitRepository.save(recruit);
 
         member = Member.builder()
-                .email("test32@gmail.com")
+                .email("test32" + uniqueSuffix + "@gmail.com")
                 .semesterId(1L)
                 .jobFamily(JobFamily.BE)
                 .name("김젝트")
@@ -100,18 +102,38 @@ void setUp() {
     }
 
     @Test
-    @DisplayName("지원서 문항 조회 시 redis에 캐싱")
     @AuthenticatedUser
-    void find_questions_cache() throws Exception {
+    void 지원서_문항_조회_시_redis에_캐싱한다() throws Exception {
         // when
         mockMvc.perform(get("/apply/questions")
-                        .param("jobFamily", "BE"))
+                        .param("recruitId", recruit.getId().toString()))
                 .andExpect(status().isOk())
                 .andExpect(content().string(containsString("SUCCESS")))
                 .andDo(print());
 
         // then
-        Long countExistingKeys = redisTemplate.countExistingKeys(List.of("cache::question::BE"));
-        Assertions.assertThat(countExistingKeys).isEqualTo(1);
+        Long countExistingKeys = redisTemplate.countExistingKeys(List.of("cache::question::RECRUIT:" + recruit.getId()));
+        assertThat(countExistingKeys).isEqualTo(1);
+    }
+
+    @Test
+    @AuthenticatedUser
+    void 모집_공고_기준으로_지원서_문항을_조회한다() throws Exception {
+        // when, then
+        mockMvc.perform(get("/apply/questions")
+                        .param("recruitId", recruit.getId().toString()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.status").value("SUCCESS"))
+                .andExpect(jsonPath("$.data.questionResponses[0].title").value("title1"))
+                .andExpect(jsonPath("$.data.questionResponses[4].title").value("title5"));
+    }
+
+    @Test
+    @AuthenticatedUser
+    void 모집_공고_식별자가_없으면_에러를_반환한다() throws Exception {
+        // when, then
+        mockMvc.perform(get("/apply/questions"))
+                .andExpect(status().isBadRequest())
+                .andExpect(jsonPath("$.status").value("GLOBAL-10"));
     }
 }
diff --git a/src/test/java/org/ject/support/domain/recruit/controller/RecruitControllerTest.java b/src/test/java/org/ject/support/domain/recruit/controller/RecruitControllerTest.java
@@ -62,7 +62,7 @@ void setUp() {
         given(recruitUsecase.findActiveRecruitments()).willReturn(responses);
 
         // when, then
-        mockMvc.perform(get("/recruitments/active"))
+        mockMvc.perform(get("/recruits/active"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.status").value("SUCCESS"))
                 .andExpect(jsonPath("$.data.recruitments", hasSize(2)))
@@ -82,7 +82,7 @@ void setUp() {
         given(recruitUsecase.findActiveRecruitments()).willReturn(new ActiveRecruitmentResponses(List.of()));
 
         // when, then
-        mockMvc.perform(get("/recruitments/active"))
+        mockMvc.perform(get("/recruits/active"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.status").value("SUCCESS"))
                 .andExpect(jsonPath("$.data.recruitments", hasSize(0)));
diff --git a/src/test/java/org/ject/support/domain/recruit/repository/QuestionQueryRepositoryTest.java b/src/test/java/org/ject/support/domain/recruit/repository/QuestionQueryRepositoryTest.java
@@ -6,7 +6,6 @@
 import org.ject.support.domain.recruit.domain.Semester;
 import org.ject.support.domain.recruit.dto.QuestionResponse;
 import org.ject.support.testconfig.QueryDslTestConfig;
-import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
@@ -35,8 +34,7 @@ class QuestionQueryRepositoryTest {
     private SemesterRepository semesterRepository;
 
     @Test
-    @DisplayName("현재 모집중인 직군의 지원서 문항 조회")
-    void find_by_job_family() {
+    void 현재_모집중인_모집_공고의_지원서_문항을_조회한다() {
         // given
         Semester savedSemester = semesterRepository.save(Semester.builder()
                 .name("1기")
@@ -51,22 +49,19 @@ void find_by_job_family() {
         Question feQuestion1 = createQuestion(1, TEXT, feRecruit);
         Question feQuestion2 = createQuestion(2, FILE, feRecruit);
         Question beQuestion1 = createQuestion(1, TEXT, beRecruit);
-        Question beQuestion2 = createQuestion(2, TEXT, beRecruit);
-        Question beQuestion3 = createQuestion(3, FILE, beRecruit);
-        questionRepository.saveAll(List.of(feQuestion1, feQuestion2, beQuestion3, beQuestion1, beQuestion2));
+        questionRepository.saveAll(List.of(beQuestion1, feQuestion2, feQuestion1));
 
         // when
-        List<QuestionResponse> result = questionRepository.findByJobFamilyOfActiveRecruit(now, BE);
+        List<QuestionResponse> result = questionRepository.findByRecruitIdOfActiveRecruit(now, feRecruit.getId());
 
         // then
-        assertThat(result).hasSize(3);
+        assertThat(result).hasSize(2);
         assertThat(result).extracting(QuestionResponse::sequence)
-                .containsExactly(1, 2, 3);
+                .containsExactly(1, 2);
     }
 
     @Test
-    @DisplayName("selectOptions가 List<String>와 JSON 문자열 간 정상 변환됨")
-    void convert_select_options() {
+    void selectOptions가_List_String과_JSON_문자열_간_정상_변환된다() {
         // given
         List<String> selectOptions = List.of("재직", "재학", "졸업", "휴학");
 
@@ -119,4 +114,4 @@ private Question createQuestion(int sequence, Question.InputType inputType, Recr
                 .recruit(recruit)
                 .build();
     }
-}
+}
diff --git a/src/test/java/org/ject/support/domain/recruit/service/QuestionServiceTest.java b/src/test/java/org/ject/support/domain/recruit/service/QuestionServiceTest.java
