From 7c3f646b36d6799b760a7adea1ee4729295e9b22 Mon Sep 17 00:00:00 2001
From: yoon <nmjk0123@gmail.com>
Date: Thu, 13 Feb 2025 15:19:04 +0900
Subject: [PATCH] =?UTF-8?q?updateColorYon=20map=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/common/UserController.java     |  4 +--
 .../localhost/mapper/commoncodMapper.java     |  4 +--
 .../localhost/service/NetmemberService.java   | 14 +++++++---
 .../localhost/service/commoncodService.java   |  4 +--
 src/main/resources/mapper/commoncodMapper.xml | 26 +++++++++++++++----
 5 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/main/java/io/company/localhost/controller/common/UserController.java b/src/main/java/io/company/localhost/controller/common/UserController.java
index 65b1863..e763519 100644
--- a/src/main/java/io/company/localhost/controller/common/UserController.java
+++ b/src/main/java/io/company/localhost/controller/common/UserController.java
@@ -71,8 +71,8 @@ public class UserController {
 	 */
 	@ParameterCheck
 	@GetMapping("/color")
-	public ApiResponse<List<MapDto>> getColorList() {
-		List<MapDto> ColorList = commoncodservice.getColorList();
+	public ApiResponse<List<MapDto>> getColorList(String type) {
+		List<MapDto> ColorList = commoncodservice.getColorList(type);
 		return ApiResponse.ok(ColorList);
 	}
 
diff --git a/src/main/java/io/company/localhost/mapper/commoncodMapper.java b/src/main/java/io/company/localhost/mapper/commoncodMapper.java
index dd1f264..e3f44dc 100644
--- a/src/main/java/io/company/localhost/mapper/commoncodMapper.java
+++ b/src/main/java/io/company/localhost/mapper/commoncodMapper.java
@@ -27,13 +27,13 @@ public interface commoncodMapper {
 	
 	Long insertCategory(MapDto map);
 	
-	List<MapDto> getColorList();
+	List<MapDto> getColorList(String type);
 	
 	List<MapDto> getMbtiList();
 	
 	List<MapDto> getPwhintList();
 	
-	int updateColorYon(String color);
+	int updateColorYon(MapDto map);
 	
 	List<MapDto> getYearCategories();
 	
diff --git a/src/main/java/io/company/localhost/service/NetmemberService.java b/src/main/java/io/company/localhost/service/NetmemberService.java
index cbbb701..350bd92 100644
--- a/src/main/java/io/company/localhost/service/NetmemberService.java
+++ b/src/main/java/io/company/localhost/service/NetmemberService.java
@@ -1,7 +1,7 @@
 /************************************************************
  *
- * @packageName    : io.company.localhost.RegisterService
- * @fileName       : RegisterService.java
+ * @packageName    : io.company.localhost.NetmemberService
+ * @fileName       : NetmemberService.java
  * @author         : 박지윤
  * @date           : 25.01.17
  * @description    :
@@ -64,8 +64,14 @@ public class NetmemberService {
 		int result = memberMapper.insertMember(map);
 
 		// 선택한 색상 코드 사용 처리
-		String color = map.getString("memberCol");
-		commoncodMapper.updateColorYon(color);
+	    String color = map.getString("memberCol");
+
+	    // 색상 코드를 MapDto로 감싸서 전달
+	    MapDto colorMap = new MapDto();
+	    colorMap.put("color", color);
+	    colorMap.put("type", "YON");
+	    
+		commoncodMapper.updateColorYon(colorMap);
 
 		return result;
 	}
diff --git a/src/main/java/io/company/localhost/service/commoncodService.java b/src/main/java/io/company/localhost/service/commoncodService.java
index e10f9d0..971528a 100644
--- a/src/main/java/io/company/localhost/service/commoncodService.java
+++ b/src/main/java/io/company/localhost/service/commoncodService.java
@@ -36,8 +36,8 @@ public class commoncodService {
 		return commoncodmapper.insertCategory(map);
 	}
 	
-	public List<MapDto> getColorList() {
-		return commoncodmapper.getColorList();
+	public List<MapDto> getColorList(String type) {
+		return commoncodmapper.getColorList(type);
 	}
 	
 	public List<MapDto> getMbtiList() {
diff --git a/src/main/resources/mapper/commoncodMapper.xml b/src/main/resources/mapper/commoncodMapper.xml
index fb19f86..6e933c2 100644
--- a/src/main/resources/mapper/commoncodMapper.xml
+++ b/src/main/resources/mapper/commoncodMapper.xml
@@ -40,8 +40,12 @@
 			CMNCODLV1 = 100
 		AND 
 			CMNCODODR != 0
-		AND 
-			CMNCODYON = 0
+		<if test="type == 'YON'">
+	        AND CMNCODYON = 0
+	    </if>
+	    <if test="type == 'YNP'">
+	        AND CMNCODYNP = 0
+	    </if>
 	</select>
 	
 	<select id="getMbtiList" resultType="Map">
@@ -68,9 +72,15 @@
 			CMNCODODR != 0
 	</select>
 	
-	<update id="updateColorYon" parameterType="String">
-	    UPDATE commoncod 
-	    SET CMNCODYON = 1 
+	<update id="updateColorYon" parameterType="Map">
+	    UPDATE commoncod
+	    SET 
+	        <if test="type == 'YON'">
+	            CMNCODYON = 1
+	        </if>
+	        <if test="type == 'YNP'">
+	            CMNCODYNP = 1
+	        </if>
 	    WHERE CMNCODVAL = #{color};
 	</update>
 	
@@ -92,5 +102,11 @@
 	</select>
 	
 	
+	<update id="updateColorYnp" parameterType="String">
+	    UPDATE commoncod 
+	    SET CMNCODYNP = 1 
+	    WHERE CMNCODVAL = #{color};
+	</update>
+	
 
 </mapper>