Merge pull request #66 from YAPP-Github/feature/MAFOO-122

[MAFOO-122] feat: 사진 조회 API에 정렬 옵션을 추가했어요
YAPP-Github · Oct 17, 2024 · e74511c · e74511c
2 parents 959c7d4 + c4c354b
commit e74511c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/photo-service/src/main/java/kr/mafoo/photo/api/PhotoApi.java b/photo-service/src/main/java/kr/mafoo/photo/api/PhotoApi.java
@@ -31,7 +31,11 @@ Flux<PhotoResponse> getPhotos(
             @ULID
             @Parameter(description = "앨범 ID", example = "test_album_id")
             @RequestParam
-            String albumId
+            String albumId,
+
+            @Parameter(description = "정렬 종류", example = "ASC | DESC")
+            @RequestParam(required = false)
+            String sort
     );
 
     @Operation(summary = "사진 생성", description = "사진을 생성합니다.")

diff --git a/photo-service/src/main/java/kr/mafoo/photo/controller/PhotoController.java b/photo-service/src/main/java/kr/mafoo/photo/controller/PhotoController.java
@@ -22,10 +22,11 @@ public class PhotoController implements PhotoApi {
     @Override
     public Flux<PhotoResponse> getPhotos(
             String memberId,
-            String albumId
+            String albumId,
+            String sort
     ){
         return photoService
-                .findAllByAlbumId(albumId, memberId)
+                .findAllByAlbumId(albumId, memberId, sort)
                 .map(PhotoResponse::fromEntity);
     }
 

diff --git a/photo-service/src/main/java/kr/mafoo/photo/repository/PhotoRepository.java b/photo-service/src/main/java/kr/mafoo/photo/repository/PhotoRepository.java
@@ -12,6 +12,10 @@
 public interface PhotoRepository extends R2dbcRepository<PhotoEntity, String> {
     Flux<PhotoEntity> findAllByAlbumIdOrderByDisplayIndexDesc(String ownerAlbumId);
 
+    Flux<PhotoEntity> findAllByAlbumIdOrderByCreatedAtDesc(String ownerAlbumId);
+
+    Flux<PhotoEntity> findAllByAlbumIdOrderByCreatedAtAsc(String ownerAlbumId);
+
     @Modifying
     @Query("UPDATE photo SET display_index = display_index - 1 WHERE album_id = :albumId AND display_index > :startIndex")
     Mono<Void> popDisplayIndexGreaterThan(String albumId, int startIndex);

diff --git a/photo-service/src/main/java/kr/mafoo/photo/service/PhotoService.java b/photo-service/src/main/java/kr/mafoo/photo/service/PhotoService.java
@@ -70,7 +70,7 @@ public Flux<PhotoEntity> uploadPhoto(Flux<FilePart> files, String requestMemberI
                 ).sequential();
     }
 
-    public Flux<PhotoEntity> findAllByAlbumId(String albumId, String requestMemberId) {
+    public Flux<PhotoEntity> findAllByAlbumId(String albumId, String requestMemberId, String sort) {
         return albumRepository
                 .findById(albumId)
                 .switchIfEmpty(Mono.error(new AlbumNotFoundException()))
@@ -79,7 +79,13 @@ public Flux<PhotoEntity> findAllByAlbumId(String albumId, String requestMemberId
                         // 내 앨범이 아니면 그냥 없는 앨범 처리
                         return Mono.error(new AlbumNotFoundException());
                     } else {
-                        return photoRepository.findAllByAlbumIdOrderByDisplayIndexDesc(albumId);
+                        String sortMethod = (sort == null) ? "CUSTOM" : sort.toUpperCase();
+
+                        return switch (sortMethod) {
+                            case "ASC" -> photoRepository.findAllByAlbumIdOrderByCreatedAtAsc(albumId);
+                            case "DESC" -> photoRepository.findAllByAlbumIdOrderByCreatedAtDesc(albumId);
+                            default -> photoRepository.findAllByAlbumIdOrderByDisplayIndexDesc(albumId);
+                        };
                     }
                 });
     }