From 8a6c12aa7367d17fae8d27c2b4a12a6430d82c15 Mon Sep 17 00:00:00 2001 From: Sihun23 Date: Mon, 10 Feb 2025 15:45:34 +0900 Subject: [PATCH 1/3] =?UTF-8?q?CLAP-362=20fix:save=EB=A9=94=EC=86=8C?= =?UTF-8?q?=EB=93=9C=20=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/admin/SendInvitationEmailService.java | 6 +----- .../application/service/admin/SendInvitationService.java | 4 +++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/clap/server/application/service/admin/SendInvitationEmailService.java b/src/main/java/clap/server/application/service/admin/SendInvitationEmailService.java index f7795289..06c2e1a3 100644 --- a/src/main/java/clap/server/application/service/admin/SendInvitationEmailService.java +++ b/src/main/java/clap/server/application/service/admin/SendInvitationEmailService.java @@ -19,11 +19,7 @@ public void sendInvitationEmail(String memberEmail, String receiverName, String try { sendEmailPort.sendInvitationEmail(memberEmail, receiverName, initialPassword, userNickname); } catch (Exception e) { - log.error("Failed to send new password email to: {}", memberEmail, e); } - }).exceptionally(ex -> { - log.error("Unexpected error occurred while sending new password email", ex); - return null; - }); + }).exceptionally(ex -> null); } } \ No newline at end of file diff --git a/src/main/java/clap/server/application/service/admin/SendInvitationService.java b/src/main/java/clap/server/application/service/admin/SendInvitationService.java index f350726c..86653863 100644 --- a/src/main/java/clap/server/application/service/admin/SendInvitationService.java +++ b/src/main/java/clap/server/application/service/admin/SendInvitationService.java @@ -32,10 +32,12 @@ public void sendInvitation(SendInvitationRequest request) { String encodedPassword = passwordEncoder.encode(initialPassword); member.resetPassword(encodedPassword); - commandMemberPort.save(member); member.changeToApproveRequested(); + commandMemberPort.save(member); + + sendInvitationEmailService.sendInvitationEmail( member.getMemberInfo().getEmail(), member.getMemberInfo().getName(), From b8e9aa816df00ad6985d46657a82a50647decbe0 Mon Sep 17 00:00:00 2001 From: Sihun23 Date: Tue, 11 Feb 2025 01:04:35 +0900 Subject: [PATCH 2/3] =?UTF-8?q?CLAP-362=20fix:=20=ED=9A=8C=EC=9B=90=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=20=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dto/admin/response/RetrieveAllMemberResponse.java | 6 +++++- .../application/mapper/response/AdminResponseMapper.java | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/RetrieveAllMemberResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/RetrieveAllMemberResponse.java index d9ff178f..72ca181d 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/RetrieveAllMemberResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/RetrieveAllMemberResponse.java @@ -1,6 +1,7 @@ package clap.server.adapter.inbound.web.dto.admin.response; import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole; +import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDateTime; @@ -31,7 +32,10 @@ public record RetrieveAllMemberResponse( String departmentRole, @Schema(description = "가입일", example = "2024-01-01T12:00:00") - LocalDateTime createdAt + LocalDateTime createdAt, + + @Schema(description = "회원 상태", example = "APPROVAL_REQUEST") + String memberStatus ) {} diff --git a/src/main/java/clap/server/application/mapper/response/AdminResponseMapper.java b/src/main/java/clap/server/application/mapper/response/AdminResponseMapper.java index 68bf27c9..f630c777 100644 --- a/src/main/java/clap/server/application/mapper/response/AdminResponseMapper.java +++ b/src/main/java/clap/server/application/mapper/response/AdminResponseMapper.java @@ -5,6 +5,7 @@ import java.util.List; + public class AdminResponseMapper { private AdminResponseMapper() { throw new IllegalStateException("Utility class"); @@ -26,7 +27,8 @@ public static RetrieveAllMemberResponse toRetrieveAllMemberResponse(Member membe member.getMemberInfo().getDepartment().getName(), member.getMemberInfo().getRole(), member.getMemberInfo().getDepartmentRole(), - member.getCreatedAt() + member.getCreatedAt(), + member.getStatus().name() ); } } From 3dc1310a9afefd015ba86276e222294a26b6c1c0 Mon Sep 17 00:00:00 2001 From: Sihun23 Date: Tue, 11 Feb 2025 10:15:23 +0900 Subject: [PATCH 3/3] =?UTF-8?q?CLAP-362=20fix:MemberStatus=20response=20ty?= =?UTF-8?q?pe=20String->Enum=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dto/admin/response/RetrieveAllMemberResponse.java | 4 ++-- .../application/mapper/response/AdminResponseMapper.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/RetrieveAllMemberResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/RetrieveAllMemberResponse.java index 72ca181d..b9bbf956 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/RetrieveAllMemberResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/RetrieveAllMemberResponse.java @@ -34,8 +34,8 @@ public record RetrieveAllMemberResponse( @Schema(description = "가입일", example = "2024-01-01T12:00:00") LocalDateTime createdAt, - @Schema(description = "회원 상태", example = "APPROVAL_REQUEST") - String memberStatus + @Schema(description = "회원 상태", example = "ACTIVE") + MemberStatus memberStatus ) {} diff --git a/src/main/java/clap/server/application/mapper/response/AdminResponseMapper.java b/src/main/java/clap/server/application/mapper/response/AdminResponseMapper.java index f630c777..01153abc 100644 --- a/src/main/java/clap/server/application/mapper/response/AdminResponseMapper.java +++ b/src/main/java/clap/server/application/mapper/response/AdminResponseMapper.java @@ -28,7 +28,7 @@ public static RetrieveAllMemberResponse toRetrieveAllMemberResponse(Member membe member.getMemberInfo().getRole(), member.getMemberInfo().getDepartmentRole(), member.getCreatedAt(), - member.getStatus().name() + member.getStatus() ); } }