Merge pull request #180 from lemonssoju/develop-v2

[develop-v2] main merge

Author: JoongHyun-Kim

src/main/java/com/lesso/neverland/album/application/AlbumService.java

@@ -14,9 +14,11 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.Comparator;
 import java.util.List;
 
 import static com.lesso.neverland.common.base.BaseResponseStatus.*;
+import static com.lesso.neverland.common.constants.Constants.ACTIVE;
 
 @Service
 @RequiredArgsConstructor
@@ -65,10 +67,14 @@ public BaseResponse<AlbumDetailResponse> getAlbumDetail(Long groupIdx, Long albu
     // 앨범 목록 조회(sortType="time", "location")
     public BaseResponse<?> getAlbumList(Long groupIdx, String sortType) {
         Team group = groupRepository.findById(groupIdx).orElseThrow(() -> new BaseException(INVALID_GROUP_IDX));
-        List<Album> albumList = albumRepository.findByTeamOrderByCreatedDateDesc(group);
+
+        List<Album> albumList = albumRepository.findByTeamAndStatusEquals(group, ACTIVE);
+        List<Album> sortedAlbums = albumList.stream()
+                .sorted(Comparator.comparing(album -> album.getPuzzle().getPuzzleDate(), Comparator.reverseOrder()))
+                .toList();
 
         if (sortType.equals("time")) {
-            List<AlbumByTimeDto> albumDtoList = albumList.stream().map(AlbumByTimeDto::from).toList();
+            List<AlbumByTimeDto> albumDtoList = sortedAlbums.stream().map(AlbumByTimeDto::from).toList();
             return new BaseResponse<>(new AlbumListByTimeResponse(albumDtoList));
         } else {
             List<AlbumByLocationDto> albumDtoList = albumList.stream().map(AlbumByLocationDto::from).toList();

src/main/java/com/lesso/neverland/album/repository/AlbumRepository.java

@@ -8,6 +8,6 @@
 import java.util.List;
 
 public interface AlbumRepository extends JpaRepository<Album, Long> {
-    List<Album> findByTeamOrderByCreatedDateDesc(Team team);
+    List<Album> findByTeamAndStatusEquals(Team team, String status);
     boolean existsByPuzzle(Puzzle puzzle);
 }