#39 [Update] 페이징 정보 추가

MeongPanNyaengPan-MPNP · Jul 29, 2022 · d0fc06a · d0fc06a
1 parent 2481cb8
commit d0fc06a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/src/main/java/com/mpnp/baechelin/store/dto/StoreCardResponseDto.java b/src/main/java/com/mpnp/baechelin/store/dto/StoreCardResponseDto.java
@@ -37,22 +37,6 @@ public class StoreCardResponseDto {
     @Builder.Default
     private double pointAvg = 0.0;
 
-    public StoreCardResponseDto(Store store) {
-        this.storeId = store.getId();
-        this.category = store.getCategory();
-        this.name = store.getName();
-        this.latitude = store.getLatitude();
-        this.longitude = store.getLongitude();
-        this.address = store.getAddress();
-        this.elevator = store.getElevator();
-        this.toilet = store.getToilet();
-        this.parking = store.getParking();
-        this.phoneNumber = store.getPhoneNumber();
-        this.heightDifferent = store.getHeightDifferent();
-        this.approach = store.getApproach();
-        this.bookmarkCount = store.getBookMarkCount();
-    }
-
     public StoreCardResponseDto(Store store, String isBookMark) {
         this.storeId = store.getId();
         this.category = store.getCategory();

diff --git a/src/main/java/com/mpnp/baechelin/store/dto/StorePagedResponseDto.java b/src/main/java/com/mpnp/baechelin/store/dto/StorePagedResponseDto.java
@@ -1,9 +1,11 @@
 package com.mpnp.baechelin.store.dto;
 
+import com.mpnp.baechelin.store.domain.Store;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.domain.Page;
 
 import java.util.List;
 
@@ -13,11 +15,15 @@
 public class StorePagedResponseDto {
     private boolean hasNextPage;
     private long totalCount;
+    private long leftElement;
+    private int page;
     private List<StoreCardResponseDto> cards;
 
-    public StorePagedResponseDto(boolean hasNextPage, List<StoreCardResponseDto> cards, long totalCount) {
-        this.hasNextPage = hasNextPage;
+    public StorePagedResponseDto(Page<Store> resultStoreList, List<StoreCardResponseDto> cards) {
+        this.hasNextPage = resultStoreList.hasNext();
         this.cards = cards;
-        this.totalCount = totalCount;
+        this.totalCount = resultStoreList.getTotalElements();
+        this.page = resultStoreList.getNumber();
+        this.leftElement = totalCount - (long) page * resultStoreList.getSize();
     }
 }
diff --git a/src/main/java/com/mpnp/baechelin/store/service/StoreService.java b/src/main/java/com/mpnp/baechelin/store/service/StoreService.java
@@ -124,7 +124,7 @@ private StorePagedResponseDto getStoreCardPagedResponseDto(User targetUser, Page
             boolean isBookmark = bookmarkRepository.existsByStoreIdAndUserId(store, targetUser);
             mappingResult.add(new StoreCardResponseDto(store, isBookmark ? "Y" : "N"));
         }
-        return new StorePagedResponseDto(resultStoreList.hasNext(), mappingResult, resultStoreList.getTotalElements());
+        return new StorePagedResponseDto(resultStoreList, mappingResult);
     }