From 24dd46a647cd8400fa26deddd07c0a5399108b25 Mon Sep 17 00:00:00 2001 From: joowojr Date: Thu, 30 Jan 2025 22:37:09 +0700 Subject: [PATCH 1/2] =?UTF-8?q?CLAP-156=20Style:=20=EC=BB=AC=EB=9F=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outbound/persistense/entity/member/DepartmentEntity.java | 3 --- .../outbound/persistense/entity/member/MemberEntity.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/member/DepartmentEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/member/DepartmentEntity.java index 51dcb08b..2da65f2b 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/entity/member/DepartmentEntity.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/member/DepartmentEntity.java @@ -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; diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java index 7d4e1547..4a107b7b 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java @@ -52,7 +52,7 @@ public class MemberEntity extends BaseTimeEntity { private String imageUrl; @Column - private Boolean kakaoWorkNotificationEnabled; + private Boolean kakaoworkNotificationEnabled; @Column private Boolean agitNotificationEnabled; @Column From 45d278e886c0c8f4c9bb2536c81fb00c0ed80b4a Mon Sep 17 00:00:00 2001 From: joowojr Date: Thu, 30 Jan 2025 22:43:06 +0700 Subject: [PATCH 2/2] =?UTF-8?q?CLAP-156=20Style:=20=EC=BB=AC=EB=9F=BC=20?= =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EC=88=98=EC=A0=95=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EB=B3=80=EA=B2=BD=20=EC=82=AC?= =?UTF-8?q?=ED=95=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clap/server/application/mapper/MemberMapper.java | 2 +- .../java/clap/server/domain/model/member/Member.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/clap/server/application/mapper/MemberMapper.java b/src/main/java/clap/server/application/mapper/MemberMapper.java index 804a339a..c8379761 100644 --- a/src/main/java/clap/server/application/mapper/MemberMapper.java +++ b/src/main/java/clap/server/application/mapper/MemberMapper.java @@ -38,7 +38,7 @@ public static MemberDetailInfoResponse.NotificationSettingInfoResponse toNotific return new MemberDetailInfoResponse.NotificationSettingInfoResponse( member.getAgitNotificationEnabled(), member.getEmailNotificationEnabled(), - member.getKakaoWorkNotificationEnabled() + member.getKakaoworkNotificationEnabled() ); } } \ No newline at end of file diff --git a/src/main/java/clap/server/domain/model/member/Member.java b/src/main/java/clap/server/domain/model/member/Member.java index 6ffcf101..1832b0e9 100644 --- a/src/main/java/clap/server/domain/model/member/Member.java +++ b/src/main/java/clap/server/domain/model/member/Member.java @@ -13,7 +13,7 @@ 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; @@ -21,12 +21,12 @@ public class Member extends BaseTime { 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; @@ -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) @@ -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() { @@ -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; }