[REFACTOR] #197: 기존 신입 멤버 가입 신청 및 조회 api 리팩토링

src/main/java/inha/gdgoc/domain/auth/exception/AuthErrorCode.java

@@ -1,6 +1,6 @@
 package inha.gdgoc.domain.auth.exception;
 
-import inha.gdgoc.global.error.ErrorCode;
+import inha.gdgoc.global.exception.ErrorCode;
 import org.springframework.http.HttpStatus;
 
 public enum AuthErrorCode implements ErrorCode {

src/main/java/inha/gdgoc/domain/auth/exception/AuthException.java

@@ -1,7 +1,7 @@
 package inha.gdgoc.domain.auth.exception;
 
-import inha.gdgoc.global.error.BusinessException;
-import inha.gdgoc.global.error.ErrorCode;
+import inha.gdgoc.global.exception.BusinessException;
+import inha.gdgoc.global.exception.ErrorCode;
 
 public class AuthException extends BusinessException {
 

src/main/java/inha/gdgoc/domain/auth/service/AuthService.java

@@ -91,7 +91,7 @@ public Map<String, Object> processOAuthLogin(String code, HttpServletResponse re
         Optional<User> foundUser = userRepository.findByEmail(email);
         if (foundUser.isEmpty()) {
             return Map.of(
-                "exists", false,
+                "isExists", false,
                 "email", email,
                 "name", name
             );
@@ -117,7 +117,7 @@ public Map<String, Object> processOAuthLogin(String code, HttpServletResponse re
         response.addHeader(HttpHeaders.SET_COOKIE, refreshCookie.toString());
 
         return Map.of(
-            "exists", true,
+            "isExists", true,
             "access_token", jwtAccessToken
         );
     }

src/main/java/inha/gdgoc/domain/recruit/controller/RecruitMemberController.java

@@ -6,16 +6,20 @@
 import static inha.gdgoc.domain.recruit.controller.message.RecruitMemberMessage.STUDENT_ID_DUPLICATION_CHECK_SUCCESS;
 
 import inha.gdgoc.domain.recruit.dto.request.ApplicationRequest;
-import inha.gdgoc.domain.recruit.dto.request.CheckPhoneNumberRequest;
-import inha.gdgoc.domain.recruit.dto.request.CheckStudentIdRequest;
+import inha.gdgoc.domain.recruit.dto.response.CheckPhoneNumberResponse;
+import inha.gdgoc.domain.recruit.dto.response.CheckStudentIdResponse;
 import inha.gdgoc.domain.recruit.dto.response.SpecifiedMemberResponse;
 import inha.gdgoc.domain.recruit.service.RecruitMemberService;
 import inha.gdgoc.global.dto.response.ApiResponse;
-import jakarta.validation.Valid;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,34 +42,45 @@ public ResponseEntity<ApiResponse<Void, Void>> recruitMemberAdd(
         return ResponseEntity.ok(ApiResponse.ok(MEMBER_SAVE_SUCCESS));
     }
 
-    // TODO valid 핸들러 추가
-    // TODO DTO로 응답 리팩토링, requestparam으로 변경하기
-    @GetMapping("/check/studentId")
-    public ResponseEntity<ApiResponse<Boolean, Void>> duplicatedStudentIdDetails(
-            @Valid @ModelAttribute CheckStudentIdRequest studentIdRequest
+    @GetMapping("/studentId")
+    public ResponseEntity<ApiResponse<CheckStudentIdResponse, Void>> duplicatedStudentIdDetails(
+            @RequestParam
+            @NotBlank(message = "학번은 필수 입력 값입니다.")
+            @Pattern(regexp = "^12[0-9]{6}$", message = "유효하지 않은 학번 값입니다.")
+            String studentId
     ) {
-        boolean exists = recruitMemberService.isRegisteredStudentId(studentIdRequest.getStudentId());
+        CheckStudentIdResponse response = recruitMemberService.isRegisteredStudentId(studentId);
 
-        return ResponseEntity.ok(ApiResponse.ok(STUDENT_ID_DUPLICATION_CHECK_SUCCESS, exists));
+        return ResponseEntity.ok(ApiResponse.ok(STUDENT_ID_DUPLICATION_CHECK_SUCCESS, response));
     }
 
-    // TODO DTO로 응답 리팩토링
     @GetMapping("/check/phoneNumber")
-    public ResponseEntity<ApiResponse<Boolean, Void>> duplicatedPhoneNumberDetails(
-            @Valid @ModelAttribute CheckPhoneNumberRequest phoneNumberRequest
+    public ResponseEntity<ApiResponse<CheckPhoneNumberResponse, Void>> duplicatedPhoneNumberDetails(
+            @RequestParam
+            @NotBlank(message = "전화번호는 필수 입력 값입니다.")
+            @Pattern(regexp = "^010-\\d{4}-\\d{4}$", message = "전화번호 형식은 010-XXXX-XXXX 이어야 합니다.")
+            String phoneNumber
     ) {
-        boolean exists = recruitMemberService.isRegisteredPhoneNumber(phoneNumberRequest.getPhoneNumber());
+        CheckPhoneNumberResponse response = recruitMemberService
+                .isRegisteredPhoneNumber(phoneNumber);
 
-        return ResponseEntity.ok(ApiResponse.ok(PHONE_NUMBER_DUPLICATION_CHECK_SUCCESS, exists));
+        return ResponseEntity.ok(ApiResponse.ok(PHONE_NUMBER_DUPLICATION_CHECK_SUCCESS, response));
     }
 
-    // TODO 코어 멤버 인증 리팩토링 (Authentication), requestparam으로 변경하기
-    @GetMapping("/recruit/member")
-    public ResponseEntity<ApiResponse<SpecifiedMemberResponse, Void>> getSpecifiedMember (
-            @RequestParam Long userId
+    @Operation(summary = "특정 멤버 가입 신청서 조회", security = { @SecurityRequirement(name = "BearerAuth") })
+    @PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/recruit/members/{memberId}")
+    public ResponseEntity<ApiResponse<SpecifiedMemberResponse, Void>> getSpecifiedMember(
+            @PathVariable Long memberId
     ) {
-        SpecifiedMemberResponse response = recruitMemberService.findSpecifiedMember(userId);
+        SpecifiedMemberResponse response = recruitMemberService.findSpecifiedMember(memberId);
 
         return ResponseEntity.ok(ApiResponse.ok(MEMBER_RETRIEVED_SUCCESS, response));
     }
+
+    // TODO 전체 응답 조회 및 검색
+
+    // TODO 입금 완료
+
+    // TODO 입금 미완료
 }

src/main/java/inha/gdgoc/domain/recruit/dto/request/RecruitMemberRequest.java

@@ -40,7 +40,7 @@ public RecruitMember toEntity() {
                 .birth(birth)
                 .major(major)
                 .doubleMajor(doubleMajor)
-                .isPayed(isPayed)
+                .isPayed(false)
                 .build();
     }
 }

src/main/java/inha/gdgoc/domain/recruit/dto/response/AnswerResponse.java

@@ -0,0 +1,49 @@
+package inha.gdgoc.domain.recruit.dto.response;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import inha.gdgoc.domain.recruit.entity.Answer;
+import inha.gdgoc.domain.recruit.enums.InputType;
+import java.util.List;
+import java.util.Map;
+
+public record AnswerResponse(
+        Long id,
+        InputType inputType,
+        Object responseValue
+) {
+    public static AnswerResponse from(Answer answer, ObjectMapper om) {
+        return new AnswerResponse(
+                answer.getId(),
+                answer.getInputType(),
+                toFriendlyValue(answer.getResponseValue(), om)
+        );
+    }
+
+    private static Object toFriendlyValue(String json, ObjectMapper om) {
+        if (json == null || json.isBlank()) return null;
+        try {
+            JsonNode node = om.readTree(json);
+
+            if (node.isTextual()) {
+                return node.asText();
+            }
+            if (node.isArray()) {
+                return om.convertValue(node, new TypeReference<List<Object>>() {});
+            }
+            if (node.isObject()) {
+                return om.convertValue(node, new TypeReference<Map<String, Object>>() {});
+            }
+            if (node.isNumber()) {
+                return node.numberValue();
+            }
+            if (node.isBoolean()) {
+                return node.booleanValue();
+            }
+            return null;
+        } catch (Exception e) {
+            return json;
+        }
+    }
+}

src/main/java/inha/gdgoc/domain/recruit/dto/response/AnswersResponse.java

@@ -0,0 +1,17 @@
+package inha.gdgoc.domain.recruit.dto.response;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import inha.gdgoc.domain.recruit.entity.Answer;
+import java.util.List;
+
+public record AnswersResponse(
+        List<AnswerResponse> answers
+) {
+    public static AnswersResponse from(List<Answer> entities, ObjectMapper objectMapper) {
+        return new AnswersResponse(
+                entities.stream()
+                        .map(a -> AnswerResponse.from(a, objectMapper))
+                        .toList()
+        );
+    }
+}

src/main/java/inha/gdgoc/domain/recruit/dto/response/CheckPhoneNumberResponse.java

@@ -0,0 +1,5 @@
+package inha.gdgoc.domain.recruit.dto.response;
+
+public record CheckPhoneNumberResponse(boolean isExists) {
+
+}

src/main/java/inha/gdgoc/domain/recruit/dto/response/CheckStudentIdResponse.java

@@ -0,0 +1,5 @@
+package inha.gdgoc.domain.recruit.dto.response;
+
+public record CheckStudentIdResponse(boolean isExists) {
+
+}

src/main/java/inha/gdgoc/domain/recruit/dto/response/SpecifiedMemberResponse.java

@@ -1,20 +1,29 @@
 package inha.gdgoc.domain.recruit.dto.response;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import inha.gdgoc.domain.recruit.entity.Answer;
 import inha.gdgoc.domain.recruit.entity.RecruitMember;
+import java.util.List;
 
 public record SpecifiedMemberResponse(
         String name,
         String major,
         String studentId,
-        boolean isPayed
+        boolean isPayed,
+        AnswersResponse answers
 ) {
 
-    public static SpecifiedMemberResponse from(RecruitMember member) {
+    public static SpecifiedMemberResponse from(
+            RecruitMember member,
+            List<Answer> answers,
+            ObjectMapper objectMapper
+    ) {
         return new SpecifiedMemberResponse(
                 member.getName(),
                 member.getMajor(),
                 member.getStudentId(),
-                Boolean.TRUE.equals(member.getIsPayed())
+                Boolean.TRUE.equals(member.getIsPayed()),
+                AnswersResponse.from(answers, objectMapper)
         );
     }
 }

src/main/java/inha/gdgoc/domain/recruit/exception/RecruitMemberErrorCode.java

@@ -1,6 +1,6 @@
 package inha.gdgoc.domain.recruit.exception;
 
-import inha.gdgoc.global.error.ErrorCode;
+import inha.gdgoc.global.exception.ErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 

src/main/java/inha/gdgoc/domain/recruit/exception/RecruitMemberException.java

@@ -1,7 +1,7 @@
 package inha.gdgoc.domain.recruit.exception;
 
-import inha.gdgoc.global.error.BusinessException;
-import inha.gdgoc.global.error.ErrorCode;
+import inha.gdgoc.global.exception.BusinessException;
+import inha.gdgoc.global.exception.ErrorCode;
 
 public class RecruitMemberException extends BusinessException {
 

src/main/java/inha/gdgoc/domain/recruit/repository/AnswerRepository.java

@@ -1,7 +1,15 @@
 package inha.gdgoc.domain.recruit.repository;
 
 import inha.gdgoc.domain.recruit.entity.Answer;
+import inha.gdgoc.domain.recruit.entity.RecruitMember;
+import inha.gdgoc.domain.recruit.enums.SurveyType;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface AnswerRepository extends JpaRepository<Answer, Long> {
+
+    List<Answer> findByRecruitMemberAndSurveyType(
+            RecruitMember recruitMember,
+            SurveyType surveyType
+    );
 }

src/main/java/inha/gdgoc/domain/recruit/service/RecruitMemberService.java

@@ -4,6 +4,8 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import inha.gdgoc.domain.recruit.dto.request.ApplicationRequest;
+import inha.gdgoc.domain.recruit.dto.response.CheckPhoneNumberResponse;
+import inha.gdgoc.domain.recruit.dto.response.CheckStudentIdResponse;
 import inha.gdgoc.domain.recruit.dto.response.SpecifiedMemberResponse;
 import inha.gdgoc.domain.recruit.entity.Answer;
 import inha.gdgoc.domain.recruit.entity.RecruitMember;
@@ -45,18 +47,24 @@ public void addRecruitMember(ApplicationRequest applicationRequest) {
         answerRepository.saveAll(answers);
     }
 
-    public boolean isRegisteredStudentId(String studentId) {
-        return recruitMemberRepository.existsByStudentId(studentId);
+    public CheckStudentIdResponse isRegisteredStudentId(String studentId) {
+        boolean exists = recruitMemberRepository.existsByStudentId(studentId);
+
+        return new CheckStudentIdResponse(exists);
     }
 
-    public boolean isRegisteredPhoneNumber(String phoneNumber) {
-        return recruitMemberRepository.existsByPhoneNumber(phoneNumber);
+    public CheckPhoneNumberResponse isRegisteredPhoneNumber(String phoneNumber) {
+        boolean exists = recruitMemberRepository.existsByPhoneNumber(phoneNumber);
+
+        return new CheckPhoneNumberResponse(exists);
     }
 
     public SpecifiedMemberResponse findSpecifiedMember(Long id) {
         RecruitMember member = recruitMemberRepository.findById(id)
                 .orElseThrow(() -> new RecruitMemberException(RECRUIT_MEMBER_NOT_FOUND));
+        List<Answer> answers = answerRepository
+                .findByRecruitMemberAndSurveyType(member, SurveyType.RECRUIT);
 
-        return SpecifiedMemberResponse.from(member);
+        return SpecifiedMemberResponse.from(member, answers, objectMapper);
     }
 }

src/main/java/inha/gdgoc/domain/resource/exception/ResourceErrorCode.java

@@ -1,6 +1,6 @@
 package inha.gdgoc.domain.resource.exception;
 
-import inha.gdgoc.global.error.ErrorCode;
+import inha.gdgoc.global.exception.ErrorCode;
 import org.springframework.http.HttpStatus;
 
 public enum ResourceErrorCode implements ErrorCode {

src/main/java/inha/gdgoc/domain/resource/exception/ResourceException.java

@@ -1,7 +1,7 @@
 package inha.gdgoc.domain.resource.exception;
 
-import inha.gdgoc.global.error.BusinessException;
-import inha.gdgoc.global.error.ErrorCode;
+import inha.gdgoc.global.exception.BusinessException;
+import inha.gdgoc.global.exception.ErrorCode;
 
 public class ResourceException extends BusinessException {
 

src/main/java/inha/gdgoc/domain/study/exception/StudyAttendeeErrorCode.java

@@ -1,6 +1,6 @@
 package inha.gdgoc.domain.study.exception;
 
-import inha.gdgoc.global.error.ErrorCode;
+import inha.gdgoc.global.exception.ErrorCode;
 import org.springframework.http.HttpStatus;
 
 public enum StudyAttendeeErrorCode implements ErrorCode {

src/main/java/inha/gdgoc/domain/study/exception/StudyAttendeeException.java

@@ -1,7 +1,7 @@
 package inha.gdgoc.domain.study.exception;
 
-import inha.gdgoc.global.error.BusinessException;
-import inha.gdgoc.global.error.ErrorCode;
+import inha.gdgoc.global.exception.BusinessException;
+import inha.gdgoc.global.exception.ErrorCode;
 
 public class StudyAttendeeException extends BusinessException {
 

src/main/java/inha/gdgoc/domain/study/exception/StudyErrorCode.java

@@ -1,6 +1,6 @@
 package inha.gdgoc.domain.study.exception;
 
-import inha.gdgoc.global.error.ErrorCode;
+import inha.gdgoc.global.exception.ErrorCode;
 import org.springframework.http.HttpStatus;
 
 public enum StudyErrorCode implements ErrorCode {

src/main/java/inha/gdgoc/domain/study/exception/StudyException.java

@@ -1,7 +1,7 @@
 package inha.gdgoc.domain.study.exception;
 
-import inha.gdgoc.global.error.BusinessException;
-import inha.gdgoc.global.error.ErrorCode;
+import inha.gdgoc.global.exception.BusinessException;
+import inha.gdgoc.global.exception.ErrorCode;
 
 public class StudyException extends BusinessException {
 

src/main/java/inha/gdgoc/domain/user/exception/UserErrorCode.java

@@ -1,6 +1,6 @@
 package inha.gdgoc.domain.user.exception;
 
-import inha.gdgoc.global.error.ErrorCode;
+import inha.gdgoc.global.exception.ErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;