From 770d3e96de126118e2846b9a44be035643644f7d Mon Sep 17 00:00:00 2001
From: minjun <ijmtylhtf@naver.com>
Date: Fri, 14 Jul 2023 16:32:20 +0900
Subject: [PATCH] =?UTF-8?q?[Refactor]=20#301=20-=20=EC=9D=B4=EB=AF=B8=20?=
 =?UTF-8?q?=EA=B0=80=EC=9E=85=EB=90=9C=20=EB=A7=88=EC=8A=A4=ED=84=B0?=
 =?UTF-8?q?=EC=9D=BC=20=EC=8B=9C=20=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/master/repository/MasterRepository.java   |  2 ++
 .../cazait/domain/master/service/MasterService.java  | 12 +++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/shop/cazait/domain/master/repository/MasterRepository.java b/src/main/java/shop/cazait/domain/master/repository/MasterRepository.java
index ff17b013..663d2f7a 100644
--- a/src/main/java/shop/cazait/domain/master/repository/MasterRepository.java
+++ b/src/main/java/shop/cazait/domain/master/repository/MasterRepository.java
@@ -25,4 +25,6 @@ public interface MasterRepository extends JpaRepository<Master, UUID> {
 	List<Master> findMasterByStatus(BaseStatus status);
 
 	Optional<Master> findById(UUID id);
+
+	Optional<Master> findByPhoneNumber(String phoneNumber);
 }
diff --git a/src/main/java/shop/cazait/domain/master/service/MasterService.java b/src/main/java/shop/cazait/domain/master/service/MasterService.java
index 51220ef9..57819f2d 100644
--- a/src/main/java/shop/cazait/domain/master/service/MasterService.java
+++ b/src/main/java/shop/cazait/domain/master/service/MasterService.java
@@ -59,12 +59,18 @@ public MasterCreateOutDTO registerMaster(MasterCreateInDTO dto) throws
 		BadPaddingException,
 		InvalidKeyException {
 
-		//이메일 확인
-		if (!masterRepository.findMasterByIdNumber(dto.getIdNumber()).isEmpty()) {
+		//아이디 중복확인
+		if (masterRepository.findMasterByIdNumber(dto.getIdNumber()).isPresent()) {
 			throw new MasterException(EXIST_IDNUMBER);
 		}
+
+		//휴대전화번호 중복확인
+		if (masterRepository.findByPhoneNumber(dto.getPhoneNumber()).isPresent()) {
+			throw new MasterException(EXIST_PHONENUMBER);
+		}
+
 		//닉네임 중복확인
-		if (!masterRepository.findMasterByNickname(dto.getNickname()).isEmpty()) {
+		if (masterRepository.findMasterByNickname(dto.getNickname()).isPresent()) {
 			throw new MasterException(EXIST_NICKNAME);
 		}