From ae50d78e7d3a6afa2b300db71caccf8b77cd7181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?=
 <junheelee@host.docker.internal>
Date: Mon, 26 Sep 2022 13:53:37 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B7=B8=EB=A3=B9=EB=AA=85=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=EC=8B=9C=20=EC=A4=91=EB=B3=B5=EB=84=A4=EC=9E=84=20?=
 =?UTF-8?q?=EB=A7=89=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/controller/BasGroupController.java  | 20 +++++++++++++------
 .../bas/group/service/BasGroupService.java    |  6 ++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupController.java b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupController.java
index 7844a0e..e7110a6 100644
--- a/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupController.java
+++ b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupController.java
@@ -194,9 +194,10 @@ public class BasGroupController {
 	/**
 	 * 그룹 수정
 	 * @return
+	 * @throws Exception 
 	 */
 	@PutMapping(value = "/update")
-	public ResponseEntity<? extends BasicResponse> update(@RequestBody BasGroupModel rq) {
+	public ResponseEntity<? extends BasicResponse> update(@RequestBody BasGroupModel rq) throws Exception {
 		Map<String , Object> resultMap = new HashMap<String,Object>();
 		
         try {
@@ -204,11 +205,18 @@ public class BasGroupController {
         	
         	resultMap.put("result", result);
 			
-        } catch (Exception e) {
-			log.error("IGNORE : {}", e);
-			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-					.body(new ErrorResponse("Server Error", "-1"));
-
+//        } catch (Exception e) {
+//			log.error("IGNORE : {}", e);
+//			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+//					.body(new ErrorResponse("Server Error", "-1"));
+//
+//		}
+        } catch (CustomException e) {
+            log.error("IGNORE : {}", e);
+            resultMap.put("result", false);
+            resultMap.put("errorCode", e.getErrorCode());
+            resultMap.put("errorMessage", e.getMessage());
+            return ResponseEntity.ok().body(new SuccessResponse<Map>(resultMap));
 		}
 		return ResponseEntity.ok().body(new SuccessResponse<Map>(resultMap));
 
diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java
index dfaa7ba..bd826ed 100644
--- a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java
+++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java
@@ -175,6 +175,12 @@ public class BasGroupService {
 	public boolean update(BasGroupModel rq) throws Exception{
 		
 		Optional<PtyGroupBas> optional = ptyGroupBasRepository.findById(rq.getGroupId());
+		List<PtyGroupBas> groupNm = ptyGroupBasRepository.findByGroupNm(rq.getGroupNm());
+		for(PtyGroupBas name : groupNm) {
+			if(rq.getGroupNm().equals(name.getGroupNm())) {
+				throw new CustomException(ErrorCode.DATA_DUPLICATE);
+			}
+		}
 		
 		if (!optional.isPresent()) {
 			throw new CustomException(ErrorCode.DATA_NOTFIND);