Merge pull request #161 from ASSU-org/refactor/#160-phone-api-integration

[REFACTOR/#160] 전화번호 중복 가입 확인 API와 검증 번호 전송 API 통합

Author: 2ghrms

src/main/java/com/assu/server/domain/auth/controller/AuthController.java

@@ -37,28 +37,29 @@
 public class AuthController {
 
     private final PhoneAuthService phoneAuthService;
+    private final EmailAuthService emailAuthService;
     private final SignUpService signUpService;
     private final LoginService loginService;
     private final LogoutService logoutService;
     private final SSUAuthService ssuAuthService;
     private final WithdrawalService withdrawalService;
-    private final VerificationService verificationService;
 
     @Operation(
-            summary = "휴대폰 인증번호 발송 API",
-            description = "# [v1.0 (2025-09-03)](https://clumsy-seeder-416.notion.site/2241197c19ed801bbcd9f61c3e5f5457?source=copy_link)\n" +
+            summary = "휴대폰 번호 중복가입 확인 및 인증번호 발송 API",
+            description = "# [v1.1 (2025-09-25)](https://clumsy-seeder-416.notion.site/2241197c19ed801bbcd9f61c3e5f5457?source=copy_link)\n" +
                     "- 입력한 휴대폰 번호로 1회용 인증번호(OTP)를 발송합니다.\n" +
+                    "- 중복된 전화번호가 있으면 에러를 반환합니다.\n" +
                     "- 유효시간/재요청 제한 정책은 서버 설정에 따릅니다.\n" +
                     "\n**Request Body:**\n" +
                     "  - `phoneNumber` (String, required): 인증번호를 받을 휴대폰 번호\n" +
                     "\n**Response:**\n" +
                     "  - 성공 시 200(OK)과 성공 메시지 반환"
     )
-    @PostMapping("/phone-verification/send")
-    public BaseResponse<Void> sendAuthNumber(
+    @PostMapping("/phone-verification/check-and-send")
+    public BaseResponse<Void> checkPhoneAvailabilityAndSendAuthNumber(
             @RequestBody @Valid PhoneAuthRequestDTO.PhoneAuthSendRequest request
     ) {
-        phoneAuthService.sendAuthNumber(request.getPhoneNumber());
+        phoneAuthService.checkAndSendAuthNumber(request.getPhoneNumber());
         return BaseResponse.onSuccess(SuccessStatus.SEND_AUTH_NUMBER_SUCCESS, null);
     }
 
@@ -84,23 +85,7 @@ public BaseResponse<Void> checkAuthNumber(
         return BaseResponse.onSuccess(SuccessStatus.VERIFY_AUTH_NUMBER_SUCCESS, null);
     }
 
-    @Operation(summary = "전화번호 중복 체크 API",
-            description = "# [v1.0 (2025-09-18)](https://clumsy-seeder-416.notion.site/2551197c19ed808a9757f7f0fc4cf09b?source=copy_link)\n" +
-                    "- 입력한 전화번호가 이미 가입된 사용자가 있는지 확인합니다.\n" +
-                    "- 중복된 전화번호가 있으면 에러를 반환합니다.\n" +
-                    "\n**Request Body:**\n" +
-                    "  - `phoneNumber` (String, required): 확인할 전화번호 (010XXXXXXXX 형식)\n" +
-                    "\n**Response:**\n" +
-                    "  - 성공 시 200(OK)과 사용 가능 메시지 반환\n" +
-                    "  - 중복 시 404(NOT_FOUND)와 에러 메시지 반환")
-    @PostMapping("/phone-verification/check")
-    public BaseResponse<Void> checkPhoneNumberAvailability(
-            @RequestBody @Valid VerificationRequestDTO.PhoneVerificationCheckRequest request) {
-        verificationService.checkPhoneNumberAvailability(request);
-        return BaseResponse.onSuccess(SuccessStatus._OK, null);
-    }
-
-    @Operation(summary = "이메일 중복 체크 API",
+    @Operation(summary = "이메일 형식 및 중복가입 확인 API",
             description = "# [v1.0 (2025-09-18)](https://clumsy-seeder-416.notion.site/2551197c19ed802d8f6dd373dd045f3a?source=copy_link)\n" +
                     "- 입력한 이메일이 이미 가입된 사용자가 있는지 확인합니다.\n" +
                     "- 중복된 이메일이 있으면 에러를 반환합니다.\n" +
@@ -112,7 +97,7 @@ public BaseResponse<Void> checkPhoneNumberAvailability(
     @PostMapping("/email-verification/check")
     public BaseResponse<Void> checkEmailAvailability(
             @RequestBody @Valid VerificationRequestDTO.EmailVerificationCheckRequest request) {
-        verificationService.checkEmailAvailability(request);
+        emailAuthService.checkEmailAvailability(request);
         return BaseResponse.onSuccess(SuccessStatus._OK, null);
     }
 

src/main/java/com/assu/server/domain/auth/service/EmailAuthService.java

@@ -0,0 +1,8 @@
+package com.assu.server.domain.auth.service;
+
+import com.assu.server.domain.auth.dto.verification.VerificationRequestDTO;
+
+public interface EmailAuthService {
+
+    void checkEmailAvailability(VerificationRequestDTO.EmailVerificationCheckRequest request);
+}

…uth/service/VerificationServiceImpl.java …n/auth/service/EmailAuthServiceImpl.javasrc/main/java/com/assu/server/domain/auth/service/VerificationServiceImpl.java renamed to src/main/java/com/assu/server/domain/auth/service/EmailAuthServiceImpl.java src/main/java/com/assu/server/domain/auth/service/VerificationServiceImpl.java renamed to src/main/java/com/assu/server/domain/auth/service/EmailAuthServiceImpl.java

@@ -3,32 +3,18 @@
 import com.assu.server.domain.auth.dto.verification.VerificationRequestDTO;
 import com.assu.server.domain.auth.exception.CustomAuthException;
 import com.assu.server.domain.auth.repository.CommonAuthRepository;
-import com.assu.server.domain.member.repository.MemberRepository;
 import com.assu.server.global.apiPayload.code.status.ErrorStatus;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
-public class VerificationServiceImpl implements VerificationService {
+public class EmailAuthServiceImpl implements EmailAuthService {
 
-    private final MemberRepository memberRepository;
     private final CommonAuthRepository commonAuthRepository;
 
     @Override
-    public void checkPhoneNumberAvailability(
-            VerificationRequestDTO.PhoneVerificationCheckRequest request) {
-
-        boolean exists = memberRepository.existsByPhoneNum(request.getPhoneNumber());
-
-        if (exists) {
-            throw new CustomAuthException(ErrorStatus.EXISTED_PHONE);
-        }
-    }
-
-    @Override
-    public void checkEmailAvailability(
-            VerificationRequestDTO.EmailVerificationCheckRequest request) {
+    public void checkEmailAvailability(VerificationRequestDTO.EmailVerificationCheckRequest request) {
 
         boolean exists = commonAuthRepository.existsByEmail(request.getEmail());
 

src/main/java/com/assu/server/domain/auth/service/PhoneAuthService.java

@@ -1,6 +1,6 @@
 package com.assu.server.domain.auth.service;
 
 public interface PhoneAuthService {
-    void sendAuthNumber(String phoneNumber);
+    void checkAndSendAuthNumber(String phoneNumber);
     void verifyAuthNumber(String phoneNumber, String authNumber);
 }

src/main/java/com/assu/server/domain/auth/service/PhoneAuthServiceImpl.java

@@ -1,5 +1,6 @@
 package com.assu.server.domain.auth.service;
 
+import com.assu.server.domain.member.repository.MemberRepository;
 import com.assu.server.global.apiPayload.code.status.ErrorStatus;
 import com.assu.server.global.util.RandomNumberUtil;
 import com.assu.server.domain.auth.exception.CustomAuthException;
@@ -18,11 +19,18 @@ public class PhoneAuthServiceImpl implements PhoneAuthService {
 
     private final StringRedisTemplate redisTemplate;
     private final AligoSmsClient aligoSmsClient;
+    private final MemberRepository memberRepository;
 
     private static final Duration AUTH_CODE_TTL = Duration.ofMinutes(5); // 인증번호 5분 유효
 
     @Override
-    public void sendAuthNumber(String phoneNumber) {
+    public void checkAndSendAuthNumber(String phoneNumber) {
+        boolean exists = memberRepository.existsByPhoneNum(phoneNumber);
+
+        if (exists) {
+            throw new CustomAuthException(ErrorStatus.EXISTED_PHONE);
+        }
+
         String authNumber = RandomNumberUtil.generateSixDigit();
         redisTemplate.opsForValue().set(phoneNumber, authNumber, AUTH_CODE_TTL);
 

src/main/java/com/assu/server/domain/auth/service/VerificationService.java

@@ -53,9 +53,9 @@ public enum ErrorStatus implements BaseErrorCode {
     NO_PAPER_FOR_STORE(HttpStatus.NOT_FOUND, "ADMIN_4005", "존재하지 않는 paper ID입니다."),
     NO_AVAILABLE_PARTNER(HttpStatus.NOT_FOUND, "MEMBER_4009", "제휴업체를 찾을 수 없습니다."),
     NO_SUCH_STORE_WITH_THAT_PARTNER(HttpStatus.NOT_FOUND,"MEMBER_4006","해당 store ID에 해당하는 partner ID가 존재하지 않습니다."),
-    EXISTED_PHONE(HttpStatus.NOT_FOUND,"MEMBER_4007","이미 존재하는 전화번호입니다."),
-    EXISTED_EMAIL(HttpStatus.NOT_FOUND,"MEMBER_4008","이미 존재하는 이메일입니다."),
-    EXISTED_STUDENT(HttpStatus.NOT_FOUND,"MEMBER_4009","이미 존재하는 학번입니다."),
+    EXISTED_PHONE(HttpStatus.CONFLICT,"MEMBER_4007","이미 존재하는 전화번호입니다."),
+    EXISTED_EMAIL(HttpStatus.CONFLICT,"MEMBER_4008","이미 존재하는 이메일입니다."),
+    EXISTED_STUDENT(HttpStatus.CONFLICT,"MEMBER_4009","이미 존재하는 학번입니다."),
 
     MEMBER_ALREADY_WITHDRAWN(HttpStatus.BAD_REQUEST, "MEMBER_4010", "이미 탈퇴된 회원입니다."),