Merge pull request #69 from fullstack-dev-hub/feature/#68-estimates-pagination

rimeir · web-flow · commit cf25724f6f58 · 2025-06-13T14:36:56.000+09:00
[Feature] 견적서 조회 페이지네이션 적용
diff --git a/backend/src/main/java/com/postdm/backend/domain/estimate/controller/EstimateController.java b/backend/src/main/java/com/postdm/backend/domain/estimate/controller/EstimateController.java
@@ -1,19 +1,24 @@
 package com.postdm.backend.domain.estimate.controller;
 
+import com.postdm.backend.domain.estimate.dto.EstimateListResponseDto;
 import com.postdm.backend.domain.estimate.dto.EstimateRequestDto;
 import com.postdm.backend.domain.estimate.dto.EstimateResponseDto;
+import com.postdm.backend.domain.estimate.dto.PageResponse;
 import com.postdm.backend.domain.estimate.service.EstimateService;
 import com.postdm.backend.domain.member.dto.MemberPrincipalDto;
 import com.postdm.backend.global.template.ResponseTemplate;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.data.domain.Page;
 
-import java.util.List;
+import org.springframework.data.domain.Pageable;
 
 @Slf4j
 @Tag(name = "Estimate API", description = "견적서 관련 API")
@@ -41,8 +46,11 @@ public ResponseEntity<ResponseTemplate<EstimateResponseDto>> createEstimate(@Aut
 
     @Operation(summary = "견적서 조회", description = "관리자는 모든 견적서를, 사용자는 본인의 견적서만 조회합니다.")
     @GetMapping
-    public ResponseEntity<ResponseTemplate<List<EstimateResponseDto>>> getEstimates(@AuthenticationPrincipal MemberPrincipalDto currentUser) {
-        List<EstimateResponseDto> response = estimateService.getEstimates(currentUser);
+    public ResponseEntity<ResponseTemplate<PageResponse<EstimateListResponseDto>>> getEstimates(
+            @AuthenticationPrincipal MemberPrincipalDto currentUser,
+            @PageableDefault(page = 0, size = 6, sort = {"id"}, direction = Sort.Direction.DESC) Pageable pageable) {
+        Page<EstimateListResponseDto> page = estimateService.getEstimates(currentUser, pageable);
+        PageResponse<EstimateListResponseDto> response = PageResponse.from(page);
         return ResponseEntity
                 .status(HttpStatus.OK)
                 .body(new ResponseTemplate<>(HttpStatus.OK, "견적서 조회 성공", response));
diff --git a/backend/src/main/java/com/postdm/backend/domain/estimate/dto/EstimateListResponseDto.java b/backend/src/main/java/com/postdm/backend/domain/estimate/dto/EstimateListResponseDto.java
@@ -0,0 +1,25 @@
+package com.postdm.backend.domain.estimate.dto;
+
+import com.postdm.backend.domain.estimate.entity.Estimate;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@AllArgsConstructor
+public class EstimateListResponseDto {
+    private Long id;
+    private String title;
+    private LocalDateTime createdAt;
+    private Long memberId;
+
+    public static EstimateListResponseDto from(Estimate estimate) {
+        return new EstimateListResponseDto(
+                estimate.getId(),
+                estimate.getTitle(),
+                estimate.getCreatedAt(),
+                estimate.getMember().getId()
+        );
+    }
+}
diff --git a/backend/src/main/java/com/postdm/backend/domain/estimate/dto/EstimateResponseDto.java b/backend/src/main/java/com/postdm/backend/domain/estimate/dto/EstimateResponseDto.java
@@ -1,18 +1,21 @@
 package com.postdm.backend.domain.estimate.dto;
 
+import com.postdm.backend.domain.estimate.entity.Estimate;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.time.LocalDateTime;
 
 @Getter
 @Schema(description = "견적서 응답 DTO")
+@AllArgsConstructor
 public class EstimateResponseDto {
 
     @Schema(description = "견적서 ID", example = "1")
     private Long id;
 
-    @Schema(description = "견적서 제목 (내용 앞 10글자 + ... 자동 생성)", example = "이것은 견적서의 내...")
+    @Schema(description = "견적서 제목 (내용 앞 10글자 + **** 자동 생성)", example = "이것은 견적서의 내...")
     private String title;
 
     @Schema(description = "견적서 내용", example = "이것은 견적서의 내용입니다.")
@@ -24,11 +27,13 @@ public class EstimateResponseDto {
     @Schema(description = "작성자", example = "user1")
     private Long memberId;
 
-    public EstimateResponseDto(Long id, String title, String content, LocalDateTime createdAt, Long memberId) {
-        this.id = id;
-        this.title = title;
-        this.content = content;
-        this.createdAt = createdAt;
-        this.memberId = memberId;
+    public static EstimateResponseDto from(Estimate estimate) {
+        return new EstimateResponseDto(
+                estimate.getId(),
+                estimate.getTitle(),
+                estimate.getContent(),
+                estimate.getCreatedAt(),
+                estimate.getMember().getId()
+        );
     }
 }
diff --git a/backend/src/main/java/com/postdm/backend/domain/estimate/dto/PageResponse.java b/backend/src/main/java/com/postdm/backend/domain/estimate/dto/PageResponse.java
@@ -0,0 +1,51 @@
+package com.postdm.backend.domain.estimate.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Getter
+@AllArgsConstructor
+public class PageResponse<T> {
+    private List<T> content;
+    private int page;
+    private int size;
+    private long totalElements;
+    private int totalPages;
+    private boolean first;
+    private boolean last;
+    private List<SortInfo> sort;
+
+    public static <T> PageResponse<T> from(Page<T> page) {
+        List<SortInfo> sortInfo = page.getSort().stream()
+                .map(SortInfo::new)
+                .collect(Collectors.toList());
+
+        return new PageResponse<>(
+                page.getContent(),
+                page.getNumber(),
+                page.getSize(),
+                page.getTotalElements(),
+                page.getTotalPages(),
+                page.isFirst(),
+                page.isLast(),
+                sortInfo
+        );
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public static class SortInfo {
+        private String property;
+        private String direction;
+
+        public SortInfo(Sort.Order order) {
+            this.property = order.getProperty();
+            this.direction = order.getDirection().name();
+        }
+    }
+}
diff --git a/backend/src/main/java/com/postdm/backend/domain/estimate/entity/Estimate.java b/backend/src/main/java/com/postdm/backend/domain/estimate/entity/Estimate.java
@@ -49,6 +49,6 @@ public void update(String content) {
     }
 
     private String generateTitle(String content) {
-        return content.length() > 10 ? content.substring(0, 10) + "..." : content;
+        return content.length() > 10 ? content.substring(0, 10) + "****" : content;
     }
 }
diff --git a/backend/src/main/java/com/postdm/backend/domain/estimate/entity/EstimateRepository.java b/backend/src/main/java/com/postdm/backend/domain/estimate/entity/EstimateRepository.java
@@ -1,9 +1,12 @@
 package com.postdm.backend.domain.estimate.entity;
 
+import com.postdm.backend.domain.member.domain.entity.Member;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.List;
+import org.springframework.data.domain.Pageable;
 
 public interface EstimateRepository extends JpaRepository<Estimate, Long> {
-    List<Estimate> findByMemberId(Long memberId);
+    Page<Estimate> findAll(Pageable pageable); // 관리자용
+    Page<Estimate> findByMember(Member member, Pageable pageable); // 사용자용
 }
diff --git a/backend/src/main/java/com/postdm/backend/domain/estimate/service/EstimateService.java b/backend/src/main/java/com/postdm/backend/domain/estimate/service/EstimateService.java
@@ -1,5 +1,6 @@
 package com.postdm.backend.domain.estimate.service;
 
+import com.postdm.backend.domain.estimate.dto.EstimateListResponseDto;
 import com.postdm.backend.domain.estimate.dto.EstimateResponseDto;
 import com.postdm.backend.domain.estimate.entity.Estimate;
 import com.postdm.backend.domain.estimate.entity.EstimateRepository;
@@ -13,14 +14,16 @@
 import com.postdm.backend.global.common.response.ErrorCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-import java.util.stream.Collectors;
+import org.springframework.data.domain.Pageable;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor
+@Transactional(readOnly = true)
 public class EstimateService {
     private final EstimateRepository estimateRepository;
     private final MemberRepository memberRepository;
@@ -46,18 +49,14 @@ public EstimateResponseDto createEstimate(String content, MemberPrincipalDto pri
         );
     }
 
-    public List<EstimateResponseDto> getEstimates(MemberPrincipalDto principal) {
+    public Page<EstimateListResponseDto> getEstimates(MemberPrincipalDto principal, Pageable pageable) {
         Member member = findMemberOrThrow(principal.getId());
 
-        List<Estimate> estimates = (member.getRole() == MemberRole.ADMIN)
-                ? adminPolicy.getEstimates(member, estimateRepository)
-                : userPolicy.getEstimates(member, estimateRepository);
+        Page<Estimate> page = (member.getRole() == MemberRole.ADMIN)
+                ? adminPolicy.getEstimates(member, estimateRepository, pageable)
+                : userPolicy.getEstimates(member, estimateRepository, pageable);
 
-        return estimates.stream()
-                .map(e -> new EstimateResponseDto(
-                        e.getId(), e.getTitle(), e.getContent(), e.getCreatedAt(), e.getMember().getId()
-                ))
-                .collect(Collectors.toList());
+        return page.map(EstimateListResponseDto::from);
     }
 
     public EstimateResponseDto getEstimateDetail(Long estimateId, MemberPrincipalDto principal) {
diff --git a/backend/src/main/java/com/postdm/backend/domain/estimate/service/policy/AdminEstimatePolicy.java b/backend/src/main/java/com/postdm/backend/domain/estimate/service/policy/AdminEstimatePolicy.java
@@ -3,14 +3,17 @@
 import com.postdm.backend.domain.estimate.entity.Estimate;
 import com.postdm.backend.domain.estimate.entity.EstimateRepository;
 import com.postdm.backend.domain.member.domain.entity.Member;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
+import org.springframework.data.domain.Pageable;
 
 @Component
+@RequiredArgsConstructor
 public class AdminEstimatePolicy implements EstimatePolicy {
     @Override
-    public List<Estimate> getEstimates(Member member, EstimateRepository repository) {
-        return repository.findAll(); // 관리자: 전체 조회
+    public Page<Estimate> getEstimates(Member member, EstimateRepository repository, Pageable pageable) {
+        return repository.findAll(pageable);
     }
 }
diff --git a/backend/src/main/java/com/postdm/backend/domain/estimate/service/policy/EstimatePolicy.java b/backend/src/main/java/com/postdm/backend/domain/estimate/service/policy/EstimatePolicy.java
@@ -3,9 +3,10 @@
 import com.postdm.backend.domain.estimate.entity.Estimate;
 import com.postdm.backend.domain.estimate.entity.EstimateRepository;
 import com.postdm.backend.domain.member.domain.entity.Member;
+import org.springframework.data.domain.Page;
 
-import java.util.List;
+import org.springframework.data.domain.Pageable;
 
 public interface EstimatePolicy {
-    List<Estimate> getEstimates(Member member, EstimateRepository repository);
+    Page<Estimate> getEstimates(Member member, EstimateRepository repository, Pageable pageable);
 }
diff --git a/backend/src/main/java/com/postdm/backend/domain/estimate/service/policy/UserEstimatePolicy.java b/backend/src/main/java/com/postdm/backend/domain/estimate/service/policy/UserEstimatePolicy.java
@@ -3,14 +3,17 @@
 import com.postdm.backend.domain.estimate.entity.Estimate;
 import com.postdm.backend.domain.estimate.entity.EstimateRepository;
 import com.postdm.backend.domain.member.domain.entity.Member;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
+import org.springframework.data.domain.Pageable;
 
 @Component
+@RequiredArgsConstructor
 public class UserEstimatePolicy implements EstimatePolicy {
     @Override
-    public List<Estimate> getEstimates(Member member, EstimateRepository repository) {
-        return repository.findByMemberId(member.getId()); // 일반 유저: 본인만 조회
+    public Page<Estimate> getEstimates(Member member, EstimateRepository repository, Pageable pageable) {
+        return repository.findByMember(member, pageable);
     }
 }
diff --git a/backend/src/test/java/com/postdm/backend/domain/estimate/controller/EstimateControllerTest.java b/backend/src/test/java/com/postdm/backend/domain/estimate/controller/EstimateControllerTest.java
@@ -2,8 +2,10 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.postdm.backend.domain.estimate.dto.EstimateRequestDto;
+import com.postdm.backend.domain.estimate.dto.EstimateResponseDto;
 import com.postdm.backend.domain.estimate.entity.Estimate;
 import com.postdm.backend.domain.estimate.entity.EstimateRepository;
+import com.postdm.backend.domain.estimate.service.EstimateService;
 import com.postdm.backend.domain.member.domain.entity.Member;
 import com.postdm.backend.domain.member.domain.entity.MemberRole;
 import com.postdm.backend.domain.member.domain.repository.MemberRepository;
@@ -16,6 +18,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.MediaType;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -24,7 +30,9 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 
+import java.time.LocalDateTime;
 import java.util.Collections;
+import java.util.List;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@@ -47,9 +55,16 @@ class EstimateControllerTest {
     @Autowired
     private EstimateRepository estimateRepository;
 
+    @Autowired
+    private EstimateService estimateService;
+
     private Member testMember;
     private Estimate testEstimate;
     private Authentication authentication;
+    private MemberPrincipalDto principal;
+    private EstimateResponseDto dto;
+    private Pageable pageable;
+    private Page<EstimateResponseDto> page;
 
     @BeforeEach
     void setUp() {
@@ -62,12 +77,15 @@ void setUp() {
         testEstimate = new Estimate("테스트 견적 내용입니다.", testMember);
         estimateRepository.saveAndFlush(testEstimate);
 
-        MemberPrincipalDto principal = TestPrincipalFactory.create(testMember);
+        principal = TestPrincipalFactory.create(testMember);
 
         authentication = new UsernamePasswordAuthenticationToken(
                 principal, null,
                 Collections.singletonList(new SimpleGrantedAuthority("ROLE_MEMBER"))
         );
+        dto = new EstimateResponseDto(1L, "title", "content", LocalDateTime.now(), 1L);
+        pageable = PageRequest.of(0, 1);
+        page = new PageImpl<>(List.of(dto), pageable, 1);
     }
 
     @Test
@@ -87,12 +105,12 @@ void setUp() {
 
     @Test
     @DisplayName("견적서 조회 API 테스트")
-    void 견적서_조회_API_테스트() throws Exception {
+    void 견적서_첫페이지_조회_API_테스트() throws Exception {
         mockMvc.perform(get("/api/v1/estimates")
-                        .with(SecurityMockMvcRequestPostProcessors.authentication(authentication))
-                        .contentType(MediaType.APPLICATION_JSON))
+                        .param("page", "0")
+                        .param("size", "1")
+                        .with(SecurityMockMvcRequestPostProcessors.authentication(authentication)))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$.data.size()").value(1))
-                .andExpect(jsonPath("$.data[0].content").value("테스트 견적 내용입니다."));
+                .andExpect(jsonPath("$.data.content.length()").value(1));
     }
 }
diff --git a/backend/src/test/java/com/postdm/backend/domain/estimate/repository/EstimateRepositoryTest.java b/backend/src/test/java/com/postdm/backend/domain/estimate/repository/EstimateRepositoryTest.java
diff --git a/backend/src/test/java/com/postdm/backend/domain/estimate/service/EstimateServiceTest.java b/backend/src/test/java/com/postdm/backend/domain/estimate/service/EstimateServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,6 @@ public void update(String content) {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`private String generateTitle(String content) {`
`52`		`- return content.length() > 10 ? content.substring(0, 10) + "..." : content;`
	`52`	`+ return content.length() > 10 ? content.substring(0, 10) + "****" : content;`
`53`	`53`	`}`
`54`	`54`	`}`