fix(#125) : 메인 페이징 처리 관련 dto수정

Troth-Cam · Aug 20, 2023 · 75add36 · 75add36
1 parent c3e6b85
commit 75add36
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 28 deletions.
diff --git a/src/main/java/trothly/trothcam/controller/web/ProductController.java b/src/main/java/trothly/trothcam/controller/web/ProductController.java
@@ -99,7 +99,7 @@ public BaseResponse<ProductsPagingListResDto> getProducts(@PathVariable String t
 
     /* 메인 화면 페이징 처리 - 로그인0 */
     @GetMapping("/{webId}/product-ranking/{type}/{page}")
-    public BaseResponse<ProductsPagingLikedResDto> getProducts(@PathVariable String webId, @PathVariable String type, @PathVariable int page, @AuthenticationPrincipal Member member) {
+    public BaseResponse<ProductsPagingListResDto> getProducts(@PathVariable String webId, @PathVariable String type, @PathVariable int page, @AuthenticationPrincipal Member member) {
         if(!member.getWebId().equals(webId)) {
             throw new BaseException(MEMBER_NOT_FOUND);
         }

diff --git a/src/main/java/trothly/trothcam/dto/web/ProductPagingResDto.java b/src/main/java/trothly/trothcam/dto/web/ProductPagingResDto.java
@@ -13,8 +13,10 @@
 public class ProductPagingResDto {
     private Long historyId;
     private Long productId;
+    private String ownerWebId;
     private String ownerToken;
     private String ownerName;
+    private String authorshipWebId;
     private String authorshipToken;
     private String title;
     private int tags;

diff --git a/src/main/java/trothly/trothcam/dto/web/ProductsPagingLikedResDto.java b/src/main/java/trothly/trothcam/dto/web/ProductsPagingLikedResDto.java
@@ -6,11 +6,11 @@
 import lombok.NoArgsConstructor;
 
 import java.util.List;
-
-@Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@AllArgsConstructor
-public class ProductsPagingLikedResDto {
-    private List<ProductPagingResDto> getProductPagingResDto;
-    private int totalPages;
-}
+//
+//@Getter
+//@NoArgsConstructor(access = AccessLevel.PROTECTED)
+//@AllArgsConstructor
+//public class ProductsPagingLikedResDto {
+//    private List<ProductPagingResDto> getProductPagingResDto;
+//    private int totalPages;
+//}
diff --git a/src/main/java/trothly/trothcam/dto/web/ProductsPagingListResDto.java b/src/main/java/trothly/trothcam/dto/web/ProductsPagingListResDto.java
@@ -11,6 +11,6 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
 public class ProductsPagingListResDto {
-    private List<ProductRankResDto> getProductRankResDto;
+    private List<ProductPagingResDto> getProductRankResDto;
     private int totalPages;
 }
diff --git a/src/main/java/trothly/trothcam/service/web/ProductService.java b/src/main/java/trothly/trothcam/service/web/ProductService.java
@@ -220,14 +220,14 @@ public ProductsPagingListResDto getProductsTop(int page) {
         try {
             PageRequest pageRequest = PageRequest.of(page, 8);
             Page<ProductRepository.ProductTop> productTops = productRepository.findRankPagingDto(pageRequest);
-            List<ProductRankResDto> topPagingDto = productTops.stream()
+            List<ProductPagingResDto> topPagingDto = productTops.stream()
                     .map(t -> {
                         Optional<Member> owner = memberRepository.findById(t.getBuyerId());
                         Optional<Image> image = imageRepository.findById(t.getImageId());
 
-                        return new ProductRankResDto(t.getHistoryId(), t.getProductId(), owner.get().getWebToken(), owner.get().getName(),
-                                image.get().getMember().getWebToken(), t.getTitle(), t.getTags(), image.get().getImageUrl(),
-                                t.getPrice(), t.getSoldAt());
+                        return new ProductPagingResDto(t.getHistoryId(), t.getProductId(), owner.get().getWebId(), owner.get().getWebToken(), owner.get().getName(),
+                                image.get().getMember().getWebId(), image.get().getMember().getWebToken(), t.getTitle(), t.getTags(), image.get().getImageUrl(),
+                                t.getPrice(), t.getSoldAt(), false);
                     }).collect(Collectors.toList());
             return new ProductsPagingListResDto(topPagingDto, productTops.getTotalPages());
         } catch (Exception e) {
@@ -241,14 +241,14 @@ public ProductsPagingListResDto getProductsLatest(int page) {
         try {
             PageRequest pageRequest = PageRequest.of(page, 8);
             Page<ProductRepository.ProductTop> productLatest = productRepository.findLatestPagingDto(pageRequest);
-            List<ProductRankResDto> latestPagingDto = productLatest.stream()
+            List<ProductPagingResDto> latestPagingDto = productLatest.stream()
                     .map(t -> {
                         Optional<Member> owner = memberRepository.findById(t.getBuyerId());
                         Optional<Image> image = imageRepository.findById(t.getImageId());
 
-                        return new ProductRankResDto(t.getHistoryId(), t.getProductId(), owner.get().getWebToken(), owner.get().getName(),
-                                image.get().getMember().getWebToken(), t.getTitle(), t.getTags(), image.get().getImageUrl(),
-                                t.getPrice(), t.getSoldAt());
+                        return new ProductPagingResDto(t.getHistoryId(), t.getProductId(), owner.get().getWebId(), owner.get().getWebToken(), owner.get().getName(),
+                                image.get().getMember().getWebId(), image.get().getMember().getWebToken(), t.getTitle(), t.getTags(), image.get().getImageUrl(),
+                                t.getPrice(), t.getSoldAt(), false);
                     }).collect(Collectors.toList());
             return new ProductsPagingListResDto(latestPagingDto, productLatest.getTotalPages());
         } catch (Exception e) {
@@ -258,7 +258,7 @@ public ProductsPagingListResDto getProductsLatest(int page) {
 
     /* 메인 페이징 처리 로그인0 - top */
     @Transactional
-    public ProductsPagingLikedResDto getProductsLikedTop(int page, Member member) {
+    public ProductsPagingListResDto getProductsLikedTop(int page, Member member) {
         try {
             PageRequest pageRequest = PageRequest.of(page, 8);
             Page<ProductRepository.ProductTop> productTops = productRepository.findRankPagingDto(pageRequest);
@@ -275,26 +275,26 @@ public ProductsPagingLikedResDto getProductsLikedTop(int page, Member member) {
                             liked = false;
                         }
 
-                        return new ProductPagingResDto(t.getHistoryId(), t.getProductId(), owner.getWebToken(), owner.getName(),
-                                image.getMember().getWebToken(), t.getTitle(), t.getTags(), image.getImageUrl(),
+                        return new ProductPagingResDto(t.getHistoryId(), t.getProductId(), owner.getWebId(), owner.getWebToken(), owner.getName(),
+                                image.getMember().getWebId(), image.getMember().getWebToken(), t.getTitle(), t.getTags(), image.getImageUrl(),
                                 t.getPrice(), t.getSoldAt(), liked);
                     }).collect(Collectors.toList());
-            return new ProductsPagingLikedResDto(topPagingLikedDto, productTops.getTotalPages());
+            return new ProductsPagingListResDto(topPagingLikedDto, productTops.getTotalPages());
         } catch (Exception e) {
             throw new BaseException(ErrorCode.DATABASE_ERROR);
         }
     }
 
     /* 메인 페이징 처리 로그인0 - latest */
     @Transactional
-    public ProductsPagingLikedResDto getProductsLikedLatest(int page, Member member) {
+    public ProductsPagingListResDto getProductsLikedLatest(int page, Member member) {
         try {
             PageRequest pageRequest = PageRequest.of(page, 8);
             Page<ProductRepository.ProductTop> productLatest = productRepository.findLatestPagingDto(pageRequest);
             List<ProductPagingResDto> latestPagingLikedDto = productLatest.stream()
                     .map(t -> {
-                        Optional<Member> owner = memberRepository.findById(t.getBuyerId());
-                        Optional<Image> image = imageRepository.findById(t.getImageId());
+                        Member owner = memberRepository.findById(t.getBuyerId()).orElseThrow(() -> new BaseException(MEMBER_NOT_FOUND));
+                        Image image = imageRepository.findById(t.getImageId()).orElseThrow(() -> new BaseException(IMAGE_NOT_FOUND));
                         Optional<LikeProduct> like = likeProductRepository.findByProductIdAndMemberId(t.getProductId(), member.getId());
 
                         boolean liked = false;
@@ -304,11 +304,11 @@ public ProductsPagingLikedResDto getProductsLikedLatest(int page, Member member)
                             liked = false;
                         }
 
-                        return new ProductPagingResDto(t.getHistoryId(), t.getProductId(), owner.get().getWebToken(), owner.get().getName(),
-                                image.get().getMember().getWebToken(), t.getTitle(), t.getTags(), image.get().getImageUrl(),
+                        return new ProductPagingResDto(t.getHistoryId(), t.getProductId(), owner.getWebId(), owner.getWebToken(), owner.getName(),
+                                image.getMember().getWebId(), image.getMember().getWebToken(), t.getTitle(), t.getTags(), image.getImageUrl(),
                                 t.getPrice(), t.getSoldAt(), liked);
                     }).collect(Collectors.toList());
-            return new ProductsPagingLikedResDto(latestPagingLikedDto, productLatest.getTotalPages());
+            return new ProductsPagingListResDto(latestPagingLikedDto, productLatest.getTotalPages());
         } catch (Exception e) {
             throw new BaseException(ErrorCode.DATABASE_ERROR);
         }