From 35c3ade804c987186661547d74b083b78dd6dd6a Mon Sep 17 00:00:00 2001
From: Hamill210 <han95210@naver.com>
Date: Thu, 18 Jun 2020 21:08:04 +0900
Subject: [PATCH] =?UTF-8?q?[BE/#17]=20Modify=20:=20hex=5Fcode=20=EC=BB=AC?=
 =?UTF-8?q?=EB=9F=BC=EC=9D=84=20background=5Fcolor,=20color=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=ED=95=9C=20=EB=8B=A4=EC=9D=8C=20data.sql?=
 =?UTF-8?q?=EA=B3=BC=20domain,=20vo,=20dao,=20service=20=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hamill/dao/LabelDao_Hamill.java           |  8 ++--
 .../issuetracker/hamill/domain/Label.java     | 38 ++++++++++++-------
 .../hamill/service/LabelService_Hamill.java   |  2 +-
 .../hamill/vo/labelVO/LabelSummary.java       | 21 ++++++----
 BE/src/main/resources/data.sql                | 12 +++---
 5 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/BE/src/main/java/com/codesquad/issuetracker/hamill/dao/LabelDao_Hamill.java b/BE/src/main/java/com/codesquad/issuetracker/hamill/dao/LabelDao_Hamill.java
index 5e5325b..af26d1f 100644
--- a/BE/src/main/java/com/codesquad/issuetracker/hamill/dao/LabelDao_Hamill.java
+++ b/BE/src/main/java/com/codesquad/issuetracker/hamill/dao/LabelDao_Hamill.java
@@ -27,19 +27,21 @@ public List<Label> findAllLabels() {
                         Label.of(rs.getInt("id"),
                                 rs.getString("name"),
                                 rs.getString("description"),
-                                rs.getString("hex_code"))
+                                rs.getString("background_color"),
+                                rs.getString("color"))
         );
     }
 
     public List<LabelSummary> findLabelSummaryByIssueId(Long issueId) {
         return jdbcTemplate.query(
-                "SELECT label.id, label.name, label.hex_code FROM label " +
+                "SELECT label.id, label.name, label.background_color, label.color FROM label " +
                         "JOIN issue_has_label ON label.id = issue_has_label.label_id " +
                         "WHERE issue_has_label.issue_id = ?",
                 (rs, rowNum) ->
                         LabelSummary.of(rs.getInt("id"),
                                 rs.getString("name"),
-                                rs.getString("hex_code"))
+                                rs.getString("background_color"),
+                                rs.getString("color"))
         , issueId);
     }
 }
diff --git a/BE/src/main/java/com/codesquad/issuetracker/hamill/domain/Label.java b/BE/src/main/java/com/codesquad/issuetracker/hamill/domain/Label.java
index de4a0c3..cb3e429 100644
--- a/BE/src/main/java/com/codesquad/issuetracker/hamill/domain/Label.java
+++ b/BE/src/main/java/com/codesquad/issuetracker/hamill/domain/Label.java
@@ -1,7 +1,5 @@
 package com.codesquad.issuetracker.hamill.domain;
 
-import java.time.LocalDateTime;
-
 public class Label {
 
     private Integer id;
@@ -10,21 +8,25 @@ public class Label {
 
     private String description;
 
-    private String hexCode;
+    private String backgroundColor;
+
+    private String color;
 
-    private Label(Integer id, String name, String description, String hexCode) {
+    private Label(Integer id, String name, String description, String backgroundColor, String color) {
         this.id = id;
         this.name = name;
         this.description = description;
-        this.hexCode = hexCode;
+        this.backgroundColor = backgroundColor;
+        this.color = color;
     }
 
-    public static Label of(Integer id, String name, String description, String hexCode) {
+    public static Label of(Integer id, String name, String description, String backgroundColor, String color) {
         return new Builder()
                 .id(id)
                 .name(name)
                 .description(description)
-                .hexCode(hexCode)
+                .backgroundColor(backgroundColor)
+                .color(color)
                 .build();
     }
 
@@ -40,15 +42,20 @@ public String getDescription() {
         return description;
     }
 
-    public String getHexCode() {
-        return hexCode;
+    public String getBackgroundColor() {
+        return backgroundColor;
+    }
+
+    public String getColor() {
+        return color;
     }
 
     private static class Builder {
         private Integer id;
         private String name;
         private String description;
-        private String hexCode;
+        private String backgroundColor;
+        private String color;
 
         private Builder() {}
 
@@ -67,13 +74,18 @@ private Builder description(String description) {
             return this;
         }
 
-        private Builder hexCode(String hexCode) {
-            this.hexCode = hexCode;
+        private Builder backgroundColor(String backgroundColor) {
+            this.backgroundColor = backgroundColor;
+            return this;
+        }
+
+        private Builder color(String color) {
+            this.color = color;
             return this;
         }
 
         private Label build() {
-            return new Label(id, name, description, hexCode);
+            return new Label(id, name, description, backgroundColor, color);
         }
     }
 
diff --git a/BE/src/main/java/com/codesquad/issuetracker/hamill/service/LabelService_Hamill.java b/BE/src/main/java/com/codesquad/issuetracker/hamill/service/LabelService_Hamill.java
index 47c2bbd..f223e63 100644
--- a/BE/src/main/java/com/codesquad/issuetracker/hamill/service/LabelService_Hamill.java
+++ b/BE/src/main/java/com/codesquad/issuetracker/hamill/service/LabelService_Hamill.java
@@ -38,7 +38,7 @@ public LabelInformation findLabelInformation() {
 
         // 함수형 프로그래밍
         List<LabelSummary> labelSummaries = labels.stream()
-                                                 .map(label -> of(label.getId(), label.getName(), label.getHexCode()))
+                                                 .map(label -> of(label.getId(), label.getName(), label.getBackgroundColor(), label.getColor()))
                                                  .collect(Collectors.toList());
 
         return LabelInformation.of(labels.size(), labelSummaries);
diff --git a/BE/src/main/java/com/codesquad/issuetracker/hamill/vo/labelVO/LabelSummary.java b/BE/src/main/java/com/codesquad/issuetracker/hamill/vo/labelVO/LabelSummary.java
index 4adecd8..7ac6eab 100644
--- a/BE/src/main/java/com/codesquad/issuetracker/hamill/vo/labelVO/LabelSummary.java
+++ b/BE/src/main/java/com/codesquad/issuetracker/hamill/vo/labelVO/LabelSummary.java
@@ -6,16 +6,19 @@ public class LabelSummary {
 
     private String labelName;
 
-    private String hexCode;
+    private String backgroundColor;
 
-    private LabelSummary(Integer labelId, String labelName, String hexCode) {
+    private String color;
+
+    private LabelSummary(Integer labelId, String labelName, String backgroundColor, String color) {
         this.labelId = labelId;
         this.labelName = labelName;
-        this.hexCode = hexCode;
+        this.backgroundColor = backgroundColor;
+        this.color = color;
     }
 
-    public static LabelSummary of(Integer labelId, String labelName, String hexCode) {
-        return new LabelSummary(labelId, labelName, hexCode);
+    public static LabelSummary of(Integer labelId, String labelName, String backgroundColor, String color) {
+        return new LabelSummary(labelId, labelName, backgroundColor, color);
     }
 
     public Integer getLabelId() {
@@ -26,7 +29,11 @@ public String getLabelName() {
         return labelName;
     }
 
-    public String getHexCode() {
-        return hexCode;
+    public String getBackgroundColor() {
+        return backgroundColor;
+    }
+
+    public String getColor() {
+        return color;
     }
 }
diff --git a/BE/src/main/resources/data.sql b/BE/src/main/resources/data.sql
index 66b1b3c..9654f97 100644
--- a/BE/src/main/resources/data.sql
+++ b/BE/src/main/resources/data.sql
@@ -8,12 +8,12 @@ INSERT INTO milestone (title, description, due_date, created_date_time, updated_
 INSERT INTO milestone (title, description, due_date, created_date_time, updated_date_time) VALUES ('마일스톤3', '마일스톤3입니다.', '2020-06-20', '2020-06-11 01:22:32', '2020-06-11 01:22:32');
 INSERT INTO milestone (title, description, due_date, created_date_time, updated_date_time) VALUES ('마일스톤4', '마일스톤4입니다.', '2020-06-21', '2020-06-11 01:22:32', '2020-06-11 01:22:32');
 
-INSERT INTO label (name, description, hex_code) VALUES ('레이블1', '레이블1입니다.', '#aaaaaa');
-INSERT INTO label (name, description, hex_code) VALUES ('레이블2', '레이블2입니다.', '#bbbbbb');
-INSERT INTO label (name, description, hex_code) VALUES ('레이블3', '레이블3입니다.', '#cccccc');
-INSERT INTO label (name, description, hex_code) VALUES ('레이블4', '레이블4입니다.', '#dddddd');
-INSERT INTO label (name, description, hex_code) VALUES ('레이블5', '레이블5입니다.', '#eeeeee');
-INSERT INTO label (name, description, hex_code) VALUES ('레이블6', '레이블6입니다.', '#ffffff');
+INSERT INTO label (name, description, background_color, color) VALUES ('레이블1', '레이블1입니다.', '#aaaaaa', '#hhhhhh');
+INSERT INTO label (name, description, background_color, color) VALUES ('레이블2', '레이블2입니다.', '#bbbbbb', '#jjjjjj');
+INSERT INTO label (name, description, background_color, color) VALUES ('레이블3', '레이블3입니다.', '#cccccc', '#kkkkkk');
+INSERT INTO label (name, description, background_color, color) VALUES ('레이블4', '레이블4입니다.', '#dddddd', '#mmmmmm');
+INSERT INTO label (name, description, background_color, color) VALUES ('레이블5', '레이블5입니다.', '#eeeeee', '#nnnnnn');
+INSERT INTO label (name, description, background_color, color) VALUES ('레이블6', '레이블6입니다.', '#ffffff', '#oooooo');
 
 INSERT INTO issue (id, title, created_date_time, is_opened, user_id, milestone_id) VALUES (1, '이슈제목1', '2020-06-11 01:28:30', true, 1, 1);
 INSERT INTO issue (id, title, created_date_time, is_opened, user_id, milestone_id) VALUES (2, '이슈제목2', '2020-06-11 01:28:30', true, 2, 1);