Merge pull request #298 from team9502/dev

fix: 응답값에 id 추가 [배포]
team9502 · Jul 3, 2024 · 29697e8 · 29697e8
2 parents a21ca8c + 06eb7af
commit 29697e8
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/...n/java/team9502/sinchulgwinong/domain/point/dto/response/SavedPointDetailResponseDTO.java b/...n/java/team9502/sinchulgwinong/domain/point/dto/response/SavedPointDetailResponseDTO.java
@@ -13,6 +13,9 @@
 @AllArgsConstructor
 public class SavedPointDetailResponseDTO {
 
+    @Schema(description = "적립된 포인트 ID", example = "1")
+    private Long spId;
+
     @Schema(description = "적립된 포인트", example = "REVIEW")
     private SpType type;
 

diff --git a/...in/java/team9502/sinchulgwinong/domain/point/dto/response/UsedPointDetailResponseDTO.java b/...in/java/team9502/sinchulgwinong/domain/point/dto/response/UsedPointDetailResponseDTO.java
@@ -13,6 +13,9 @@
 @AllArgsConstructor
 public class UsedPointDetailResponseDTO {
 
+    @Schema(description = "사용된 포인트 ID", example = "1")
+    private Long upId;
+
     @Schema(description = "사용된 포인트", example = "REVIEW")
     private UpType type;
 

diff --git a/.../java/team9502/sinchulgwinong/domain/point/repository/SavedPointRepositoryCustomImpl.java b/.../java/team9502/sinchulgwinong/domain/point/repository/SavedPointRepositoryCustomImpl.java
@@ -19,9 +19,9 @@ public List<SavedPoint> findSavedPointsWithCursor(Long pointId, Long cursorId, i
                 .selectFrom(qSavedPoint)
                 .where(
                         qSavedPoint.point.pointId.eq(pointId)
-                                .and(qSavedPoint.spId.lt(cursorId))
+                                .and(qSavedPoint.spId.gt(cursorId))
                 )
-                .orderBy(qSavedPoint.spId.desc())
+                .orderBy(qSavedPoint.spId.asc())
                 .limit(limit)
                 .fetch();
     }

diff --git a/...n/java/team9502/sinchulgwinong/domain/point/repository/UsedPointRepositoryCustomImpl.java b/...n/java/team9502/sinchulgwinong/domain/point/repository/UsedPointRepositoryCustomImpl.java
@@ -19,9 +19,9 @@ public List<UsedPoint> findUsedPointsWithCursor(Long pointId, Long cursorId, int
                 .selectFrom(qUsedPoint)
                 .where(
                         qUsedPoint.point.pointId.eq(pointId)
-                                .and(qUsedPoint.upId.lt(cursorId))
+                                .and(qUsedPoint.upId.gt(cursorId))
                 )
-                .orderBy(qUsedPoint.upId.desc())
+                .orderBy(qUsedPoint.upId.asc())
                 .limit(limit)
                 .fetch();
     }

diff --git a/src/main/java/team9502/sinchulgwinong/domain/point/service/PointService.java b/src/main/java/team9502/sinchulgwinong/domain/point/service/PointService.java
@@ -150,7 +150,11 @@ public PagedResponseDTO<SavedPointDetailResponseDTO> getSpDetails(UserDetailsImp
         }
 
         List<SavedPointDetailResponseDTO> dtoList = savedPoints.stream()
-                .map(sp -> new SavedPointDetailResponseDTO(sp.getSpType(), sp.getSpAmount(), sp.getCreatedAt().toLocalDate()))
+                .map(sp -> new SavedPointDetailResponseDTO(
+                        sp.getSpId(),
+                        sp.getSpType(),
+                        sp.getSpAmount(),
+                        sp.getCreatedAt().toLocalDate()))
                 .collect(Collectors.toList());
 
         return new PagedResponseDTO<>(dtoList, hasNextPage);
@@ -172,7 +176,11 @@ public PagedResponseDTO<UsedPointDetailResponseDTO> getUpDetails(UserDetailsImpl
         }
 
         List<UsedPointDetailResponseDTO> dtoList = usedPoints.stream()
-                .map(up -> new UsedPointDetailResponseDTO(up.getUpType(), up.getUpAmount(), up.getCreatedAt().toLocalDate()))
+                .map(up -> new UsedPointDetailResponseDTO(
+                        up.getUpId(),
+                        up.getUpType(),
+                        up.getUpAmount(),
+                        up.getCreatedAt().toLocalDate()))
                 .collect(Collectors.toList());
 
         return new PagedResponseDTO<>(dtoList, hasNextPage);
@@ -183,7 +191,11 @@ public List<UsedPointDetailResponseDTO> getPublicLatestBannerUsage() {
         List<UsedPoint> usedPoints = usedPointRepository.findTop3ByUpTypeOrderByCreatedAtDesc(UpType.BANNER, PageRequest.of(0, 3));
 
         return usedPoints.stream()
-                .map(up -> new UsedPointDetailResponseDTO(up.getUpType(), up.getUpAmount(), up.getCreatedAt().toLocalDate()))
+                .map(up -> new UsedPointDetailResponseDTO(
+                        up.getUpId(),
+                        up.getUpType(),
+                        up.getUpAmount(),
+                        up.getCreatedAt().toLocalDate()))
                 .collect(Collectors.toList());
     }