Skip to content

[FIX] 프론트 요청 수정 #147

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
sweatbuckets merged 1 commit into from
Jan 25, 2026
Merged

[FIX] 프론트 요청 수정 #147

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
3 changes: 3 additions & 0 deletions src/main/java/cc/backend/photoAlbum/dto/PerformerShowListResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ public class PerformerShowListResponseDTO {
@Schema(description = "총 등록된 공연 수", example = "4")
private long totalCount;

@Schema(description = "공연진 이름")
private String performerName;

@Schema(description = "공연 카드 목록")
private List<ShowList> shows;

Expand Down
6 changes: 5 additions & 1 deletion src/main/java/cc/backend/photoAlbum/dto/PhotoAlbumResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public class PhotoAlbumResponseDTO {
public static class PhotoAlbumResultDTO {
private String performerName;
private Long photoAlbumId;
private Long amateurShowId;
private String amateurShowName;
private String schedule;
private String detailAddress;
Expand All @@ -30,8 +31,9 @@ public static class PhotoAlbumResultDTO {
@NoArgsConstructor
@AllArgsConstructor
public static class PhotoAlbumResultWithPresignedUrlDTO {
private String performerName;
private Long photoAlbumId;
private String performerName;
private Long amateurShowId;
private String amateurShowName;
private String schedule;
private String detailAddress;
Expand All @@ -45,6 +47,7 @@ public static class PhotoAlbumResultWithPresignedUrlDTO {
@AllArgsConstructor
public static class SinglePhotoAlbumDTO {
private Long photoAlbumId;
private Long amateurShowId;
private String amateurShowName;
private String performerName;
private String detailAddress;
Expand All @@ -59,6 +62,7 @@ public static class SinglePhotoAlbumDTO {
public static class MemberPhotoAlbumDTO {
private Long photoAlbumId;
private Long memberId;
private Long amateurShowId;
private String performerName;
private String amateurShowName;
private String imageUrl;
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/cc/backend/photoAlbum/service/PhotoAlbumServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ public PhotoAlbumResponseDTO.PhotoAlbumResultWithPresignedUrlDTO createPhotoAlbu
String schedule = mergeSchedule(start, end);

return PhotoAlbumResponseDTO.PhotoAlbumResultWithPresignedUrlDTO.builder()
.amateurShowId(amateurShow.getId())
.performerName(amateurShow.getPerformerName())
.photoAlbumId(newPhotoAlbum.getId())
.amateurShowName(newPhotoAlbum.getAmateurShow().getName())
Expand Down Expand Up @@ -106,6 +107,7 @@ public PhotoAlbumResponseDTO.PhotoAlbumResultWithPresignedUrlDTO getPhotoAlbum(L

return PhotoAlbumResponseDTO.PhotoAlbumResultWithPresignedUrlDTO.builder()
.photoAlbumId(photoAlbum.getId())
.amateurShowId(photoAlbum.getAmateurShow().getId())
.amateurShowName(photoAlbum.getAmateurShow().getName())
.performerName(photoAlbum.getAmateurShow().getPerformerName())
.content(photoAlbum.getContent())
Expand Down Expand Up @@ -145,6 +147,7 @@ public Slice<PhotoAlbumResponseDTO.SinglePhotoAlbumDTO> getPhotoAlbumList(Long m
// DTO 변환
List<PhotoAlbumResponseDTO.SinglePhotoAlbumDTO> content = albums.stream()
.map(album -> PhotoAlbumResponseDTO.SinglePhotoAlbumDTO.builder()
.amateurShowId(album.getAmateurShow().getId())
.photoAlbumId(album.getId())
.amateurShowName(album.getAmateurShow().getName())
.performerName(performer.getName())
Expand Down Expand Up @@ -231,6 +234,7 @@ public PhotoAlbumResponseDTO.PhotoAlbumResultDTO updatePhotoAlbum(Long photoAlbu

return PhotoAlbumResponseDTO.PhotoAlbumResultDTO.builder()
.photoAlbumId(updatedPhotoAlbum.getId())
.amateurShowId(updatedPhotoAlbum.getAmateurShow().getId())
.amateurShowName(updatedPhotoAlbum.getAmateurShow().getName())
.performerName(updatedPhotoAlbum.getAmateurShow().getPerformerName())
.content(updatedPhotoAlbum.getContent())
Expand Down Expand Up @@ -292,6 +296,7 @@ public PhotoAlbumResponseDTO.ScrollMemberPhotoAlbumDTO getAllRecentPhotoAlbumLis
.map(album -> PhotoAlbumResponseDTO.MemberPhotoAlbumDTO.builder()
.photoAlbumId(album.getId())
.memberId(album.getAmateurShow().getMember().getId())
.amateurShowId(album.getAmateurShow().getId())
.performerName(album.getAmateurShow().getMember().getName())
.amateurShowName(album.getAmateurShow().getName())
.imageUrl(firstImageMap.get(album.getId()))
Expand All @@ -315,6 +320,9 @@ public PhotoAlbumResponseDTO.ScrollMemberPhotoAlbumDTO getAllRecentPhotoAlbumLis
@Override
public PerformerShowListResponseDTO getPerformerShows(Long memberId, Pageable pageable) {

Member performer = memberRepository.findById(memberId)
.orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_PERFORMER));

Slice<AmateurShow> slice = amateurShowRepository.findByMember_IdOrderByIdDesc(memberId, pageable); //Page 방식 - 이름 수정 필요
long total = amateurShowRepository.countByMember_Id(memberId); // 총 개수

Expand All @@ -324,8 +332,10 @@ public PerformerShowListResponseDTO getPerformerShows(Long memberId, Pageable pa
return PerformerShowListResponseDTO.builder()
.totalCount(total)
.shows(showLists)
.performerName(performer.getName())
.build();
}

private Map<Long, String> getFirstImageMapForPhotoAlbums(List<Long> albumIds) {
if (albumIds == null || albumIds.isEmpty()) {
return Collections.emptyMap();
Expand Down