Skip to content

feat: 앨범 아이템 전체 조회로 수정 #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kih1015 merged 1 commit into from
Nov 23, 2025
Merged

feat: 앨범 아이템 전체 조회로 수정 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/main/java/kr/kro/photoliner/domain/album/controller/AlbumController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,9 @@ public ResponseEntity<Void> deletePhoto(

@GetMapping("/{albumId}/photos")
public ResponseEntity<AlbumPhotoItemsResponse> getAlbumItems(
@PathVariable Long albumId,
@PageableDefault Pageable pageable
@PathVariable Long albumId
) {
return ResponseEntity.ok(albumService.getAlbumPhotoItems(albumId, pageable));
return ResponseEntity.ok(albumService.getAlbumPhotoItems(albumId));
}

@PostMapping("/{albumId}/photos")
Expand Down
13 changes: 8 additions & 5 deletions src/main/java/kr/kro/photoliner/domain/album/dto/response/AlbumPhotoItemsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
import java.time.LocalDateTime;
import java.util.List;
import kr.kro.photoliner.domain.album.dto.AlbumPhotoItem;
import org.springframework.data.domain.Page;

public record AlbumPhotoItemsResponse(
List<InnerAlbumPhotoItem> items
) {

public static AlbumPhotoItemsResponse from(Page<AlbumPhotoItem> albumPhotoViews) {
public static AlbumPhotoItemsResponse from(List<AlbumPhotoItem> albumPhotoItems) {
return new AlbumPhotoItemsResponse(
albumPhotoViews.stream()
albumPhotoItems.stream()
.map(InnerAlbumPhotoItem::from)
.toList()
);
Expand All @@ -23,7 +22,9 @@ public record InnerAlbumPhotoItem(
String fileName,
String filePath,
String thumbnailPath,
LocalDateTime capturedDt
LocalDateTime capturedDt,
Double latitude,
Double longitude
) {

public static InnerAlbumPhotoItem from(AlbumPhotoItem albumPhotoItem) {
Expand All @@ -33,7 +34,9 @@ public static InnerAlbumPhotoItem from(AlbumPhotoItem albumPhotoItem) {
albumPhotoItem.fileName(),
albumPhotoItem.filePath(),
albumPhotoItem.thumbnailPath(),
albumPhotoItem.capturedDt()
albumPhotoItem.capturedDt(),
albumPhotoItem.getLatitude(),
albumPhotoItem.getLongitude()
);
}
}
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/kr/kro/photoliner/domain/album/repository/AlbumPhotoRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import kr.kro.photoliner.domain.album.dto.AlbumPhotoItems;
import kr.kro.photoliner.domain.album.model.PhotoItem;
import org.locationtech.jts.geom.Point;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;

Expand All @@ -25,7 +23,7 @@ public interface AlbumPhotoRepository extends JpaRepository<PhotoItem, Long> {
inner join Photo p on p.id = pi.photoId
where pi.album.id = :albumId
""")
Page<AlbumPhotoItem> findByAlbumId(Long albumId, Pageable pageable);
List<AlbumPhotoItem> findByAlbumId(Long albumId);

@Query("""
select new kr.kro.photoliner.domain.album.dto.AlbumPhotoItem(
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/kr/kro/photoliner/domain/album/service/AlbumService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package kr.kro.photoliner.domain.album.service;

import java.util.List;
import kr.kro.photoliner.domain.album.dto.AlbumPhotoItem;
import kr.kro.photoliner.domain.album.dto.AlbumPhotoItems;
import kr.kro.photoliner.domain.album.dto.request.AlbumCreateRequest;
Expand Down Expand Up @@ -55,8 +56,8 @@ public AlbumsResponse getAlbums(Long userId, Pageable pageable) {
}

@Transactional(readOnly = true)
public AlbumPhotoItemsResponse getAlbumPhotoItems(Long albumId, Pageable pageable) {
Page<AlbumPhotoItem> albumPhotoItems = albumPhotoRepository.findByAlbumId(albumId, pageable);
public AlbumPhotoItemsResponse getAlbumPhotoItems(Long albumId) {
List<AlbumPhotoItem> albumPhotoItems = albumPhotoRepository.findByAlbumId(albumId);
return AlbumPhotoItemsResponse.from(albumPhotoItems);
}

Expand Down
Loading