Skip to content

CLAP-156 DB 초기화를 위한 Flyway 초기 설정 #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joowojr merged 2 commits into from
Jan 30, 2025
Merged

CLAP-156 DB 초기화를 위한 Flyway 초기 설정 #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24dd46a
CLAP-156 Style: 컬럼 수정
joowojr Jan 30, 2025
45d278e
CLAP-156 Style: 컬럼 네이밍 수정으로 인한 변경 사항
joowojr Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/main/java/clap/server/adapter/outbound/persistense/entity/member/DepartmentEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ public class DepartmentEntity extends BaseTimeEntity {
@JoinColumn(name = "admin_id")
private MemberEntity admin;

@Column(nullable = false)
private String code;

@Column(nullable = false)
private String name;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class MemberEntity extends BaseTimeEntity {
private String imageUrl;

@Column
private Boolean kakaoWorkNotificationEnabled;
private Boolean kakaoworkNotificationEnabled;
@Column
private Boolean agitNotificationEnabled;
@Column
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/clap/server/application/mapper/MemberMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static MemberDetailInfoResponse.NotificationSettingInfoResponse toNotific
return new MemberDetailInfoResponse.NotificationSettingInfoResponse(
member.getAgitNotificationEnabled(),
member.getEmailNotificationEnabled(),
member.getKakaoWorkNotificationEnabled()
member.getKakaoworkNotificationEnabled()
);
}
}
12 changes: 6 additions & 6 deletions src/main/java/clap/server/domain/model/member/Member.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ public class Member extends BaseTime {
private Long memberId;
private MemberInfo memberInfo;
private Member admin;
private Boolean kakaoWorkNotificationEnabled;
private Boolean kakaoworkNotificationEnabled;
private Boolean agitNotificationEnabled;
private Boolean emailNotificationEnabled;
private String imageUrl;
private MemberStatus status;
private String password;

@Builder
public Member(MemberInfo memberInfo, Boolean agitNotificationEnabled, Boolean emailNotificationEnabled, Boolean kakaoWorkNotificationEnabled,
public Member(MemberInfo memberInfo, Boolean agitNotificationEnabled, Boolean emailNotificationEnabled, Boolean kakaoworkNotificationEnabled,
Member admin, String imageUrl, MemberStatus status, String password) {
this.memberInfo = memberInfo;
this.agitNotificationEnabled = agitNotificationEnabled;
this.emailNotificationEnabled = emailNotificationEnabled;
this.kakaoWorkNotificationEnabled = kakaoWorkNotificationEnabled;
this.kakaoworkNotificationEnabled = kakaoworkNotificationEnabled;
this.admin = admin;
this.imageUrl = imageUrl;
this.status = status;
Expand All @@ -38,7 +38,7 @@ public static Member createMember(Member admin, MemberInfo memberInfo) {
.memberInfo(memberInfo)
.agitNotificationEnabled(null)
.emailNotificationEnabled(null)
.kakaoWorkNotificationEnabled(null)
.kakaoworkNotificationEnabled(null)
.admin(admin)
.imageUrl(null)
.status(MemberStatus.PENDING)
Expand All @@ -55,7 +55,7 @@ public void resetPasswordAndActivateMember(String newEncodedPassword) {
this.status = MemberStatus.ACTIVE;
this.agitNotificationEnabled = true;
this.emailNotificationEnabled = true;
this.kakaoWorkNotificationEnabled = true;
this.kakaoworkNotificationEnabled = true;
}

public String getNickname() {
Expand All @@ -70,7 +70,7 @@ public void updateMemberInfo(String name, Boolean agitNotificationEnabled, Boole
this.memberInfo.updateName(name);
this.agitNotificationEnabled = agitNotificationEnabled;
this.emailNotificationEnabled = emailNotificationEnabled;
this.kakaoWorkNotificationEnabled = kakaoWorkNotificationEnabled;
this.kakaoworkNotificationEnabled = kakaoWorkNotificationEnabled;
if (imageUrl != null) {
this.imageUrl = imageUrl;
}
Expand Down