From 350d8eae628e31014dbfa980635752c9a068ea4c Mon Sep 17 00:00:00 2001 From: yhi9839 Date: Thu, 20 Feb 2025 18:31:14 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=ED=8B=B0=EC=BC=93=20=EC=B7=A8=EC=86=8C=20=EC=9D=BC?= =?UTF-8?q?=EC=9E=90=20=EC=B6=94=EA=B0=80,=20=EC=86=8C=EA=B7=B9=EC=9E=A5?= =?UTF-8?q?=20=EB=8B=A8=EA=B1=B4=20=EC=A1=B0=ED=9A=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/converter/AmateurConverter.java | 27 +++++++++++++++---- .../amateurDTO/AmateurShowResponseDTO.java | 14 +++++----- .../dto/ticketDTO/TicketResponseDTO.java | 1 + .../MemberTicketServiceImpl.java | 2 ++ 4 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/main/java/muit/backend/converter/AmateurConverter.java b/src/main/java/muit/backend/converter/AmateurConverter.java index 76695bc..3fa1d47 100644 --- a/src/main/java/muit/backend/converter/AmateurConverter.java +++ b/src/main/java/muit/backend/converter/AmateurConverter.java @@ -10,6 +10,7 @@ import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -114,7 +115,6 @@ public static AmateurShowResponseDTO toResponseDTO(AmateurShow show) { return AmateurShowResponseDTO.builder() .id(show.getId()) .name(show.getName()) - .posterImgUrl(show.getPosterImgUrl()) .place(show.getPlace()) .schedule(show.getSchedule()) .age(show.getAge()) @@ -128,18 +128,35 @@ public static AmateurShowResponseDTO toResponseDTO(AmateurShow show) { .runtime(show.getRuntime()) .amateurStatus(show.getAmateurStatus().toString()) .castings(toCastingDTO(show.getAmateurCastingList())) - .notice(toNoticeDTO(show.getAmateurNotice())) + .noticeContent(show.getAmateurNotice().getContent()) .tickets(toTicketDTO(show.getAmateurTicketList())) .staff(toStaffDTO(show.getAmateurStaffList())) - .summaries(toSummaryDTO(show.getAmateurSummary())) + .summaryContent(show.getAmateurSummary().getContent()) + .posterImage(show.getPosterImgUrl()) + .castingImages(extractCastingImages(show.getAmateurCastingList())) + .noticeImages(extractNoticeImages(show.getAmateurNotice())) .build(); } + private static List extractCastingImages(List castingList) { + if (castingList == null) return Collections.emptyList(); + return castingList.stream() + .map(AmateurCasting::getImageUrl) // 이미지 URL 필드가 있다고 가정 + .filter(Objects::nonNull) + .collect(Collectors.toList()); + } + + private static List extractNoticeImages(AmateurNotice notice) { + if (notice == null || notice.getNoticeImageUrls() == null) return Collections.emptyList(); + return notice.getNoticeImageUrls(); + } + + private static List toCastingDTO(List castings) { if (castings == null) return null; return castings.stream() .map(casting -> new AmateurShowResponseDTO.AmateurCastingDTO( - casting.getImageUrl(), + //casting.getImageUrl(), casting.getActorName(), casting.getCastingName() )) @@ -159,7 +176,7 @@ private static List toTicketDTO(List new AmateurShowResponseDTO.AmateurTicketDTO( ticket.getTicketName(), - ticket.getTicketType().toString(), + // ticket.getTicketType().toString(), String.valueOf(ticket.getPrice()) )) .collect(Collectors.toList()); diff --git a/src/main/java/muit/backend/dto/amateurDTO/AmateurShowResponseDTO.java b/src/main/java/muit/backend/dto/amateurDTO/AmateurShowResponseDTO.java index 1939b6e..5a7e968 100644 --- a/src/main/java/muit/backend/dto/amateurDTO/AmateurShowResponseDTO.java +++ b/src/main/java/muit/backend/dto/amateurDTO/AmateurShowResponseDTO.java @@ -13,13 +13,12 @@ public class AmateurShowResponseDTO { private Long id; private String name; - private String posterImgUrl; private String place; private String schedule; private String age; private String starring; private int totalTicket; - private int soldTicket; + // private int soldTicket; private String timeInfo; private String account; private String contact; @@ -28,17 +27,20 @@ public class AmateurShowResponseDTO { private String amateurStatus; private List castings; - private AmateurNoticeDTO notice; + private String noticeContent; private List tickets; private List staff; - private AmateurSummaryDTO summaries; + private String summaryContent; + private String posterImage; + private List castingImages; + private List noticeImages; @Builder @AllArgsConstructor @NoArgsConstructor @Getter public static class AmateurCastingDTO { - private String imgUrl; + //private String imgUrl; // 이미지 따로 뺌 private String actorName; private String castingName; } @@ -58,7 +60,7 @@ public static class AmateurNoticeDTO { @Getter public static class AmateurTicketDTO { private String ticketName; - private String ticketType; + // private String ticketType; // 티켓 타입 없음 private String price; } diff --git a/src/main/java/muit/backend/dto/ticketDTO/TicketResponseDTO.java b/src/main/java/muit/backend/dto/ticketDTO/TicketResponseDTO.java index 39421f9..a7052f5 100644 --- a/src/main/java/muit/backend/dto/ticketDTO/TicketResponseDTO.java +++ b/src/main/java/muit/backend/dto/ticketDTO/TicketResponseDTO.java @@ -80,6 +80,7 @@ public static class MyPageTicketDTO { private ReservationStatus reservationStatus; private LocalDateTime reservationDate; private String place; + private String cancelDate; private String schedule; } diff --git a/src/main/java/muit/backend/service/ticketService/MemberTicketServiceImpl.java b/src/main/java/muit/backend/service/ticketService/MemberTicketServiceImpl.java index bc8647b..12f4107 100644 --- a/src/main/java/muit/backend/service/ticketService/MemberTicketServiceImpl.java +++ b/src/main/java/muit/backend/service/ticketService/MemberTicketServiceImpl.java @@ -168,6 +168,7 @@ public TicketResponseDTO.MyPageTicketDTO getMyTicket(Member member,Long memberTi .place(amateurShow.getPlace()) .schedule(amateurShow.getSchedule()) .reservationStatus(memberTicket.getReservationStatus()) + .cancelDate(amateurShow.getSchedule()) .build(); } @@ -190,6 +191,7 @@ public TicketResponseDTO.MyPageTicketListDTO getMyTicketList(Member member, Rese .schedule(ticket.getAmateurTicket().getAmateurShow().getSchedule()) .place(ticket.getAmateurTicket().getAmateurShow().getPlace()) .quantity(ticket.getQuantity()) + .cancelDate(ticket.getAmateurTicket().getAmateurShow().getSchedule()) .reservationStatus(ticket.getReservationStatus()) .build()) .collect(Collectors.toList());