Merge branch 'feature/#28/get-photoList-api' of https://github.com/Na…

…-o-man/Na-o-man_server into feature/#28/get-photoList-api
Na-o-man · Jul 31, 2024 · 544915b · 544915b
2 parents fd03043 + ae42682
commit 544915b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/com/umc/naoman/domain/photo/controller/PhotoController.java b/src/main/java/com/umc/naoman/domain/photo/controller/PhotoController.java
@@ -44,7 +44,7 @@ public ResultResponse<PhotoResponse.PhotoUploadInfo> uploadPhotoList(@Valid @Req
     }
 
     @GetMapping("/all")
-    public ResultResponse<PhotoResponse.PhotoListInfo> getAllPhotoListByShareGroup(@RequestParam Long shareGroupId,
+    public ResultResponse<PhotoResponse.PagedPhotoInfo> getAllPhotoListByShareGroup(@RequestParam Long shareGroupId,
                                                                                    @PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable) {
         Page<Photo> allPhotoListByShareGroup = photoService.getAllPhotoList(shareGroupId, pageable);
         return ResultResponse.of(RETRIEVE_PHOTO, photoConverter.toPhotoListInfo(allPhotoListByShareGroup));

diff --git a/src/main/java/com/umc/naoman/domain/photo/converter/PhotoConverter.java b/src/main/java/com/umc/naoman/domain/photo/converter/PhotoConverter.java
@@ -42,17 +42,16 @@ public Photo toEntity(String photoUrl, String photoName, ShareGroup shareGroup)
                 .build();
     }
 
-    public PhotoResponse.PhotoListInfo toPhotoListInfo(Page<Photo> photoList) {
+    public PhotoResponse.PagedPhotoInfo toPhotoListInfo(Page<Photo> photoList) {
         List<PhotoResponse.PhotoInfo> photoInfoList = photoList.stream()
                 .map(this::toPhotoInfo)
                 .collect(Collectors.toList());
 
-        return PhotoResponse.PhotoListInfo.builder()
+        return PhotoResponse.PagedPhotoInfo.builder()
                 .isLast(photoList.isLast())
                 .isFirst(photoList.isFirst())
                 .totalPage(photoList.getTotalPages())
                 .totalElements(photoList.getTotalElements())
-                .listSize(photoInfoList.size())
                 .photoInfoList(photoInfoList)
                 .build();
     }
@@ -62,7 +61,7 @@ public PhotoResponse.PhotoInfo toPhotoInfo(Photo photo) {
                 .photoUrl(photo.getUrl())
                 .photoName(photo.getName())
                 .resizedPhotoName(convertExtension(photo.getName()))
-                .uploadTime(photo.getCreatedAt())
+                .createdAt(photo.getCreatedAt())
                 .build();
     }
 

diff --git a/src/main/java/com/umc/naoman/domain/photo/dto/PhotoResponse.java b/src/main/java/com/umc/naoman/domain/photo/dto/PhotoResponse.java
@@ -41,9 +41,8 @@ public static class PhotoUploadInfo {
     @Builder
     @AllArgsConstructor
     @NoArgsConstructor
-    public static class PhotoListInfo {
+    public static class PagedPhotoInfo {
         private List<PhotoInfo> photoInfoList;
-        Integer listSize;
         Integer totalPage;
         Long totalElements;
         Boolean isFirst;
@@ -58,6 +57,6 @@ public static class PhotoInfo {
         private String photoUrl;
         private String photoName;
         private String resizedPhotoName;
-        private LocalDateTime uploadTime;
+        private LocalDateTime createdAt;
     }
 }