CLAP-243 refactor:PageResponse 사용 및 dto mapping 서비스단으로 위임

Sihun23 · Sihun23 · commit 8b424385263b · 2025-02-04T00:36:50.000+09:00
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java b/src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java
@@ -1,7 +1,8 @@
 package clap.server.adapter.inbound.web.admin;
 
-import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
-import clap.server.adapter.inbound.web.dto.admin.RetrieveAllMemberResponse;
+import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest;
+import clap.server.adapter.inbound.web.dto.admin.response.RetrieveAllMemberResponse;
+import clap.server.adapter.inbound.web.dto.common.PageResponse;
 import clap.server.application.mapper.RetrieveAllMemberMapper;
 import clap.server.application.port.inbound.admin.FindAllMembersUsecase;
 import clap.server.application.port.inbound.admin.FindMembersWithFilterUsecase;
@@ -11,6 +12,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -23,9 +25,7 @@
 @RequestMapping("/api/managements")
 @RequiredArgsConstructor
 public class FindMemberController {
-    private final FindAllMembersUsecase findAllMembersUsecase;
     private final FindMembersWithFilterUsecase findMembersWithFilterUsecase;
-    private final RetrieveAllMemberMapper retrieveAllMemberMapper;
 
     @Tag(name = "05. Admin")
     @Secured({"ROLE_ADMIN"})
@@ -38,26 +38,17 @@ public class FindMemberController {
             }
     )
     @GetMapping("/members")
-    public ResponseEntity<Page<RetrieveAllMemberResponse>> getAllMembers(
+    public ResponseEntity<PageResponse<RetrieveAllMemberResponse>> getAllMembers(
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "20") int pageSize,
-            @RequestBody FindMemberRequest filterRequest) {
+            @ModelAttribute @Valid FindMemberRequest filterRequest) {
 
         if (filterRequest.name() != null && filterRequest.name().trim().isEmpty()) {
             throw ApplicationException.from(MemberErrorCode.NAME_CANNOT_BE_EMPTY);
         }
 
         Pageable pageable = PageRequest.of(page, pageSize);
-        Page<Member> members;
-
-        if (filterRequest.name() != null || filterRequest.email() != null || filterRequest.nickName() != null ||
-                filterRequest.departmentName() != null || filterRequest.role() != null) {
-            members = findMembersWithFilterUsecase.findMembersWithFilter(pageable, filterRequest);
-        } else {
-            members = findAllMembersUsecase.findAllMembers(pageable);
-        }
-
-        Page<RetrieveAllMemberResponse> response = members.map(retrieveAllMemberMapper::toResponse);
+        PageResponse<RetrieveAllMemberResponse> response = findMembersWithFilterUsecase.findMembersWithFilter(pageable, filterRequest);
         return ResponseEntity.ok(response);
     }
-}
+}
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/FindMemberRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/FindMemberRequest.java
@@ -1,21 +1,27 @@
-package clap.server.adapter.inbound.web.dto.admin;
+package clap.server.adapter.inbound.web.dto.admin.request;
 
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 
 public record FindMemberRequest(
+        @NotNull
         @Schema(description = "회원 이름", example = "양시훈")
         String name,
 
+        @NotNull
         @Schema(description = "회원 이메일", example = "sihun123@gmail.com")
         String email,
 
+        @NotNull
         @Schema(description = "회원 닉네임", example = "leo.sh")
         String nickName,
 
+        @NotNull
         @Schema(description = "부서 이름", example = "1")
         String departmentName,
 
+        @NotNull
         @Schema(description = "회원 역할", example = "ROLE_USER")
         MemberRole role
 ) {}
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
@@ -1,4 +1,4 @@
-package clap.server.adapter.inbound.web.dto.admin;
+package clap.server.adapter.inbound.web.dto.admin.response;
 
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java
@@ -1,6 +1,6 @@
 package clap.server.adapter.outbound.persistense;
 
-import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
+import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest;
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
@@ -103,7 +103,6 @@ public Page<Member> findAllMembers(Pageable pageable) {
     @Override
     public Page<Member> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest) {
         return memberRepository.findMembersWithFilter(pageable, filterRequest).map(memberPersistenceMapper::toDomain);
-
     }
 }
 
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepository.java
@@ -1,6 +1,6 @@
 package clap.server.adapter.outbound.persistense.repository.member;
 
-import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
+import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest;
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java
@@ -1,6 +1,6 @@
 package clap.server.adapter.outbound.persistense.repository.member;
 
-import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
+import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest;
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import com.querydsl.core.BooleanBuilder;
@@ -46,17 +46,17 @@ private BooleanBuilder createMemberFilter(FindMemberRequest filterRequest) {
         BooleanBuilder whereClause = new BooleanBuilder();
         whereClause.and(memberEntity.status.ne(MemberStatus.DELETED));
 
-        if (filterRequest.name() != null) {
+        if (!filterRequest.name().isBlank()) {
             whereClause.and(memberEntity.name.containsIgnoreCase(filterRequest.name()));
         }
-        if (filterRequest.email() != null) {
+        if (!filterRequest.email().isBlank()) {
             whereClause.and(memberEntity.email.containsIgnoreCase(filterRequest.email()));
         }
-        if (filterRequest.nickName() != null) {
+        if (!filterRequest.nickName().isBlank()) {
             whereClause.and(memberEntity.nickname.containsIgnoreCase(filterRequest.nickName()));
         }
-        if (filterRequest.departmentName() != null) {
-            whereClause.and(memberEntity.department.name.eq(filterRequest.departmentName()));
+        if (!filterRequest.departmentName().isBlank()) {
+            whereClause.and(memberEntity.department.name.contains(filterRequest.departmentName()));
         }
         if (filterRequest.role() != null) {
             whereClause.and(memberEntity.role.eq(filterRequest.role()));
diff --git a/src/main/java/clap/server/application/mapper/RetrieveAllMemberMapper.java b/src/main/java/clap/server/application/mapper/RetrieveAllMemberMapper.java
@@ -1,6 +1,6 @@
 package clap.server.application.mapper;
 
-import clap.server.adapter.inbound.web.dto.admin.RetrieveAllMemberResponse;
+import clap.server.adapter.inbound.web.dto.admin.response.RetrieveAllMemberResponse;
 import clap.server.domain.model.member.Member;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/clap/server/application/port/inbound/admin/FindAllMembersUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/FindAllMembersUsecase.java
@@ -1,9 +1,9 @@
 package clap.server.application.port.inbound.admin;
 
-import clap.server.domain.model.member.Member;
-import org.springframework.data.domain.Page;
+import clap.server.adapter.inbound.web.dto.admin.response.RetrieveAllMemberResponse;
+import clap.server.adapter.inbound.web.dto.common.PageResponse;
 import org.springframework.data.domain.Pageable;
 
 public interface FindAllMembersUsecase {
-    Page<Member> findAllMembers(Pageable pageable);
-}
+    PageResponse<RetrieveAllMemberResponse> findAllMembers(Pageable pageable);
+}
diff --git a/src/main/java/clap/server/application/port/inbound/admin/FindMembersWithFilterUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/FindMembersWithFilterUsecase.java
@@ -1,10 +1,11 @@
 package clap.server.application.port.inbound.admin;
 
-import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
-import clap.server.domain.model.member.Member;
+import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest;
+import clap.server.adapter.inbound.web.dto.admin.response.RetrieveAllMemberResponse;
+import clap.server.adapter.inbound.web.dto.common.PageResponse;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
 public interface FindMembersWithFilterUsecase {
-    Page<Member> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest);
-}
+    PageResponse<RetrieveAllMemberResponse> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest);
+}
diff --git a/src/main/java/clap/server/application/port/inbound/management/FindAllMembersUsecase.java b/src/main/java/clap/server/application/port/inbound/management/FindAllMembersUsecase.java
diff --git a/src/main/java/clap/server/application/port/inbound/management/FindMembersWithFilterUsecase.java b/src/main/java/clap/server/application/port/inbound/management/FindMembersWithFilterUsecase.java
diff --git a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java
@@ -1,6 +1,6 @@
 package clap.server.application.port.outbound.member;
 
-import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
+import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Task;  // Task 클래스 임포트 확인
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; // TaskStatus 임포트
diff --git a/src/main/java/clap/server/application/service/admin/FindAllMembersService.java b/src/main/java/clap/server/application/service/admin/FindAllMembersService.java
@@ -1,20 +1,28 @@
 package clap.server.application.service.admin;
 
+import clap.server.adapter.inbound.web.dto.admin.response.RetrieveAllMemberResponse;
+import clap.server.adapter.inbound.web.dto.common.PageResponse;
+import clap.server.application.mapper.RetrieveAllMemberMapper;
 import clap.server.application.port.inbound.admin.FindAllMembersUsecase;
 import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.domain.model.member.Member;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
 public class FindAllMembersService implements FindAllMembersUsecase {
     private final LoadMemberPort loadMemberPort;
+    private final RetrieveAllMemberMapper retrieveAllMemberMapper;
 
+
+    @Transactional(readOnly = true)
     @Override
-    public Page<Member> findAllMembers(Pageable pageable) {
-        return loadMemberPort.findAllMembers(pageable);
+    public PageResponse<RetrieveAllMemberResponse> findAllMembers(Pageable pageable) {
+        Page<Member> members = loadMemberPort.findAllMembers(pageable);
+        return PageResponse.from(members.map(retrieveAllMemberMapper::toResponse));
     }
 }
diff --git a/src/main/java/clap/server/application/service/admin/FindMembersWithFilterService.java b/src/main/java/clap/server/application/service/admin/FindMembersWithFilterService.java
@@ -1,21 +1,30 @@
 package clap.server.application.service.admin;
 
-import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
+
+import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest;
+import clap.server.adapter.inbound.web.dto.admin.response.RetrieveAllMemberResponse;
+import clap.server.adapter.inbound.web.dto.common.PageResponse;
+import clap.server.application.mapper.RetrieveAllMemberMapper;
 import clap.server.application.port.inbound.admin.FindMembersWithFilterUsecase;
 import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.domain.model.member.Member;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
 public class FindMembersWithFilterService implements FindMembersWithFilterUsecase {
     private final LoadMemberPort loadMemberPort;
+    private final RetrieveAllMemberMapper retrieveAllMemberMapper;
+
 
+    @Transactional(readOnly = true)
     @Override
-    public Page<Member> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest) {
-        return loadMemberPort.findMembersWithFilter(pageable, filterRequest);
+    public PageResponse<RetrieveAllMemberResponse> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest) {
+        Page<Member> members = loadMemberPort.findMembersWithFilter(pageable, filterRequest);
+        return PageResponse.from(members.map(retrieveAllMemberMapper::toResponse));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package clap.server.adapter.inbound.web.dto.admin;`
	`1`	`+package clap.server.adapter.inbound.web.dto.admin.response;`
`2`	`2`
`3`	`3`	`import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;`
`4`	`4`	`import io.swagger.v3.oas.annotations.media.Schema;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package clap.server.adapter.outbound.persistense;`
`2`	`2`
`3`		`-import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;`
	`3`	`+import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest;`
`4`	`4`	`import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;`
`5`	`5`	`import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;`
`6`	`6`	`import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;`
`@@ -103,7 +103,6 @@ public Page<Member> findAllMembers(Pageable pageable) {`
`103`	`103`	`@Override`
`104`	`104`	`public Page<Member> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest) {`
`105`	`105`	`return memberRepository.findMembersWithFilter(pageable, filterRequest).map(memberPersistenceMapper::toDomain);`
`106`		`-`
`107`	`106`	`}`
`108`	`107`	`}`
`109`	`108`