Skip to content

Commit 56f9744

Browse files
committed
CLAP-90 Bug: 엔티티 변경 사항 모델 클래스에 적용
<footer> - 관련: #43
1 parent 8429db6 commit 56f9744

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@ public class Department extends BaseTime {
1515
private Long adminId;
1616
private String code;
1717
private String name;
18-
private DepartmentStatus departmentStatus;
19-
18+
private DepartmentStatus status;
2019
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@ public class Member extends BaseTime {
1515
private Member admin;
1616
private Boolean notificationEnabled;
1717
private String imageUrl;
18-
private MemberStatus memberStatus;
18+
private MemberStatus status;
1919
private String password;
2020

2121
@Builder
2222
public Member(MemberInfo memberInfo, Boolean notificationEnabled, String imageUrl,
23-
MemberStatus memberStatus, String password) {
23+
MemberStatus status, String password) {
2424
this.memberInfo = memberInfo;
2525
this.notificationEnabled = notificationEnabled;
2626
this.imageUrl = imageUrl;
27-
this.memberStatus = memberStatus;
27+
this.status = status;
2828
this.password = password;
2929
}
3030

3131
public void register(Member admin) {
3232
this.admin = admin;
3333
this.notificationEnabled = null;
3434
this.imageUrl = null;
35-
this.memberStatus = MemberStatus.PENDING;
35+
this.status = MemberStatus.PENDING;
3636
this.password = "";
3737
}
3838
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
public class Label extends LabelEntity {
88
private Long labelId;
99
private Member admin;
10-
private String name;
1110
private LabelType labelType;
1211
}
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package clap.server.domain.model.task;
22

3+
import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
34
import clap.server.adapter.outbound.persistense.entity.task.constant.StatusFlag;
5+
import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
46
import clap.server.domain.model.common.BaseTime;
57
import lombok.AccessLevel;
68
import lombok.Getter;
@@ -12,9 +14,8 @@
1214
@NoArgsConstructor(access = AccessLevel.PROTECTED)
1315
public class Status extends BaseTime {
1416
private Long statusId;
15-
private Long adminId;
16-
private String code;
17-
private String name;
18-
public StatusFlag statusFlag;
19-
17+
private MemberEntity admin;
18+
private TaskStatus statusName;
19+
private StatusFlag statusFlag;
20+
private boolean isDeleted;
2021
}

0 commit comments

Comments
 (0)