File tree Expand file tree Collapse file tree 5 files changed +15
-10
lines changed
outbound/persistense/entity/task
test/java/clap/server/adapter/inbound/web/admin Expand file tree Collapse file tree 5 files changed +15
-10
lines changed Original file line number Diff line number Diff line change 11package clap .server .adapter .inbound .web .dto .task ;
22
3- import clap .server .adapter .outbound .persistense .entity .task .constant .LabelType ;
43import clap .server .adapter .outbound .persistense .entity .task .constant .TaskStatus ;
54
65import java .time .LocalDateTime ;
Original file line number Diff line number Diff line change 22
33import clap .server .adapter .outbound .persistense .entity .common .BaseTimeEntity ;
44import 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 ;
66import jakarta .persistence .*;
77import lombok .AccessLevel ;
88import 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}
Original file line number Diff line number Diff line change 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-
Original file line number Diff line number Diff line change 11package 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 ;
44import clap .server .domain .model .common .BaseTime ;
55import clap .server .domain .model .member .Member ;
66import 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}
Original file line number Diff line number Diff line change 88import clap .server .adapter .outbound .persistense .entity .task .CategoryEntity ;
99import clap .server .adapter .outbound .persistense .entity .task .LabelEntity ;
1010import clap .server .adapter .outbound .persistense .entity .task .TaskEntity ;
11- import clap .server .adapter .outbound .persistense .entity .task .constant .LabelType ;
1211import clap .server .adapter .outbound .persistense .entity .task .constant .TaskStatus ;
1312import clap .server .config .elastic .ElasticsearchConfig ;
1413import 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 ();
You can’t perform that action at this time.
0 commit comments