refactor : 좌석별 가격정보, 티켓팅 정보 클래스명 수정

YAPP-Github · Jul 16, 2024 · d282fc1 · d282fc1
1 parent 2c26ec9
commit d282fc1
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 65 deletions.
diff --git a/...api/show-api/src/main/java/com/example/show/controller/dto/request/ShowCreateApiForm.java b/...api/show-api/src/main/java/com/example/show/controller/dto/request/ShowCreateApiForm.java
@@ -1,7 +1,7 @@
 package com.example.show.controller.dto.request;
 
-import com.example.show.controller.vo.SeatPriceApiType;
-import com.example.show.controller.vo.TicketingApiType;
+import com.example.show.controller.dto.response.SeatInfoApiResponse;
+import com.example.show.controller.dto.response.TicketingInfoApiResponse;
 import com.example.show.service.dto.request.ShowCreateServiceRequest;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -60,25 +60,25 @@ public ShowCreateServiceRequest toServiceRequest() {
             .date(date)
             .location(location)
             .post(post)
-            .seatPriceApiType(getSeatPriceApiType())
-            .ticketingApiType(getTicketingApiType())
+            .seatInfoApiResponse(getSeatPriceApiType())
+            .ticketingInfoApiResponse(getTicketingApiType())
             .artistIds(artistIds)
             .genreIds(genreIds)
             .build();
     }
 
-    private SeatPriceApiType getSeatPriceApiType() {
+    private SeatInfoApiResponse getSeatPriceApiType() {
         Map<String, Integer> priceInformation = IntStream.range(0, seatTypes.size())
             .boxed()
             .collect(Collectors.toMap(seatTypes::get, pricesPerSeatType::get));
-        return new SeatPriceApiType(priceInformation);
+        return new SeatInfoApiResponse(priceInformation);
     }
 
-    private TicketingApiType getTicketingApiType() {
+    private TicketingInfoApiResponse getTicketingApiType() {
         Map<String, String> ticketingInformation = IntStream.range(0, ticketBookingSites.size())
             .boxed()
             .collect(Collectors.toMap(ticketBookingSites::get, ticketingSiteUrls::get));
-        return new TicketingApiType(ticketOpenTime, ticketingInformation);
+        return new TicketingInfoApiResponse(ticketOpenTime, ticketingInformation);
     }
 
 }
diff --git a/...api/show-api/src/main/java/com/example/show/controller/dto/request/ShowUpdateApiForm.java b/...api/show-api/src/main/java/com/example/show/controller/dto/request/ShowUpdateApiForm.java
@@ -1,7 +1,7 @@
 package com.example.show.controller.dto.request;
 
-import com.example.show.controller.vo.SeatPriceApiType;
-import com.example.show.controller.vo.TicketingApiType;
+import com.example.show.controller.dto.response.SeatInfoApiResponse;
+import com.example.show.controller.dto.response.TicketingInfoApiResponse;
 import com.example.show.service.dto.request.ShowUpdateServiceRequest;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -60,25 +60,25 @@ public ShowUpdateServiceRequest toServiceRequest() {
             .date(date)
             .location(location)
             .post(post)
-            .seatPriceApiType(getSeatPriceApiType())
-            .ticketingApiType(getTicketingApiType())
+            .seatInfoApiResponse(getSeatPriceApiType())
+            .ticketingInfoApiResponse(getTicketingApiType())
             .artistIds(artistIds)
             .genreIds(genreIds)
             .build();
     }
 
-    private SeatPriceApiType getSeatPriceApiType() {
+    private SeatInfoApiResponse getSeatPriceApiType() {
         Map<String, Integer> priceInformation = IntStream.range(0, seatTypes.size())
             .boxed()
             .collect(Collectors.toMap(seatTypes::get, pricesPerSeatType::get));
-        return new SeatPriceApiType(priceInformation);
+        return new SeatInfoApiResponse(priceInformation);
     }
 
-    private TicketingApiType getTicketingApiType() {
+    private TicketingInfoApiResponse getTicketingApiType() {
         Map<String, String> ticketingInformation = IntStream.range(0, ticketBookingSites.size())
             .boxed()
             .collect(Collectors.toMap(ticketBookingSites::get, ticketingSiteUrls::get));
-        return new TicketingApiType(ticketOpenTime, ticketingInformation);
+        return new TicketingInfoApiResponse(ticketOpenTime, ticketingInformation);
     }
 
 }
diff --git a/.../show-api/src/main/java/com/example/show/controller/dto/response/SeatInfoApiResponse.java b/.../show-api/src/main/java/com/example/show/controller/dto/response/SeatInfoApiResponse.java
@@ -0,0 +1,15 @@
+package com.example.show.controller.dto.response;
+
+import java.util.Map;
+import org.example.entity.show.info.SeatPrice;
+
+public record SeatInfoApiResponse(
+    Map<String, Integer> priceInformation
+) {
+
+    public static SeatInfoApiResponse from(SeatPrice seatPrice) {
+        return new SeatInfoApiResponse(seatPrice.getPriceInformation());
+    }
+
+
+}
diff --git a/.../show-api/src/main/java/com/example/show/controller/dto/response/ShowInfoApiResponse.java b/.../show-api/src/main/java/com/example/show/controller/dto/response/ShowInfoApiResponse.java
@@ -2,8 +2,6 @@
 
 import com.example.artist.service.dto.response.ArtistKoreanNameServiceResponse;
 import com.example.genre.service.dto.response.GenreNameServiceResponse;
-import com.example.show.controller.vo.SeatPriceApiType;
-import com.example.show.controller.vo.TicketingApiType;
 import com.example.show.service.dto.response.ShowInfoServiceResponse;
 import java.time.LocalDate;
 import java.util.List;
@@ -17,8 +15,8 @@ public record ShowInfoApiResponse(
     LocalDate date,
     String location,
     String image,
-    SeatPriceApiType seatPriceApiType,
-    TicketingApiType ticketingApiType,
+    SeatInfoApiResponse seatInfoApiResponse,
+    TicketingInfoApiResponse ticketingInfoApiResponse,
     List<ArtistKoreanNameServiceResponse> artistKoreanNameResponses,
     List<GenreNameServiceResponse> genreNameResponses
 
@@ -31,8 +29,8 @@ public ShowInfoApiResponse(ShowInfoServiceResponse showInfoServiceResponse) {
             showInfoServiceResponse.date(),
             showInfoServiceResponse.location(),
             showInfoServiceResponse.image(),
-            showInfoServiceResponse.seatPriceApiType(),
-            showInfoServiceResponse.ticketingApiType(),
+            showInfoServiceResponse.seatInfoApiResponse(),
+            showInfoServiceResponse.ticketingInfoApiResponse(),
             showInfoServiceResponse.artistKoreanNameResponses(),
             showInfoServiceResponse.genreNameResponses()
         );

diff --git a/.../show/controller/vo/TicketingApiType.java → ...to/response/TicketingInfoApiResponse.java b/.../show/controller/vo/TicketingApiType.java → ...to/response/TicketingInfoApiResponse.java
@@ -1,16 +1,16 @@
-package com.example.show.controller.vo;
+package com.example.show.controller.dto.response;
 
 import java.time.LocalDateTime;
 import java.util.Map;
 import org.example.entity.show.info.Ticketing;
 
-public record TicketingApiType(
+public record TicketingInfoApiResponse(
     LocalDateTime ticketOpenTime,
     Map<String, String> ticketingInformation
 ) {
 
-    public static TicketingApiType from(Ticketing ticketing) {
-        return new TicketingApiType(
+    public static TicketingInfoApiResponse from(Ticketing ticketing) {
+        return new TicketingInfoApiResponse(
             ticketing.getTicketOpenTime(),
             ticketing.getTicketingInformation()
         );

diff --git a/app/api/show-api/src/main/java/com/example/show/controller/vo/SeatPriceApiType.java b/app/api/show-api/src/main/java/com/example/show/controller/vo/SeatPriceApiType.java
diff --git a/...show-api/src/main/java/com/example/show/service/dto/request/ShowCreateServiceRequest.java b/...show-api/src/main/java/com/example/show/service/dto/request/ShowCreateServiceRequest.java
@@ -1,7 +1,7 @@
 package com.example.show.service.dto.request;
 
-import com.example.show.controller.vo.SeatPriceApiType;
-import com.example.show.controller.vo.TicketingApiType;
+import com.example.show.controller.dto.response.SeatInfoApiResponse;
+import com.example.show.controller.dto.response.TicketingInfoApiResponse;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.UUID;
@@ -19,8 +19,8 @@ public record ShowCreateServiceRequest(
     LocalDate date,
     String location,
     MultipartFile post,
-    SeatPriceApiType seatPriceApiType,
-    TicketingApiType ticketingApiType,
+    SeatInfoApiResponse seatInfoApiResponse,
+    TicketingInfoApiResponse ticketingInfoApiResponse,
     List<UUID> artistIds,
     List<UUID> genreIds
 ) {
@@ -39,15 +39,15 @@ public Show toShowWithImageUrl(String imageUrl) {
 
     private SeatPrice getSeatPrice() {
         SeatPrice seatPrice = new SeatPrice();
-        seatPriceApiType.priceInformation().forEach(seatPrice::savePriceInformation);
+        seatInfoApiResponse.priceInformation().forEach(seatPrice::savePriceInformation);
 
         return seatPrice;
     }
 
     private Ticketing getTicketing() {
         Ticketing ticketing = new Ticketing();
-        ticketing.saveTicketOpenTime(ticketingApiType.ticketOpenTime());
-        ticketingApiType.ticketingInformation().forEach(ticketing::saveTicketingInformation);
+        ticketing.saveTicketOpenTime(ticketingInfoApiResponse.ticketOpenTime());
+        ticketingInfoApiResponse.ticketingInformation().forEach(ticketing::saveTicketingInformation);
 
         return ticketing;
     }

diff --git a/...show-api/src/main/java/com/example/show/service/dto/request/ShowUpdateServiceRequest.java b/...show-api/src/main/java/com/example/show/service/dto/request/ShowUpdateServiceRequest.java
@@ -1,7 +1,7 @@
 package com.example.show.service.dto.request;
 
-import com.example.show.controller.vo.SeatPriceApiType;
-import com.example.show.controller.vo.TicketingApiType;
+import com.example.show.controller.dto.response.SeatInfoApiResponse;
+import com.example.show.controller.dto.response.TicketingInfoApiResponse;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.UUID;
@@ -19,8 +19,8 @@ public record ShowUpdateServiceRequest(
     LocalDate date,
     String location,
     MultipartFile post,
-    SeatPriceApiType seatPriceApiType,
-    TicketingApiType ticketingApiType,
+    SeatInfoApiResponse seatInfoApiResponse,
+    TicketingInfoApiResponse ticketingInfoApiResponse,
     List<UUID> artistIds,
     List<UUID> genreIds
 ) {
@@ -39,15 +39,15 @@ public Show toShowWithImageUrl(String imageUrl) {
 
     private SeatPrice getSeatPrice() {
         SeatPrice seatPrice = new SeatPrice();
-        seatPriceApiType.priceInformation().forEach(seatPrice::savePriceInformation);
+        seatInfoApiResponse.priceInformation().forEach(seatPrice::savePriceInformation);
 
         return seatPrice;
     }
 
     private Ticketing getTicketing() {
         Ticketing ticketing = new Ticketing();
-        ticketing.saveTicketOpenTime(ticketingApiType.ticketOpenTime());
-        ticketingApiType.ticketingInformation().forEach(ticketing::saveTicketingInformation);
+        ticketing.saveTicketOpenTime(ticketingInfoApiResponse.ticketOpenTime());
+        ticketingInfoApiResponse.ticketingInformation().forEach(ticketing::saveTicketingInformation);
 
         return ticketing;
     }

diff --git a/...show-api/src/main/java/com/example/show/service/dto/response/ShowInfoServiceResponse.java b/...show-api/src/main/java/com/example/show/service/dto/response/ShowInfoServiceResponse.java
@@ -2,8 +2,8 @@
 
 import com.example.artist.service.dto.response.ArtistKoreanNameServiceResponse;
 import com.example.genre.service.dto.response.GenreNameServiceResponse;
-import com.example.show.controller.vo.SeatPriceApiType;
-import com.example.show.controller.vo.TicketingApiType;
+import com.example.show.controller.dto.response.SeatInfoApiResponse;
+import com.example.show.controller.dto.response.TicketingInfoApiResponse;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Set;
@@ -19,8 +19,8 @@ public record ShowInfoServiceResponse(
     LocalDate date,
     String location,
     String image,
-    SeatPriceApiType seatPriceApiType,
-    TicketingApiType ticketingApiType,
+    SeatInfoApiResponse seatInfoApiResponse,
+    TicketingInfoApiResponse ticketingInfoApiResponse,
     List<ArtistKoreanNameServiceResponse> artistKoreanNameResponses,
     List<GenreNameServiceResponse> genreNameResponses
 ) {
@@ -33,8 +33,8 @@ public ShowInfoServiceResponse(ShowInfoResponse showInfoResponse) {
             showInfoResponse.date(),
             showInfoResponse.location(),
             showInfoResponse.image(),
-            SeatPriceApiType.from(showInfoResponse.seatPrice()),
-            TicketingApiType.from(showInfoResponse.ticketing()),
+            SeatInfoApiResponse.from(showInfoResponse.seatPrice()),
+            TicketingInfoApiResponse.from(showInfoResponse.ticketing()),
             toArtistKoreanNameServiceResponses(showInfoResponse.artistKoreanNameResponses()),
             toGenreNameServiceResponses(showInfoResponse.genreNameResponses())
         );

diff --git a/app/api/user-api/src/main/resources/templates/show_form.html b/app/api/user-api/src/main/resources/templates/show_form.html
@@ -12,7 +12,7 @@ <h2 class="text-center">공연 수정</h2>
     <!-- 티켓 오픈일 입력 -->
     <div class="form-group mb-3">
       <label style="font-weight: bold;">티켓 오픈일</label>
-      <input type="datetime-local" name="ticketOpenTime" th:value="${shows.ticketingApiType.ticketOpenTime()}" required style="width: 100%; padding: 10px; border: 1px solid #ccc; border-radius: 4px; box-sizing: border-box;">
+      <input type="datetime-local" name="ticketOpenTime" th:value="${shows.ticketingInfoApiResponse.ticketOpenTime()}" required style="width: 100%; padding: 10px; border: 1px solid #ccc; border-radius: 4px; box-sizing: border-box;">
     </div>
 
     <!-- 장소 입력 -->

diff --git a/app/api/user-api/src/main/resources/templates/show_list_form.html b/app/api/user-api/src/main/resources/templates/show_list_form.html
@@ -27,10 +27,10 @@ <h2 class="text-center">공연 목록</h2>
         <td>
           <img th:src="@{${show.image}}" alt="공연 이미지" width="100">
         </td>
-        <td th:text="${show.seatPriceApiType.priceInformation()}">좌석 가격 타입</td>
+        <td th:text="${show.seatInfoApiResponse.priceInformation()}">좌석 가격 타입</td>
         <td>
-          티켓팅 오픈 시간: <span class="ticket-open-time" th:text="${show.ticketingApiType.ticketOpenTime()}">티켓팅 오픈 시간</span><br>
-          티켓팅 사이트: <span th:text="${show.ticketingApiType.ticketingInformation()}">티켓팅 사이트</span>
+          티켓팅 오픈 시간: <span class="ticket-open-time" th:text="${show.ticketingInfoApiResponse.ticketOpenTime()}">티켓팅 오픈 시간</span><br>
+          티켓팅 사이트: <span th:text="${show.ticketingInfoApiResponse.ticketingInformation()}">티켓팅 사이트</span>
         </td>
         <td>
           <ul>