Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
Expand Up @@ -21,7 +21,10 @@ public record FindMemberRequest(
@Schema(description = "부서 이름", example = "1")
String departmentName,

@NotNull
@Schema(description = "회원 역할", example = "ROLE_USER")
MemberRole role

//TODO: 가입일 추가


) {}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
import io.swagger.v3.oas.annotations.media.Schema;

import java.time.LocalDateTime;

public record RetrieveAllMemberResponse(
@Schema(description = "회원 ID", example = "1")
Long memberId,

@Schema(description = "회원 이름", example = "양시훈")
String name,

Expand All @@ -23,5 +28,10 @@ public record RetrieveAllMemberResponse(
MemberRole role,

@Schema(description = "회원 직책", example = "개발자")
String departmentRole
String departmentRole,

@Schema(description = "가입일", example = "2024-01-01T12:00:00")
LocalDateTime createdAt


) {}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ public interface MemberPersistenceMapper {
@Mapping(source = "departmentRole", target = "memberInfo.departmentRole")
@Mapping(source = "department", target = "memberInfo.department")
@Mapping(source = "reviewer", target = "memberInfo.isReviewer")
@Mapping(source = "admin", target = "admin")
@Mapping(source = "admin", target = "admin", qualifiedByName = "toDomain")
@Mapping(source = "createdAt", target = "createdAt")
@Mapping(source = "updatedAt", target = "updatedAt")
@Mapping(source = "memberId", target = "memberId")

Member toDomain(MemberEntity entity);

@Mapping(source = "memberInfo.name", target = "name")
Expand All @@ -25,7 +29,11 @@ public interface MemberPersistenceMapper {
@Mapping(source = "memberInfo.departmentRole", target = "departmentRole")
@Mapping(source = "memberInfo.department", target = "department")
@Mapping(source = "memberInfo.reviewer", target = "isReviewer")
@Mapping(target = "admin", source = "admin")
@Mapping(source = "admin", target = "admin", qualifiedByName = "toEntity")
@Mapping(source = "createdAt", target = "createdAt")
@Mapping(source = "updatedAt", target = "updatedAt")
@Mapping(source = "memberId", target = "memberId")

MemberEntity toEntity(Member member);

default boolean mapReviewer(boolean reviewer) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@ public List<RetrieveAllMemberResponse> toResponseList(List<Member> members) {

public RetrieveAllMemberResponse toResponse(Member member) {
return new RetrieveAllMemberResponse(
member.getMemberId(),
member.getMemberInfo().getName(),
member.getMemberInfo().getEmail(),
member.getMemberInfo().getNickname(),
member.getMemberInfo().isReviewer(),
member.getMemberInfo().getDepartment().getName(),
member.getMemberInfo().getRole(),
member.getMemberInfo().getDepartmentRole()
member.getMemberInfo().getDepartmentRole(),
member.getCreatedAt()
);
}
}