Skip to content

Commit a826686

Browse files
authored
Merge pull request #175 from TaskFlow-CLAP/CLAP-156
CLAP-156 DB 초기화를 위한 Flyway 초기 설정
2 parents aba1f90 + 45d278e commit a826686

4 files changed

Lines changed: 8 additions & 11 deletions

File tree

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ public class DepartmentEntity extends BaseTimeEntity {
2424
@JoinColumn(name = "admin_id")
2525
private MemberEntity admin;
2626

27-
@Column(nullable = false)
28-
private String code;
29-
3027
@Column(nullable = false)
3128
private String name;
3229

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class MemberEntity extends BaseTimeEntity {
5252
private String imageUrl;
5353

5454
@Column
55-
private Boolean kakaoWorkNotificationEnabled;
55+
private Boolean kakaoworkNotificationEnabled;
5656
@Column
5757
private Boolean agitNotificationEnabled;
5858
@Column

src/main/java/clap/server/application/mapper/MemberMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static MemberDetailInfoResponse.NotificationSettingInfoResponse toNotific
3838
return new MemberDetailInfoResponse.NotificationSettingInfoResponse(
3939
member.getAgitNotificationEnabled(),
4040
member.getEmailNotificationEnabled(),
41-
member.getKakaoWorkNotificationEnabled()
41+
member.getKakaoworkNotificationEnabled()
4242
);
4343
}
4444
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ public class Member extends BaseTime {
1313
private Long memberId;
1414
private MemberInfo memberInfo;
1515
private Member admin;
16-
private Boolean kakaoWorkNotificationEnabled;
16+
private Boolean kakaoworkNotificationEnabled;
1717
private Boolean agitNotificationEnabled;
1818
private Boolean emailNotificationEnabled;
1919
private String imageUrl;
2020
private MemberStatus status;
2121
private String password;
2222

2323
@Builder
24-
public Member(MemberInfo memberInfo, Boolean agitNotificationEnabled, Boolean emailNotificationEnabled, Boolean kakaoWorkNotificationEnabled,
24+
public Member(MemberInfo memberInfo, Boolean agitNotificationEnabled, Boolean emailNotificationEnabled, Boolean kakaoworkNotificationEnabled,
2525
Member admin, String imageUrl, MemberStatus status, String password) {
2626
this.memberInfo = memberInfo;
2727
this.agitNotificationEnabled = agitNotificationEnabled;
2828
this.emailNotificationEnabled = emailNotificationEnabled;
29-
this.kakaoWorkNotificationEnabled = kakaoWorkNotificationEnabled;
29+
this.kakaoworkNotificationEnabled = kakaoworkNotificationEnabled;
3030
this.admin = admin;
3131
this.imageUrl = imageUrl;
3232
this.status = status;
@@ -38,7 +38,7 @@ public static Member createMember(Member admin, MemberInfo memberInfo) {
3838
.memberInfo(memberInfo)
3939
.agitNotificationEnabled(null)
4040
.emailNotificationEnabled(null)
41-
.kakaoWorkNotificationEnabled(null)
41+
.kakaoworkNotificationEnabled(null)
4242
.admin(admin)
4343
.imageUrl(null)
4444
.status(MemberStatus.PENDING)
@@ -55,7 +55,7 @@ public void resetPasswordAndActivateMember(String newEncodedPassword) {
5555
this.status = MemberStatus.ACTIVE;
5656
this.agitNotificationEnabled = true;
5757
this.emailNotificationEnabled = true;
58-
this.kakaoWorkNotificationEnabled = true;
58+
this.kakaoworkNotificationEnabled = true;
5959
}
6060

6161
public String getNickname() {
@@ -70,7 +70,7 @@ public void updateMemberInfo(String name, Boolean agitNotificationEnabled, Boole
7070
this.memberInfo.updateName(name);
7171
this.agitNotificationEnabled = agitNotificationEnabled;
7272
this.emailNotificationEnabled = emailNotificationEnabled;
73-
this.kakaoWorkNotificationEnabled = kakaoWorkNotificationEnabled;
73+
this.kakaoworkNotificationEnabled = kakaoWorkNotificationEnabled;
7474
if (imageUrl != null) {
7575
this.imageUrl = imageUrl;
7676
}

0 commit comments

Comments
 (0)