Skip to content

[CEEZ-73] fix: 앨범 사진 조회 오류 해결 #123

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
zyovn merged 1 commit into from
Feb 2, 2026
Merged

[CEEZ-73] fix: 앨범 사진 조회 오류 해결 #123

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
1 change: 0 additions & 1 deletion src/main/java/com/cheeeese/photo/application/PhotoInfoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ public class PhotoInfoService {

public PhotoLikedUserResponse getPhotoLikedUsers(User user, String code, Long photoId) {
Album album = albumValidator.validateAlbumCode(code);

albumValidator.validateAlbumParticipant(album, user);

Photo photo = photoReader.getPhotoInAlbum(photoId, code);
Expand Down
15 changes: 12 additions & 3 deletions src/main/java/com/cheeeese/photo/application/PhotoQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.cheeeese.photo.application;

import com.cheeeese.album.application.validator.AlbumValidator;
import com.cheeeese.album.domain.Album;
import com.cheeeese.album.domain.type.AlbumSorting;
import com.cheeeese.album.infrastructure.persistence.AlbumRepository;
import com.cheeeese.global.util.ProfileImageUtil;
Expand All @@ -9,8 +11,6 @@
import com.cheeeese.photo.domain.Photo;
import com.cheeeese.photo.domain.PhotoStatus;
import com.cheeeese.photo.dto.response.*;
import com.cheeeese.photo.exception.PhotoException;
import com.cheeeese.photo.exception.code.PhotoErrorCode;
import com.cheeeese.photo.infrastructure.mapper.PhotoMapper;
import com.cheeeese.photo.infrastructure.persistence.PhotoHistoryRepository;
import com.cheeeese.photo.infrastructure.persistence.PhotoLikesRepository;
Expand All @@ -37,6 +37,7 @@ public class PhotoQueryService {
private final PhotoRepository photoRepository;
private final PhotoLikesRepository photoLikesRepository;
private final PhotoHistoryRepository photoHistoryRepository;
private final AlbumValidator albumValidator;
private final PhotoReader photoReader;
private final RedisCacheUtil redisCacheUtil;
private final CdnUrlResolver cdnUrlResolver;
Expand All @@ -45,6 +46,9 @@ public class PhotoQueryService {
private static final String VERSION_KEY = "cache:album:%s:version";

public PhotoPageResponse getPhotoPage(User user, String code, int page, int size, AlbumSorting albumSorting) {
Album album = albumValidator.validateAlbumCode(code);
albumValidator.validateAlbumParticipant(album, user);

String versionKey = String.format(VERSION_KEY, code);
Long curVersion = Optional.ofNullable(redisCacheUtil.getValue(versionKey)).orElse(0L);

Expand Down Expand Up @@ -72,8 +76,10 @@ public void invalidatePhotoCache(String code) { // TODO: 사진 삭제, 업로
redisCacheUtil.deletePattern("album:" + code + ":photos:*");
}

// TODO: 데이터 조회 로직을 Reader 클래스로 분리하는 것 고려
public PhotoLikedPageResponse getPhotoLiked(User user, String code, int page, int size) {
Album album = albumValidator.validateAlbumCode(code);
albumValidator.validateAlbumParticipant(album, user);

PageRequest pageRequest = PageRequest.of(page, size);
Slice<Photo> photos = photoRepository.findLikedPhotosByAlbumAndUser(code, user.getId(), PhotoStatus.COMPLETED, pageRequest);

Expand All @@ -95,6 +101,9 @@ public PhotoLikedPageResponse getPhotoLiked(User user, String code, int page, in
}

public PhotoDetailResponse getPhotoDetail(User user, String code, Long photoId) {
Album album = albumValidator.validateAlbumCode(code);
albumValidator.validateAlbumParticipant(album, user);

Photo photo = photoReader.getPhotoInAlbum(photoId, code);

String profileImage = ProfileImageUtil.resolveProfileImage(photo.getUser(), cdnUrlResolver);
Expand Down