[프로필] E-mail 변경 작업

src/main/java/com/palnet/biz/api/acnt/cstmr/controller/AcntCstmrController.java

@@ -5,7 +5,9 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
+import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrEmModel;
 import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrGroupModel;
 import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrPwModel;
 
@@ -107,23 +109,27 @@ public class AcntCstmrController {
 		return ResponseEntity.ok().body(new SuccessResponse<>(resultMap));
 	}
 	
-	@PostMapping(value = "/profile/update")
-	public ResponseEntity<? extends BasicResponse> myinfoupdate(@RequestBody AcntCstmrRqModel rq){
-		
-		AcntCstmrRsModel result;
-		
+	@PutMapping(value = "/profile/update")
+	public ResponseEntity<? extends BasicResponse> updateEmail(@RequestBody AcntCstmrEmModel rq){
+		Map<String, Object> resultMap = new HashMap<String, Object>();
 		try {
 			
-			result = service.update(rq);
+			PtyCstmrDtl result = service.updateEmail(rq);
+			resultMap.put("result", result);
+			
+		} catch (CustomException e) {
+			log.error("IGNOE : {}", e);
+			resultMap.put("result", false);
+			resultMap.put("errorCode", e.getErrorCode());
+			resultMap.put("errorMessage", e.getMessage());
+			return ResponseEntity.ok().body(new SuccessResponse<Map>(resultMap));
 			
 		} catch (Exception e) {
-			log.error("IGNORE : {}", e);
-			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-					.body(new ErrorResponse("Server Error", "-1"));
-		
+			log.error("IGONE : {}", e);
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new ErrorResponse("Server Error", "-1"));
+			
 		}
-		
-		return ResponseEntity.ok().body(new SuccessResponse<AcntCstmrRsModel>(result));
+		return ResponseEntity.ok().body(new SuccessResponse<>(resultMap));
 	}
 }
 	

src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrEmModel.java

@@ -0,0 +1,20 @@
+package com.palnet.biz.api.acnt.cstmr.model;
+
+import java.util.Date;
+
+import lombok.Data;
+
+@Data
+public class AcntCstmrEmModel {
+	
+	private String email;
+	
+	private Date updateDt;
+	
+	private String updateUserId;
+	
+	private int cstmrSno;
+	
+	private String hpno;
+
+}

src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java

@@ -9,6 +9,7 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Persistence;
 
+import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrEmModel;
 import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrGroupModel;
 import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrPwModel;
 
@@ -75,8 +76,6 @@ public class AcntCstmrService {
 	@Autowired
 	private  JwtTokenUtil jwtTokenUtil;
 	
-	@Autowired
-	private AcntCrtfyhpService acntCrtfyhpService;
 	/**
 	 * 
 	 * 
@@ -244,44 +243,24 @@ public class AcntCstmrService {
   		
 		return updateUserEntity;
 	}
-	
-public AcntCstmrRsModel update(AcntCstmrRqModel rq) {
+
+	public PtyCstmrDtl updateEmail(AcntCstmrEmModel rq) {
+		Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken();
+		String userId = jwtTokenUtil.getUserIdByToken();
+		String newEmail = EncryptUtils.encrypt(rq.getEmail());
+//		String newHpno = EncryptUtils.encrypt(rq.getHpno());
+
+		PtyCstmrDtl userEntity = ptyCstmrDtlRepository.findById(cstmrSno).orElse(null);
 		
-		AcntCstmrRsModel rs = new AcntCstmrRsModel();
-		boolean isUserEmailFind = false;
+		userEntity.setEmail(newEmail);
+		userEntity.setUpdateDt(DateUtils.nowDate());
+		userEntity.setUpdateUserId(userId);
+//		userEntity.setHpno(newHpno);
 		
-		try {
-			
-			//사전 체크. 동일한 E-mail 존재 여부 확인
-			isUserEmailFind = query.findCstmrByUserEmail(rq.getEmail());
-			if(isUserEmailFind) {
-				rs.setErrCode(-2);
-				return rs;
-			}
-			rq.setHpno(rq.getHpno().replaceAll("-", ""));
-			rq.setHpno(EncryptUtils.encrypt(rq.getHpno()));
-			rq.setEmail(EncryptUtils.encrypt(rq.getEmail()));
-			
-			this.savePtyCstmrEmailhpno(rq);
-			
-			
-		} catch (Exception e) {
-			log.error("IGNORE : {}", e);
-			rs.setErrCode(-2); //수정 필요..
-			return rs;
-			
-		}
+		PtyCstmrDtl updateEmailEntity = ptyCstmrDtlRepository.save(userEntity);
 		
-		return rs;
+		return updateEmailEntity;
 	}
-	private PtyCstmrDtl savePtyCstmrEmailhpno(AcntCstmrRqModel rq) throws Exception{
-		PtyCstmrDtl dtlEntity = new PtyCstmrDtl();
-		
-		dtlEntity.setEmail(rq.getEmail());
-		dtlEntity.setHpno(rq.getHpno());
-		dtlEntity.setClncd(rq.getClncd());
-		dtlEntity.setUpdateDt(DateUtils.nowDate());
 	
-		return ptyCstmrDtlRepository.save(dtlEntity);
-	}
+
 }

src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrQueryRepository.java

@@ -272,28 +272,8 @@ public class PtyCstmrQueryRepository{
 		
 		return null;
 	}
-	
-public boolean findCstmrByUserEmail(String Email){
-		
-		boolean result = false;
-		
-		QPtyCstmrDtl dtl = QPtyCstmrDtl.ptyCstmrDtl;
-		
-		
-		BooleanBuilder builder = new BooleanBuilder();
-		
-		builder.and(dtl.email.eq(Email));
-		
-		PtyCstmrDtl entity = query.select(dtl)
-				.from(dtl)
-				.where(builder)
-				.fetchFirst();
-		if(entity != null) {
-			result = true;
-		}
-		
-		return result;
-	}
+	 
+
 }