Merge pull request #462 from TaskFlow-CLAP/CLAP-362

CLAP-362 회원 이메일 전송 시 상태 반영

Author: joowojr

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 = "ACTIVE")
+        MemberStatus memberStatus
 
 
 ) {}

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()
         );
     }
 }

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);
     }
 }

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(),