[BE/#58] Refactor : Label 테이블 컬럼 추가에 따른 코드 및 로직 변경

- hexCode -> backgroundColor, color 세분화 - 이에 따라 각 레이블 관련 코드 수정 (생성자, DAO Read 로직 위주)
codesquad-member-2020 · Jun 19, 2020 · 4fffaa9 · 4fffaa9
1 parent 7e970d0
commit 4fffaa9
Show file tree

Hide file tree

Showing 9 changed files with 181 additions and 62 deletions.
diff --git a/BE/src/main/java/com/codesquad/issuetracker/main/dao/LabelDao.java b/BE/src/main/java/com/codesquad/issuetracker/main/dao/LabelDao.java
@@ -18,17 +18,26 @@ public LabelDao(DataSource dataSource) {
     }
 
     public List<LabelSummary> findAttachedLabelsByIssueId(Long issueId) {
-        String sql = "SELECT l.id, l.name, l.hex_code " +
+        String sql = "SELECT l.id, l.name, l.background_color, l.color " +
                      "FROM label l JOIN issue_has_label il ON l.id = il.label_id " +
                      "WHERE il.issue_id = ?";
         return jdbcTemplate.query(sql, new Object[]{issueId},
-                (rs, rowNum) -> LabelSummary.of(rs.getInt("l.id"), rs.getString("l.name"),
-                                                    rs.getString("l.hex_code")));
+                (rs, rowNum) -> new LabelSummary.Builder()
+                                                .id(rs.getInt("l.id"))
+                                                .name(rs.getString("l.name"))
+                                                .backgroundColor(rs.getString("l.background_color"))
+                                                .color("l.color")
+                                                .build());
     }
 
     public List<Label> findAllLabels() {
-        String sql = "SELECT id, name, description, hex_code FROM label";
-        return jdbcTemplate.query(sql, (rs, rowNum) -> Label.create(rs.getInt("id"), rs.getString("name"),
-                                                                    rs.getString("description"), rs.getString("hex_code")));
+        String sql = "SELECT id, name, description, background_color, color FROM label";
+        return jdbcTemplate.query(sql, (rs, rowNum) -> new Label.Builder()
+                                                                .id(rs.getInt("id"))
+                                                                .name(rs.getString("name"))
+                                                                .description(rs.getString("description"))
+                                                                .backgroundColor(rs.getString("color"))
+                                                                .color(rs.getString("color"))
+                                                                .build());
     }
 }
diff --git a/BE/src/main/java/com/codesquad/issuetracker/main/service/LabelService.java b/BE/src/main/java/com/codesquad/issuetracker/main/service/LabelService.java
@@ -25,9 +25,13 @@ public List<LabelSummary> findAttachedLabelsByIssueId(Long issueId) {
 
     public LabelInformation findAllLabels() {
         List<Label> labels = labelDao.findAllLabels();
-        Set<LabelSummary> labelSummaries = labels.stream()
-                                                 .map(label -> LabelSummary.of(label.getId(), label.getName(), label.getHexCode()))
-                                                 .collect(Collectors.toSet());
+        List<LabelSummary> labelSummaries = labels.stream()
+                                                 .map(label -> new LabelSummary.Builder()
+                                                                               .id(label.getId())
+                                                                               .name(label.getName())
+                                                                               .backgroundColor(label.getBackgroundColor())
+                                                                               .color(label.getColor())
+                                                                               .build()).collect(Collectors.toList());
         return LabelInformation.create(labelSummaries.size(), labelSummaries);
     }
 }
diff --git a/BE/src/main/java/com/codesquad/issuetracker/ragdoll/controller/LabelController_Ragdoll.java b/BE/src/main/java/com/codesquad/issuetracker/ragdoll/controller/LabelController_Ragdoll.java
@@ -30,9 +30,11 @@ public ResponseEntity<ApiResponse<String>> create(@RequestBody LabelRequestDto l
 
     @PatchMapping("/labels/{labelId}")
     public ResponseEntity<ApiResponse<String>> update(@PathVariable Integer labelId, @RequestBody LabelRequestDto labelRequestDto) {
-        return new ResponseEntity(ApiResponse.OK(labelService.updateLabel(labelId, labelRequestDto.getLabelName(),
+        return new ResponseEntity(ApiResponse.OK(labelService.updateLabel(labelId,
+                                                                          labelRequestDto.getLabelName(),
                                                                           labelRequestDto.getDescription(),
-                                                                          labelRequestDto.getHexCode())), HttpStatus.OK);
+                                                                          labelRequestDto.getBackgroundColor(),
+                                                                          labelRequestDto.getColor())), HttpStatus.OK);
     }
 
     @DeleteMapping("/labels/{labelId}")

diff --git a/BE/src/main/java/com/codesquad/issuetracker/ragdoll/dao/LabelDao_Ragdoll.java b/BE/src/main/java/com/codesquad/issuetracker/ragdoll/dao/LabelDao_Ragdoll.java
@@ -23,33 +23,45 @@ public LabelDao_Ragdoll(DataSource dataSource) {
         this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
     }
 
-    public void createNewLabel(String labelName, String description, String hexCode) {
-        String sql = "INSERT INTO label (name, description, hex_code) VALUES (?, ?, ?)";
-        jdbcTemplate.update(sql,new Object[]{labelName, description, hexCode});
+    public void createNewLabel(String labelName, String description, String backgroundColor, String color) {
+        String sql = "INSERT INTO label (name, description, background_color, color) VALUES (?, ?, ?, ?)";
+        jdbcTemplate.update(sql,new Object[]{labelName, description, backgroundColor, color});
     }
 
     public List<LabelSummary> findAttachedLabelsByIssueId(Long issueId) {
-        String sql = "SELECT l.id, l.name, l.hex_code " +
+        String sql = "SELECT l.id, l.name, l.background_color, l.color " +
                      "FROM label l JOIN issue_has_label il ON l.id = il.label_id " +
                      "WHERE il.issue_id = ?";
         return jdbcTemplate.query(sql, new Object[]{issueId},
-                (rs, rowNum) -> LabelSummary.of(rs.getInt("l.id"), rs.getString("l.name"),
-                                                    rs.getString("l.hex_code")));
+                (rs, rowNum) -> new LabelSummary.Builder()
+                                                .id(rs.getInt("l.id"))
+                                                .name(rs.getString("l.name"))
+                                                .backgroundColor(rs.getString("l.background_color"))
+                                                .color(rs.getString("l.color"))
+                                                .build());
     }
 
     public List<Label> findAllLabels() {
-        String sql = "SELECT id, name, description, hex_code FROM label";
-        return jdbcTemplate.query(sql, (rs, rowNum) -> Label.create(rs.getInt("id"), rs.getString("name"),
-                                                                    rs.getString("description"), rs.getString("hex_code")));
+        String sql = "SELECT id, name, description, background_color, color FROM label";
+        return jdbcTemplate.query(sql, (rs, rowNum) -> new Label.Builder().id(rs.getInt("id"))
+                                                                          .name(rs.getString("name"))
+                                                                          .description(rs.getString("description"))
+                                                                          .backgroundColor(rs.getString("background_color"))
+                                                                          .color(rs.getString("color"))
+                                                                          .build());
     }
 
-    public void updateLabel(Integer labelId, String labelName, String description, String hexCode) {
+    public void updateLabel(Integer labelId, String labelName, String description, String backgroundColor, String color) {
         SqlParameterSource namedParameters = new MapSqlParameterSource()
                                                 .addValue("labelId", labelId)
                                                 .addValue("labelName", labelName)
                                                 .addValue("description", description)
-                                                .addValue("hexCode", hexCode);
-        String sql = "UPDATE label SET name = :labelName, description = :description, hex_code = :hexCode WHERE id = :labelId";
+                                                .addValue("backgroundColor", backgroundColor)
+                                                .addValue("color", color);
+        String sql = "UPDATE label SET name = :labelName, description = :description, " +
+                                                         "background_color = :backgroundColor, " +
+                                                         "color = :color " +
+                     "WHERE id = :labelId";
         namedParameterJdbcTemplate.update(sql, namedParameters);
     }
 

diff --git a/BE/src/main/java/com/codesquad/issuetracker/ragdoll/domain/Label.java b/BE/src/main/java/com/codesquad/issuetracker/ragdoll/domain/Label.java
@@ -8,19 +8,16 @@ public class Label {
 
     private String description;
 
-    private String hexCode;
+    private String backgroundColor;
 
-    public Label() {}
+    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;
-    }
-
-    public static Label create(Integer id, String name, String description, String hexCode) {
-        return new Label(id, name, description, hexCode);
+        this.backgroundColor = backgroundColor;
+        this.color = color;
     }
 
     public Integer getId() {
@@ -47,11 +44,56 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    public String getHexCode() {
-        return hexCode;
+    public String getBackgroundColor() {
+        return backgroundColor;
+    }
+
+    public void setBackgroundColor(String backgroundColor) {
+        this.backgroundColor = backgroundColor;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
     }
 
-    public void setHexCode(String hexCode) {
-        this.hexCode = hexCode;
+    public static class Builder {
+        private Integer id;
+        private String name;
+        private String description;
+        private String backgroundColor;
+        private String color;
+
+        public Builder id(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        public Builder name(String name) {
+            this.name = name;
+            return this;
+        }
+
+        public Builder description(String description) {
+            this.description = description;
+            return this;
+        }
+
+        public Builder backgroundColor(String backgroundColor) {
+            this.backgroundColor = backgroundColor;
+            return this;
+        }
+
+        public Builder color(String color) {
+            this.color = color;
+            return this;
+        }
+
+        public Label build() {
+            return new Label(id, name, description, backgroundColor, color);
+        }
     }
 }
diff --git a/BE/src/main/java/com/codesquad/issuetracker/ragdoll/dto/request/LabelRequestDto.java b/BE/src/main/java/com/codesquad/issuetracker/ragdoll/dto/request/LabelRequestDto.java
@@ -6,7 +6,9 @@ public class LabelRequestDto {
 
     private String description;
 
-    private String hexCode;
+    private String backgroundColor;
+
+    private String color;
 
     public String getLabelName() {
         return labelName;
@@ -24,11 +26,19 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    public String getHexCode() {
-        return hexCode;
+    public String getBackgroundColor() {
+        return backgroundColor;
+    }
+
+    public void setBackgroundColor(String backgroundColor) {
+        this.backgroundColor = backgroundColor;
+    }
+
+    public String getColor() {
+        return color;
     }
 
-    public void setHexCode(String hexCode) {
-        this.hexCode = hexCode;
+    public void setColor(String color) {
+        this.color = color;
     }
 }
diff --git a/BE/src/main/java/com/codesquad/issuetracker/ragdoll/service/LabelService_Ragdoll.java b/BE/src/main/java/com/codesquad/issuetracker/ragdoll/service/LabelService_Ragdoll.java
@@ -27,19 +27,24 @@ public List<LabelSummary> findAttachedLabelsByIssueId(Long issueId) {
 
     public LabelInformation findAllLabels() {
         List<Label> labels = labelDaoRagdoll.findAllLabels();
-        Set<LabelSummary> labelSummaries = labels.stream()
-                                                 .map(label -> LabelSummary.of(label.getId(), label.getName(), label.getHexCode()))
-                                                 .collect(Collectors.toSet());
+        List<LabelSummary> labelSummaries = labels.stream()
+                                                 .map(label -> new LabelSummary.Builder()
+                                                                               .id(label.getId())
+                                                                               .name(label.getName())
+                                                                               .backgroundColor(label.getBackgroundColor())
+                                                                               .color(label.getColor())
+                                                                               .build()).collect(Collectors.toList());
         return LabelInformation.create(labelSummaries.size(), labelSummaries);
     }
 
-    public String updateLabel(Integer labelId, String labelName, String description, String hexCode) {
-        labelDaoRagdoll.updateLabel(labelId, labelName, description, hexCode);
+    public String updateLabel(Integer labelId, String labelName, String description, String backgroundColor, String color) {
+        labelDaoRagdoll.updateLabel(labelId, labelName, description, backgroundColor, color);
         return ResponseMessages.SUCCESSFULLY_MODIFIED;
     }
 
     public String createNewLabel(LabelRequestDto labelRequestDto) {
-        labelDaoRagdoll.createNewLabel(labelRequestDto.getLabelName(), labelRequestDto.getDescription(), labelRequestDto.getHexCode());
+        labelDaoRagdoll.createNewLabel(labelRequestDto.getLabelName(), labelRequestDto.getDescription(),
+                                       labelRequestDto.getBackgroundColor(), labelRequestDto.getColor());
         return ResponseMessages.SUCCESSFULLY_CREATED;
     }
 

diff --git a/BE/src/main/java/com/codesquad/issuetracker/ragdoll/vo/labelVO/LabelInformation.java b/BE/src/main/java/com/codesquad/issuetracker/ragdoll/vo/labelVO/LabelInformation.java
@@ -1,21 +1,22 @@
 package com.codesquad.issuetracker.ragdoll.vo.labelVO;
 
+import java.util.List;
 import java.util.Set;
 
 public class LabelInformation {
 
     private int countOfLabel;
 
-    private Set<LabelSummary> labels;
+    private List<LabelSummary> labels;
 
     public LabelInformation() {}
 
-    private LabelInformation(int countOfLabel, Set<LabelSummary> labels) {
+    private LabelInformation(int countOfLabel, List<LabelSummary> labels) {
         this.countOfLabel = countOfLabel;
         this.labels = labels;
     }
 
-    public static LabelInformation create(int countOfLabel, Set<LabelSummary> labels) {
+    public static LabelInformation create(int countOfLabel, List<LabelSummary> labels) {
         return new LabelInformation(countOfLabel, labels);
     }
 
@@ -27,11 +28,11 @@ public void setCountOfLabel(int countOfLabel) {
         this.countOfLabel = countOfLabel;
     }
 
-    public Set<LabelSummary> getLabels() {
+    public List<LabelSummary> getLabels() {
         return labels;
     }
 
-    public void setLabels(Set<LabelSummary> labels) {
+    public void setLabels(List<LabelSummary> labels) {
         this.labels = labels;
     }
 }
diff --git a/BE/src/main/java/com/codesquad/issuetracker/ragdoll/vo/labelVO/LabelSummary.java b/BE/src/main/java/com/codesquad/issuetracker/ragdoll/vo/labelVO/LabelSummary.java
@@ -6,18 +6,17 @@ public class LabelSummary {
 
     private String name;
 
-    private String hexCode;
+    private String backgroundColor;
+
+    private String color;
 
     public LabelSummary() {}
 
-    private LabelSummary(Integer id, String name, String hexCode) {
+    private LabelSummary(Integer id, String name, String backgroundColor, String color) {
         this.id = id;
         this.name = name;
-        this.hexCode = hexCode;
-    }
-
-    public static LabelSummary of(Integer id, String name, String hexCode) {
-        return new LabelSummary(id, name, hexCode);
+        this.backgroundColor = backgroundColor;
+        this.color = color;
     }
 
     public Integer getId() {
@@ -36,11 +35,46 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public String getHexCode() {
-        return hexCode;
+    public String getBackgroundColor() {
+        return backgroundColor;
+    }
+
+    public void setBackgroundColor(String backgroundColor) {
+        this.backgroundColor = backgroundColor;
+    }
+
+    public String getColor() {
+        return color;
     }
 
-    public void setHexCode(String hexCode) {
-        this.hexCode = hexCode;
+    public static class Builder {
+        private Integer id;
+        private String name;
+        private String backgroundColor;
+        private String color;
+
+        public Builder id(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        public Builder name(String name) {
+            this.name = name;
+            return this;
+        }
+
+        public Builder backgroundColor(String backgroundColor) {
+            this.backgroundColor = backgroundColor;
+            return this;
+        }
+
+        public Builder color(String color) {
+            this.color = color;
+            return this;
+        }
+
+        public LabelSummary build() {
+            return new LabelSummary(id, name, backgroundColor, color);
+        }
     }
 }