Skip to content

Commit 6acf8dc

Browse files
committed
Fix: ticket price 정규식 수정
1 parent ab8e6ec commit 6acf8dc

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

src/main/java/com/ticketaka/performance/controller/ReservationController.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ public ResponseEntity<BaseResponse> checkReservation(
3333
@RequestHeader Map<String, String> header,
3434
@RequestBody WaitingListRequest request) throws Exception {
3535

36-
for (Map.Entry entry : header.entrySet()) {
37-
log.info("key: " + entry.getKey());
38-
log.info("value: " + entry.getValue());
39-
}
40-
4136
reservationService.insertUserInWaitingList(header, request);
4237

4338
return ResponseEntity.ok(new BaseResponse(StatusCode.OK));

src/main/java/com/ticketaka/performance/dto/TicketPriceDTO.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import java.util.ArrayList;
88
import java.util.Arrays;
99
import java.util.List;
10+
import java.util.regex.Matcher;
11+
import java.util.regex.Pattern;
1012

1113
@Getter
1214
@AllArgsConstructor
@@ -22,11 +24,16 @@ public List<TicketPriceDTO> from(String prfTicketPrice) {
2224
String[] seats = prfTicketPrice.split(", ");
2325
List<TicketPriceDTO> ticketPriceDTOS = new ArrayList<>();
2426
Arrays.stream(seats).forEach(seat -> {
25-
String [] s = seat.split("\\s");
26-
if(s.length > 1) {
27-
ticketPriceDTOS.add(new TicketPriceDTO(s[0],Integer.parseInt(s[1].replaceAll("[^0-9]",""))));
27+
String pattern = "\\d+,\\d+원|\\d+원";
28+
Pattern p = Pattern.compile(pattern);
29+
Matcher m = p.matcher(seat);
30+
if (m.find()) {
31+
String tmp = m.group(1);
32+
String seatName = seat.replace(tmp, "").trim();
33+
int price = Integer.parseInt(tmp.replaceAll("[^0-9]",""));
34+
ticketPriceDTOS.add(new TicketPriceDTO(seatName,price));
2835
} else {
29-
ticketPriceDTOS.add(new TicketPriceDTO(s[0],0));
36+
ticketPriceDTOS.add(new TicketPriceDTO(seat,0));
3037
}
3138
});
3239

0 commit comments

Comments
 (0)