Merge pull request #44 from TaskFlow-CLAP/CLAP-90

CLAP-90 엔티티 설계에서의 휴먼 에러 수정 사항

Author: joowojr

src/main/java/clap/server/adapter/outbound/persistense/entity/member/DepartmentEntity.java

@@ -32,5 +32,5 @@ public class DepartmentEntity extends BaseTimeEntity {
 
     @Column(nullable = false)
     @Enumerated(EnumType.STRING)
-    private DepartmentStatus departmentStatus;
+    private DepartmentStatus status;
 }

src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java

@@ -44,7 +44,7 @@ public class MemberEntity extends BaseTimeEntity {
 
     @Enumerated(EnumType.STRING)
     @Column(nullable = false)
-    private MemberStatus memberStatus;
+    private MemberStatus status;
 
     // TODO: spring security 적용 예정
     @Column(nullable = false)

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

@@ -24,9 +24,6 @@ public class LabelEntity extends BaseTimeEntity {
     @JoinColumn(name = "admin_id", nullable = false)
     private MemberEntity admin;
 
-    @Column(nullable = false)
-    private String name;
-
     @Column(nullable = false)
     @Enumerated(EnumType.STRING)
     private LabelType labelType;

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

@@ -3,6 +3,7 @@
 import clap.server.adapter.outbound.persistense.entity.common.BaseTimeEntity;
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.StatusFlag;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -25,7 +26,8 @@ public class StatusEntity extends BaseTimeEntity {
     private MemberEntity admin;
 
     @Column(nullable = false)
-    private String name;
+    @Enumerated(EnumType.STRING)
+    private TaskStatus statusName;
 
     @Column(nullable = false)
     @Enumerated(EnumType.STRING)

src/main/java/clap/server/domain/model/member/Department.java

@@ -15,6 +15,5 @@ public class Department extends BaseTime {
     private Long adminId;
     private String code;
     private String name;
-    private DepartmentStatus departmentStatus;
-
+    private DepartmentStatus status;
 }

src/main/java/clap/server/domain/model/member/Member.java

@@ -15,24 +15,24 @@ public class Member extends BaseTime {
     private Member admin;
     private Boolean notificationEnabled;
     private String imageUrl;
-    private MemberStatus memberStatus;
+    private MemberStatus status;
     private String password;
 
     @Builder
     public Member(MemberInfo memberInfo, Boolean notificationEnabled, String imageUrl,
-                  MemberStatus memberStatus, String password) {
+                  MemberStatus status, String password) {
         this.memberInfo = memberInfo;
         this.notificationEnabled = notificationEnabled;
         this.imageUrl = imageUrl;
-        this.memberStatus = memberStatus;
+        this.status = status;
         this.password = password;
     }
 
     public void register(Member admin) {
         this.admin = admin;
         this.notificationEnabled = null;
         this.imageUrl = null;
-        this.memberStatus = MemberStatus.PENDING;
+        this.status = MemberStatus.PENDING;
         this.password = "";
     }
 }

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

@@ -7,6 +7,5 @@
 public class Label extends LabelEntity {
     private Long labelId;
     private Member admin;
-    private String name;
     private LabelType labelType;
 }

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

@@ -1,6 +1,8 @@
 package clap.server.domain.model.task;
 
+import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
 import clap.server.adapter.outbound.persistense.entity.task.constant.StatusFlag;
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.domain.model.common.BaseTime;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -12,9 +14,8 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Status extends BaseTime {
     private Long statusId;
-    private Long adminId;
-    private String code;
-    private String name;
-    public StatusFlag statusFlag;
-
+    private MemberEntity admin;
+    private TaskStatus statusName;
+    private StatusFlag statusFlag;
+    private boolean isDeleted;
  }