Skip to content

Commit f95eb29

Browse files
committed
CLAP-119 Add: LabelColor 추가
1 parent 8f2ed58 commit f95eb29

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package clap.server.adapter.inbound.web.dto.task;
22

3-
import clap.server.adapter.outbound.persistense.entity.task.constant.LabelType;
43
import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
54

65
import java.time.LocalDateTime;

src/main/java/clap/server/adapter/outbound/persistense/entity/task/LabelEntity.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import clap.server.adapter.outbound.persistense.entity.common.BaseTimeEntity;
44
import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
5-
import clap.server.adapter.outbound.persistense.entity.task.constant.LabelType;
5+
import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
66
import jakarta.persistence.*;
77
import lombok.AccessLevel;
88
import lombok.Getter;
@@ -27,6 +27,10 @@ public class LabelEntity extends BaseTimeEntity {
2727
@Column(nullable = false)
2828
private String labelName;
2929

30+
@Column(nullable = false)
31+
@Enumerated(EnumType.STRING)
32+
private LabelColor labelColor;
33+
3034
@Column(nullable = false)
3135
private boolean isDeleted;
3236
}

src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/LabelType.java renamed to src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/LabelColor.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55

66
@Getter
77
@RequiredArgsConstructor
8-
public enum LabelType {
9-
EMERGENCY("긴급"),
10-
NORMAL("일반"),
11-
REGULAR("정기");
8+
public enum LabelColor {
9+
RED("빨강"),
10+
ORANGE("주황"),
11+
YELLOW("노랑"),
12+
GREEN("초록"),
13+
BLUE("파랑"),
14+
PURPLE("보라"),
15+
GREY("회색");
1216

1317
private final String description;
1418
}
15-

src/main/java/clap/server/domain/model/task/Label.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package clap.server.domain.model.task;
22

3-
import clap.server.adapter.outbound.persistense.entity.task.constant.LabelType;
3+
import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
44
import clap.server.domain.model.common.BaseTime;
55
import clap.server.domain.model.member.Member;
66
import lombok.AccessLevel;
@@ -15,5 +15,6 @@ public class Label extends BaseTime {
1515
private Long labelId;
1616
private Member admin;
1717
private String labelName;
18+
private LabelColor labelColor;
1819
private boolean isDeleted;
1920
}

src/test/java/clap/server/adapter/inbound/web/admin/MemberControllerTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import clap.server.adapter.outbound.persistense.entity.task.CategoryEntity;
99
import clap.server.adapter.outbound.persistense.entity.task.LabelEntity;
1010
import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
11-
import clap.server.adapter.outbound.persistense.entity.task.constant.LabelType;
1211
import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
1312
import clap.server.config.elastic.ElasticsearchConfig;
1413
import jakarta.persistence.EntityManager;
@@ -100,7 +99,6 @@ public void setupTestData() {
10099

101100
// 라벨 추가
102101
LabelEntity label = LabelEntity.builder()
103-
.labelType(LabelType.EMERGENCY)
104102
.admin(admin)
105103
.isDeleted(false)
106104
.build();

0 commit comments

Comments
 (0)