Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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


) {}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import java.util.List;


public class AdminResponseMapper {
private AdminResponseMapper() {
throw new IllegalStateException("Utility class");
Expand All @@ -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()
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down