Skip to content

Commit 96edee7

Browse files
Sihun23Sihun23
authored andcommitted
CLAP-217 fix:findMemberRequest dto record로 수정
1 parent 91434a0 commit 96edee7

File tree

3 files changed

+26
-28
lines changed

3 files changed

+26
-28
lines changed

src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ public class FindMemberController {
4141
public ResponseEntity<Page<RetrieveAllMemberResponse>> getAllMembers(
4242
@RequestParam(defaultValue = "0") int page,
4343
@RequestParam(defaultValue = "20") int pageSize,
44-
@ModelAttribute FindMemberRequest filterRequest) {
44+
@RequestBody FindMemberRequest filterRequest) {
4545

46-
if (filterRequest.getName() != null && filterRequest.getName().trim().isEmpty()) {
46+
if (filterRequest.name() != null && filterRequest.name().trim().isEmpty()) {
4747
throw ApplicationException.from(MemberErrorCode.NAME_CANNOT_BE_EMPTY);
4848
}
4949

5050
Pageable pageable = PageRequest.of(page, pageSize);
5151
Page<Member> members;
5252

53-
if (filterRequest.getName() != null || filterRequest.getEmail() != null || filterRequest.getNickName() != null ||
54-
filterRequest.getDepartmentName() != null || filterRequest.getRole() != null) {
53+
if (filterRequest.name() != null || filterRequest.email() != null || filterRequest.nickName() != null ||
54+
filterRequest.departmentName() != null || filterRequest.role() != null) {
5555
members = findMembersWithFilterUsecase.findMembersWithFilter(pageable, filterRequest);
5656
} else {
5757
members = findAllMembersUsecase.findAllMembers(pageable);

src/main/java/clap/server/adapter/inbound/web/dto/admin/FindMemberRequest.java

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,20 @@
22

33
import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
44
import io.swagger.v3.oas.annotations.media.Schema;
5-
import lombok.Data;
65

7-
@Data
8-
public class FindMemberRequest {
9-
@Schema(description = "회원 이름", example = "양시훈")
10-
private String name;
6+
public record FindMemberRequest(
7+
@Schema(description = "회원 이름", example = "양시훈")
8+
String name,
119

12-
@Schema(description = "회원 이메일", example = "sihun123@gmail.com")
13-
private String email;
10+
@Schema(description = "회원 이메일", example = "sihun123@gmail.com")
11+
String email,
1412

15-
@Schema(description = "회원 닉네임", example = "leo.sh")
16-
private String nickName;
13+
@Schema(description = "회원 닉네임", example = "leo.sh")
14+
String nickName,
1715

18-
@Schema(description = "부서 이름", example = "1")
19-
private String departmentName;
16+
@Schema(description = "부서 이름", example = "1")
17+
String departmentName,
2018

21-
@Schema(description = "회원 역할", example = "ROLE_USER")
22-
private MemberRole role;
23-
}
19+
@Schema(description = "회원 역할", example = "ROLE_USER")
20+
MemberRole role
21+
) {}

src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,20 +120,20 @@ private BooleanBuilder createMemberFilter(FindMemberRequest filterRequest) {
120120
BooleanBuilder whereClause = new BooleanBuilder();
121121
whereClause.and(memberEntity.status.ne(MemberStatus.DELETED));
122122

123-
if (filterRequest.getName() != null) {
124-
whereClause.and(memberEntity.name.containsIgnoreCase(filterRequest.getName()));
123+
if (filterRequest.name() != null) {
124+
whereClause.and(memberEntity.name.containsIgnoreCase(filterRequest.name()));
125125
}
126-
if (filterRequest.getEmail() != null) {
127-
whereClause.and(memberEntity.email.containsIgnoreCase(filterRequest.getEmail()));
126+
if (filterRequest.email() != null) {
127+
whereClause.and(memberEntity.email.containsIgnoreCase(filterRequest.email()));
128128
}
129-
if (filterRequest.getNickName() != null) {
130-
whereClause.and(memberEntity.nickname.containsIgnoreCase(filterRequest.getNickName()));
129+
if (filterRequest.nickName() != null) {
130+
whereClause.and(memberEntity.nickname.containsIgnoreCase(filterRequest.nickName()));
131131
}
132-
if (filterRequest.getDepartmentName() != null) {
133-
whereClause.and(memberEntity.department.name.containsIgnoreCase(filterRequest.getDepartmentName()));
132+
if (filterRequest.departmentName() != null) {
133+
whereClause.and(memberEntity.department.name.containsIgnoreCase(filterRequest.departmentName()));
134134
}
135-
if (filterRequest.getRole() != null) {
136-
whereClause.and(memberEntity.role.eq(filterRequest.getRole()));
135+
if (filterRequest.role() != null) {
136+
whereClause.and(memberEntity.role.eq(filterRequest.role()));
137137
}
138138

139139
return whereClause;

0 commit comments

Comments
 (0)