From 10466eb1066c3bce0706f9bcbe141b41004da615 Mon Sep 17 00:00:00 2001
From: junheelee <junheelee@host.docker.internal>
Date: Mon, 5 Sep 2022 18:32:11 +0900
Subject: [PATCH] =?UTF-8?q?=EC=95=84=EC=9D=B4=EB=94=94=EC=B0=BE=EA=B8=B0,?=
 =?UTF-8?q?=20=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=EC=B0=BE=EA=B8=B0=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

---
 .../controller/AcntCrtfyhpController.java     | 82 +++++++++++++++----
 1 file changed, 65 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java b/src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java
index c079123..67016bc 100644
--- a/src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java
+++ b/src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java
@@ -109,7 +109,7 @@ public class AcntCrtfyhpController {
 	//아이디 찾기 시 인증번호 발송 로직
 	@GetMapping(value = "/find/sendForId")
 	public ResponseEntity<? extends BasicResponse> sendForId(String memberName, String hpno) {
-		Map<String , Boolean> resultMap = new HashMap<String,Boolean>();
+		Map<String, Object> resultMap = new HashMap<String, Object>();
 		
 		if(memberName == null || hpno == null) {
     		return ResponseEntity.status(HttpStatus.OK)
@@ -119,6 +119,11 @@ public class AcntCrtfyhpController {
 		try {
 			boolean result = service.certifNum(memberName, hpno);
 			resultMap.put("result" , result);
+			if(!result) {
+				resultMap.put("code", -1);		//일치하는 회원 없음
+			} else {
+				resultMap.put("code", 0);		//일치하는 회원 존재
+			}
 		} catch (Exception e) {
 			log.error("IGNORE : {}", e);
 			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
@@ -130,7 +135,7 @@ public class AcntCrtfyhpController {
 	//아이디 찾기
 	@GetMapping(value = "/find/findUserId")
 	public ResponseEntity<? extends BasicResponse> findUserId(String memberName, String hpno) {
-		AcntCrtfyhpRsModel model = new AcntCrtfyhpRsModel();
+		Map<String, Object> resultMap = new HashMap<String, Object>();
 		
 		if(memberName == null || hpno == null) {
     		return ResponseEntity.status(HttpStatus.OK)
@@ -138,30 +143,73 @@ public class AcntCrtfyhpController {
     	}
 		
 		try {
-			model.setUserId(service.findUserId(memberName, hpno));
+			String userId = service.findUserId(memberName, hpno);
+			if(!userId.equals("")) {
+				resultMap.put("userId", userId);
+				resultMap.put("code", 0);
+			} else {
+				resultMap.put("userId", "");
+				resultMap.put("code", -1);
+			}
 		} catch (Exception e) {
 			log.error("IGNORE : {}", e);
 			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
 					.body(new ErrorResponse("Server Error", "-1"));
 		}
        
-		return ResponseEntity.ok().body( new SuccessResponse<>(model));
+		return ResponseEntity.ok().body( new SuccessResponse<Map>(resultMap));
 	}
 	
+	//비밀번호 찾기 시 인증번호 발송 로직
 	@GetMapping(value = "/find/sendForPw")
-	   public boolean certifNumPw(String userId, String hpno) throws Exception{
-	      boolean result = service.certifPw(userId, hpno);
-	      
-	         log.info("result>>>>>>>>>>>>>>>>>>>>>>>> {}",result);
+	public ResponseEntity<? extends BasicResponse> sendForPw(String userId, String hpno) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		
+		if(userId == null || hpno == null) {
+			return ResponseEntity.status(HttpStatus.OK)
+					.body(new ErrorResponse(RSErrorCode.ER_PARAM));
+		}
+		
+		try {
+			boolean result = service.certifPw(userId, hpno);
+			resultMap.put("result", result);
+			if(!result) {
+				resultMap.put("code", -1);		//일치하는 회원 없음
+			} else {
+				resultMap.put("code", 0);		//일치하는 회원 존재
+			}
+		} catch (Exception e) {
+			log.error("IGNORE : {}", e);
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(new ErrorResponse("Server Error", "-1"));
+		}
 
-	      return result;
-	   }
-	@PutMapping(value = "/find/updatePw")
-	   public boolean updatePw(String userId, String hpno, String newPw) throws Exception{
-	      boolean result = service.updatePw(userId, hpno, newPw);
-	      
-	         log.info("result>>>>>>>>>>>>>>>>>>>>>>>> {}",result);
+		return ResponseEntity.ok().body( new SuccessResponse<Map>(resultMap));
+	}
+	
 
-	      return result;
-	   }
+	@GetMapping(value = "/find/updatePw")
+	public ResponseEntity<? extends BasicResponse> updatePw(String userId, String hpno, String newPw) throws Exception {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		
+		if(hpno == null || newPw == null) {
+			return ResponseEntity.status(HttpStatus.OK)
+					.body(new ErrorResponse(RSErrorCode.ER_PARAM));
+		}
+		
+		try {
+			boolean result = service.updatePw(userId, hpno, newPw);
+			resultMap.put("result", result);
+			if(!result) {
+				resultMap.put("code", -1);
+			} else {
+				resultMap.put("code", 0);
+			}
+		} catch(Exception e) {
+			log.error("IGNORE : {}", e);
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(new ErrorResponse("Server Error", "-1"));
+		}
+		return ResponseEntity.ok().body( new SuccessResponse<Map>(resultMap));
+	}
 }