From 73a476d57c64a253cda980d5c1f117bb275ae586 Mon Sep 17 00:00:00 2001 From: xxeol2 Date: Fri, 8 Sep 2023 15:35:35 +0900 Subject: [PATCH 1/2] =?UTF-8?q?style:=20=EC=9D=91=EB=8B=B5=EC=9A=A9=20DTO?= =?UTF-8?q?=20=EC=BD=94=EB=93=9C=20=EC=BB=A8=EB=B2=A4=EC=85=98=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/festago/dto/EntryCodeResponse.java | 8 ++++++-- .../main/java/com/festago/dto/ErrorResponse.java | 4 +++- .../com/festago/dto/FestivalDetailResponse.java | 13 +++++++------ .../festago/dto/FestivalDetailStageResponse.java | 11 ++++++----- .../festago/dto/FestivalDetailTicketResponse.java | 9 +++++---- .../java/com/festago/dto/FestivalResponse.java | 7 ++++++- .../java/com/festago/dto/FestivalsResponse.java | 3 ++- .../festago/dto/MemberTicketFestivalResponse.java | 10 ++++++++-- .../com/festago/dto/MemberTicketResponse.java | 15 ++++++++------- .../com/festago/dto/MemberTicketsResponse.java | 3 ++- .../main/java/com/festago/dto/StageResponse.java | 4 +++- .../java/com/festago/dto/StageTicketResponse.java | 9 +++++---- .../com/festago/dto/StageTicketsResponse.java | 3 ++- .../com/festago/dto/TicketCreateResponse.java | 3 ++- .../com/festago/dto/TicketValidationResponse.java | 3 ++- .../java/com/festago/dto/TicketingResponse.java | 7 ++++--- 16 files changed, 71 insertions(+), 41 deletions(-) diff --git a/backend/src/main/java/com/festago/dto/EntryCodeResponse.java b/backend/src/main/java/com/festago/dto/EntryCodeResponse.java index c2a21517b..d6ff2d14f 100644 --- a/backend/src/main/java/com/festago/dto/EntryCodeResponse.java +++ b/backend/src/main/java/com/festago/dto/EntryCodeResponse.java @@ -2,9 +2,13 @@ import com.festago.domain.EntryCode; -public record EntryCodeResponse(String code, Long period) { +public record EntryCodeResponse( + String code, + Long period) { public static EntryCodeResponse of(EntryCode entryCode) { - return new EntryCodeResponse(entryCode.getCode(), entryCode.getPeriod()); + return new EntryCodeResponse( + entryCode.getCode(), + entryCode.getPeriod()); } } diff --git a/backend/src/main/java/com/festago/dto/ErrorResponse.java b/backend/src/main/java/com/festago/dto/ErrorResponse.java index 6d2e36e4f..b45ebff80 100644 --- a/backend/src/main/java/com/festago/dto/ErrorResponse.java +++ b/backend/src/main/java/com/festago/dto/ErrorResponse.java @@ -3,7 +3,9 @@ import com.festago.exception.ErrorCode; import com.festago.exception.FestaGoException; -public record ErrorResponse(ErrorCode errorCode, String message) { +public record ErrorResponse( + ErrorCode errorCode, + String message) { public static ErrorResponse from(FestaGoException festaGoException) { return ErrorResponse.from(festaGoException.getErrorCode()); diff --git a/backend/src/main/java/com/festago/dto/FestivalDetailResponse.java b/backend/src/main/java/com/festago/dto/FestivalDetailResponse.java index 7f283ac99..d9910e4f4 100644 --- a/backend/src/main/java/com/festago/dto/FestivalDetailResponse.java +++ b/backend/src/main/java/com/festago/dto/FestivalDetailResponse.java @@ -5,12 +5,13 @@ import java.time.LocalDate; import java.util.List; -public record FestivalDetailResponse(Long id, - String name, - LocalDate startDate, - LocalDate endDate, - String thumbnail, - List stages) { +public record FestivalDetailResponse( + Long id, + String name, + LocalDate startDate, + LocalDate endDate, + String thumbnail, + List stages) { public static FestivalDetailResponse of(Festival festival, List stages) { List stageResponses = stages.stream() diff --git a/backend/src/main/java/com/festago/dto/FestivalDetailStageResponse.java b/backend/src/main/java/com/festago/dto/FestivalDetailStageResponse.java index 04bf9a9ec..c25aeecbe 100644 --- a/backend/src/main/java/com/festago/dto/FestivalDetailStageResponse.java +++ b/backend/src/main/java/com/festago/dto/FestivalDetailStageResponse.java @@ -4,11 +4,12 @@ import java.time.LocalDateTime; import java.util.List; -public record FestivalDetailStageResponse(Long id, - LocalDateTime startTime, - LocalDateTime ticketOpenTime, - String lineUp, - List tickets) { +public record FestivalDetailStageResponse( + Long id, + LocalDateTime startTime, + LocalDateTime ticketOpenTime, + String lineUp, + List tickets) { public static FestivalDetailStageResponse from(Stage stage) { List tickets = stage.getTickets().stream() diff --git a/backend/src/main/java/com/festago/dto/FestivalDetailTicketResponse.java b/backend/src/main/java/com/festago/dto/FestivalDetailTicketResponse.java index f197d22f7..848ccc865 100644 --- a/backend/src/main/java/com/festago/dto/FestivalDetailTicketResponse.java +++ b/backend/src/main/java/com/festago/dto/FestivalDetailTicketResponse.java @@ -4,10 +4,11 @@ import com.festago.domain.TicketAmount; import com.festago.domain.TicketType; -public record FestivalDetailTicketResponse(Long id, - TicketType ticketType, - Integer totalAmount, - Integer remainAmount) { +public record FestivalDetailTicketResponse( + Long id, + TicketType ticketType, + Integer totalAmount, + Integer remainAmount) { public static FestivalDetailTicketResponse from(Ticket ticket) { TicketAmount ticketAmount = ticket.getTicketAmount(); diff --git a/backend/src/main/java/com/festago/dto/FestivalResponse.java b/backend/src/main/java/com/festago/dto/FestivalResponse.java index 5ff54e98e..17655e7b7 100644 --- a/backend/src/main/java/com/festago/dto/FestivalResponse.java +++ b/backend/src/main/java/com/festago/dto/FestivalResponse.java @@ -3,7 +3,12 @@ import com.festago.domain.Festival; import java.time.LocalDate; -public record FestivalResponse(Long id, String name, LocalDate startDate, LocalDate endDate, String thumbnail) { +public record FestivalResponse( + Long id, + String name, + LocalDate startDate, + LocalDate endDate, + String thumbnail) { public static FestivalResponse from(Festival festival) { return new FestivalResponse( diff --git a/backend/src/main/java/com/festago/dto/FestivalsResponse.java b/backend/src/main/java/com/festago/dto/FestivalsResponse.java index a6c556648..37ddd27bf 100644 --- a/backend/src/main/java/com/festago/dto/FestivalsResponse.java +++ b/backend/src/main/java/com/festago/dto/FestivalsResponse.java @@ -6,7 +6,8 @@ import com.festago.domain.Festival; import java.util.List; -public record FestivalsResponse(List festivals) { +public record FestivalsResponse( + List festivals) { public static FestivalsResponse from(List festivals) { return festivals.stream() diff --git a/backend/src/main/java/com/festago/dto/MemberTicketFestivalResponse.java b/backend/src/main/java/com/festago/dto/MemberTicketFestivalResponse.java index e4cdb01bc..45cdbf0b7 100644 --- a/backend/src/main/java/com/festago/dto/MemberTicketFestivalResponse.java +++ b/backend/src/main/java/com/festago/dto/MemberTicketFestivalResponse.java @@ -2,9 +2,15 @@ import com.festago.domain.Festival; -public record MemberTicketFestivalResponse(Long id, String name, String thumbnail) { +public record MemberTicketFestivalResponse( + Long id, + String name, + String thumbnail) { public static MemberTicketFestivalResponse from(Festival festival) { - return new MemberTicketFestivalResponse(festival.getId(), festival.getName(), festival.getThumbnail()); + return new MemberTicketFestivalResponse( + festival.getId(), + festival.getName(), + festival.getThumbnail()); } } diff --git a/backend/src/main/java/com/festago/dto/MemberTicketResponse.java b/backend/src/main/java/com/festago/dto/MemberTicketResponse.java index 4c6772dcd..f90a1004e 100644 --- a/backend/src/main/java/com/festago/dto/MemberTicketResponse.java +++ b/backend/src/main/java/com/festago/dto/MemberTicketResponse.java @@ -5,13 +5,14 @@ import com.festago.domain.Stage; import java.time.LocalDateTime; -public record MemberTicketResponse(Long id, - Integer number, - LocalDateTime entryTime, - EntryState state, - LocalDateTime reservedAt, - StageResponse stage, - MemberTicketFestivalResponse festival) { +public record MemberTicketResponse( + Long id, + Integer number, + LocalDateTime entryTime, + EntryState state, + LocalDateTime reservedAt, + StageResponse stage, + MemberTicketFestivalResponse festival) { private static final MemberTicketResponse EMPTY = new MemberTicketResponse(-1L, null, null, null, null, null, null); diff --git a/backend/src/main/java/com/festago/dto/MemberTicketsResponse.java b/backend/src/main/java/com/festago/dto/MemberTicketsResponse.java index fb3938c1b..90cd91f58 100644 --- a/backend/src/main/java/com/festago/dto/MemberTicketsResponse.java +++ b/backend/src/main/java/com/festago/dto/MemberTicketsResponse.java @@ -6,7 +6,8 @@ import com.festago.domain.MemberTicket; import java.util.List; -public record MemberTicketsResponse(List memberTickets) { +public record MemberTicketsResponse( + List memberTickets) { public static MemberTicketsResponse from(List memberTickets) { return memberTickets.stream() diff --git a/backend/src/main/java/com/festago/dto/StageResponse.java b/backend/src/main/java/com/festago/dto/StageResponse.java index f4a0bc876..a2d049e99 100644 --- a/backend/src/main/java/com/festago/dto/StageResponse.java +++ b/backend/src/main/java/com/festago/dto/StageResponse.java @@ -3,7 +3,9 @@ import com.festago.domain.Stage; import java.time.LocalDateTime; -public record StageResponse(Long id, LocalDateTime startTime) { +public record StageResponse( + Long id, + LocalDateTime startTime) { public static StageResponse from(Stage stage) { return new StageResponse(stage.getId(), stage.getStartTime()); diff --git a/backend/src/main/java/com/festago/dto/StageTicketResponse.java b/backend/src/main/java/com/festago/dto/StageTicketResponse.java index 51255b276..b525f9a08 100644 --- a/backend/src/main/java/com/festago/dto/StageTicketResponse.java +++ b/backend/src/main/java/com/festago/dto/StageTicketResponse.java @@ -4,10 +4,11 @@ import com.festago.domain.TicketAmount; import com.festago.domain.TicketType; -public record StageTicketResponse(Long id, - TicketType ticketType, - Integer totalAmount, - Integer remainAmount) { +public record StageTicketResponse( + Long id, + TicketType ticketType, + Integer totalAmount, + Integer remainAmount) { public static StageTicketResponse from(Ticket ticket) { TicketAmount ticketAmount = ticket.getTicketAmount(); diff --git a/backend/src/main/java/com/festago/dto/StageTicketsResponse.java b/backend/src/main/java/com/festago/dto/StageTicketsResponse.java index 19814922e..7a184ed02 100644 --- a/backend/src/main/java/com/festago/dto/StageTicketsResponse.java +++ b/backend/src/main/java/com/festago/dto/StageTicketsResponse.java @@ -6,7 +6,8 @@ import com.festago.domain.Ticket; import java.util.List; -public record StageTicketsResponse(List tickets) { +public record StageTicketsResponse( + List tickets) { public static StageTicketsResponse from(List tickets) { return tickets.stream() diff --git a/backend/src/main/java/com/festago/dto/TicketCreateResponse.java b/backend/src/main/java/com/festago/dto/TicketCreateResponse.java index ec4cfbc5d..fc06a4450 100644 --- a/backend/src/main/java/com/festago/dto/TicketCreateResponse.java +++ b/backend/src/main/java/com/festago/dto/TicketCreateResponse.java @@ -2,7 +2,8 @@ import com.festago.domain.Ticket; -public record TicketCreateResponse(Long id) { +public record TicketCreateResponse( + Long id) { public static TicketCreateResponse from(Ticket ticket) { return new TicketCreateResponse(ticket.getId()); diff --git a/backend/src/main/java/com/festago/dto/TicketValidationResponse.java b/backend/src/main/java/com/festago/dto/TicketValidationResponse.java index 7e5a5422c..5ce421d09 100644 --- a/backend/src/main/java/com/festago/dto/TicketValidationResponse.java +++ b/backend/src/main/java/com/festago/dto/TicketValidationResponse.java @@ -3,7 +3,8 @@ import com.festago.domain.EntryState; import com.festago.domain.MemberTicket; -public record TicketValidationResponse(EntryState updatedState) { +public record TicketValidationResponse( + EntryState updatedState) { public static TicketValidationResponse from(MemberTicket memberTicket) { return new TicketValidationResponse(memberTicket.getEntryState()); diff --git a/backend/src/main/java/com/festago/dto/TicketingResponse.java b/backend/src/main/java/com/festago/dto/TicketingResponse.java index d0e395c6e..0dd10b058 100644 --- a/backend/src/main/java/com/festago/dto/TicketingResponse.java +++ b/backend/src/main/java/com/festago/dto/TicketingResponse.java @@ -3,9 +3,10 @@ import com.festago.domain.MemberTicket; import java.time.LocalDateTime; -public record TicketingResponse(Long id, - Integer number, - LocalDateTime entryTime) { +public record TicketingResponse( + Long id, + Integer number, + LocalDateTime entryTime) { public static TicketingResponse from(MemberTicket memberTicket) { return new TicketingResponse( From 638fc7186ab95392a2db22f16e7a21c5afc09802 Mon Sep 17 00:00:00 2001 From: xxeol2 Date: Fri, 8 Sep 2023 15:35:43 +0900 Subject: [PATCH 2/2] =?UTF-8?q?style:=20=EC=9A=94=EC=B2=AD=20DTO=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=BB=A8=EB=B2=A4=EC=85=98=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/festago/dto/FestivalCreateRequest.java | 6 +++++- .../main/java/com/festago/dto/StageCreateRequest.java | 9 +++++---- .../main/java/com/festago/dto/TicketCreateRequest.java | 6 +++++- .../java/com/festago/dto/TicketValidationRequest.java | 3 ++- .../src/main/java/com/festago/dto/TicketingRequest.java | 3 ++- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/com/festago/dto/FestivalCreateRequest.java b/backend/src/main/java/com/festago/dto/FestivalCreateRequest.java index f214aec6b..ec10a7c21 100644 --- a/backend/src/main/java/com/festago/dto/FestivalCreateRequest.java +++ b/backend/src/main/java/com/festago/dto/FestivalCreateRequest.java @@ -4,7 +4,11 @@ import java.time.LocalDate; import java.util.Objects; -public record FestivalCreateRequest(String name, LocalDate startDate, LocalDate endDate, String thumbnail) { +public record FestivalCreateRequest( + String name, + LocalDate startDate, + LocalDate endDate, + String thumbnail) { public Festival toEntity() { if (Objects.isNull(thumbnail) || thumbnail.isBlank()) { diff --git a/backend/src/main/java/com/festago/dto/StageCreateRequest.java b/backend/src/main/java/com/festago/dto/StageCreateRequest.java index fb8d94a40..8f46f1afe 100644 --- a/backend/src/main/java/com/festago/dto/StageCreateRequest.java +++ b/backend/src/main/java/com/festago/dto/StageCreateRequest.java @@ -2,9 +2,10 @@ import java.time.LocalDateTime; -public record StageCreateRequest(LocalDateTime startTime, - String lineUp, - LocalDateTime ticketOpenTime, - Long festivalId) { +public record StageCreateRequest( + LocalDateTime startTime, + String lineUp, + LocalDateTime ticketOpenTime, + Long festivalId) { } diff --git a/backend/src/main/java/com/festago/dto/TicketCreateRequest.java b/backend/src/main/java/com/festago/dto/TicketCreateRequest.java index 37f6fb9e0..4a618e6e7 100644 --- a/backend/src/main/java/com/festago/dto/TicketCreateRequest.java +++ b/backend/src/main/java/com/festago/dto/TicketCreateRequest.java @@ -3,6 +3,10 @@ import com.festago.domain.TicketType; import java.time.LocalDateTime; -public record TicketCreateRequest(Long stageId, TicketType ticketType, Integer amount, LocalDateTime entryTime) { +public record TicketCreateRequest( + Long stageId, + TicketType ticketType, + Integer amount, + LocalDateTime entryTime) { } diff --git a/backend/src/main/java/com/festago/dto/TicketValidationRequest.java b/backend/src/main/java/com/festago/dto/TicketValidationRequest.java index f98f8de2e..34d6a1514 100644 --- a/backend/src/main/java/com/festago/dto/TicketValidationRequest.java +++ b/backend/src/main/java/com/festago/dto/TicketValidationRequest.java @@ -1,5 +1,6 @@ package com.festago.dto; -public record TicketValidationRequest(String code) { +public record TicketValidationRequest( + String code) { } diff --git a/backend/src/main/java/com/festago/dto/TicketingRequest.java b/backend/src/main/java/com/festago/dto/TicketingRequest.java index 048039f0f..faae025fd 100644 --- a/backend/src/main/java/com/festago/dto/TicketingRequest.java +++ b/backend/src/main/java/com/festago/dto/TicketingRequest.java @@ -1,5 +1,6 @@ package com.festago.dto; -public record TicketingRequest(Long ticketId) { +public record TicketingRequest( + Long ticketId) { }