Skip to content

Commit 0ab98cf

Browse files
d6nggyund6nggyun
authored
refactor: Event 엔티티 및 DTO의 수령시간 관련 필드 삭제
refactor: Event 엔티티 및 DTO의 수령시간 관련 필드 삭제
2 parents 0a79458 + 4f740ae commit 0ab98cf

10 files changed

Lines changed: 1 addition & 98 deletions

File tree

‎src/main/java/inu/codin/codinticketingapi/domain/admin/dto/request/EventCreateRequest.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,6 @@ public class EventCreateRequest {
5858
@Schema(description = "티켓팅 이벤트 종료 시간", example = "2025-12-25T12:00:00")
5959
private LocalDateTime eventEndTime;
6060

61-
@NotNull(message = "티켓팅 상품 수령 시작 시간은 필수입니다")
62-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss", timezone = "Asia/Seoul")
63-
@Schema(description = "티켓팅 상품 수령 시작 시간", example = "2025-12-25T16:00:00")
64-
private LocalDateTime eventReceivedStartTime;
65-
66-
@NotNull(message = "티켓팅 상품 수령 종료 시간은 필수입니다")
67-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss", timezone = "Asia/Seoul")
68-
@Schema(description = "티켓팅 상품 수령 종료 시간", example = "2025-12-25T17:00:00")
69-
private LocalDateTime eventReceivedEndTime;
70-
7161
@Pattern(regexp = "\\d{2,3}-\\d{3,4}-\\d{4}", message = "올바른 전화번호 형식이 아닙니다")
7262
@Schema(description = "문의 전화번호", example = "02-1234-5678")
7363
private String inquiryNumber;
@@ -82,8 +72,6 @@ public Event toEntity(String userId, String eventImageUrl) {
8272
.campus(this.campus)
8373
.eventTime(this.eventTime)
8474
.eventEndTime(this.eventEndTime)
85-
.eventReceivedStartTime(this.eventReceivedStartTime)
86-
.eventReceivedEndTime(this.eventReceivedEndTime)
8775
.eventImageUrl(eventImageUrl)
8876
.title(this.title)
8977
.locationInfo(this.locationInfo)
@@ -102,8 +90,5 @@ public void validateEventTimes() {
10290
if (eventEndTime != null && eventTime != null && !eventEndTime.isAfter(eventTime)) {
10391
throw new TicketingException(TicketingErrorCode.ILLEGAL_ARGUMENT);
10492
}
105-
if (eventReceivedStartTime != null && eventReceivedEndTime != null && !eventReceivedEndTime.isAfter(eventReceivedStartTime)) {
106-
throw new TicketingException(TicketingErrorCode.ILLEGAL_ARGUMENT);
107-
}
10893
}
10994
}

‎src/main/java/inu/codin/codinticketingapi/domain/admin/dto/request/EventUpdateRequest.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,6 @@ public class EventUpdateRequest {
5757
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss", timezone = "Asia/Seoul")
5858
private LocalDateTime eventEndTime;
5959

60-
@NotNull(message = "티켓팅 상품 수령 시작 시간은 필수입니다")
61-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "Asia/Seoul")
62-
@Schema(description = "티켓팅 상품 수령 시작 시간", example = "2025-07-02 16:00")
63-
private LocalDateTime eventReceivedStartTime;
64-
65-
@NotNull(message = "티켓팅 상품 수령 종료 시간은 필수입니다")
66-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "Asia/Seoul")
67-
@Schema(description = "티켓팅 상품 수령 종료 시간", example = "2025-07-02 16:00")
68-
private LocalDateTime eventReceivedEndTime;
69-
7060
@Pattern(regexp = "\\d{2,3}-\\d{3,4}-\\d{4}", message = "올바른 전화번호 형식이 아닙니다")
7161
@Schema(description = "문의 전화번호", example = "02-9876-5432")
7262
private String inquiryNumber;

‎src/main/java/inu/codin/codinticketingapi/domain/admin/dto/response/EventParticipationProfilePageResponse.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@ public class EventParticipationProfilePageResponse {
3535
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
3636
@Schema(description = "이벤트 티켓팅 종료 시간", example = "2025.07.02 (수) 16:00")
3737
private LocalDateTime eventEndTime;
38-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
39-
@Schema(description = "티켓팅 상품 수령 시작 시간", example = "2025.07.02 (수) 16:00")
40-
private LocalDateTime eventReceivedStartTime;
41-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
42-
@Schema(description = "티켓팅 상품 수령 종료 시간", example = "2025.07.02 (수) 16:00")
43-
private LocalDateTime eventReceivedEndTime;
4438

4539
public static EventParticipationProfilePageResponse from(Event event, Stock stock, List<EventParticipationProfileResponse> list, int lastPage, int nextPage, long waitNum) {
4640
return EventParticipationProfilePageResponse.builder()
@@ -52,8 +46,6 @@ public static EventParticipationProfilePageResponse from(Event event, Stock stoc
5246
.waitNum(waitNum)
5347
.eventTime(event.getEventTime())
5448
.eventEndTime(event.getEventEndTime())
55-
.eventReceivedStartTime(event.getEventReceivedStartTime())
56-
.eventReceivedEndTime(event.getEventReceivedEndTime())
5749
.build();
5850
}
5951
}

‎src/main/java/inu/codin/codinticketingapi/domain/admin/dto/response/EventResponse.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ public class EventResponse {
4545
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
4646
@Schema(description = "이벤트 티켓팅 종료 시간", example = "2025.07.02 (수) 16:00")
4747
private LocalDateTime eventEndTime;
48-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
49-
@Schema(description = "티켓팅 상품 수령 시작 시간", example = "2025.07.02 (수) 16:00")
50-
private LocalDateTime eventReceivedStartTime;
51-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
52-
@Schema(description = "티켓팅 상품 수령 종료 시간", example = "2025.07.02 (수) 16:00")
53-
private LocalDateTime eventReceivedEndTime;
5448

5549
public static EventResponse from(Event event) {
5650
return EventResponse.builder()
@@ -67,8 +61,6 @@ public static EventResponse from(Event event) {
6761
.status(event.getEventStatus())
6862
.eventTime(event.getEventTime())
6963
.eventEndTime(event.getEventEndTime())
70-
.eventReceivedStartTime(event.getEventReceivedStartTime())
71-
.eventReceivedEndTime(event.getEventReceivedEndTime())
7264
.build();
7365
}
7466
}

‎src/main/java/inu/codin/codinticketingapi/domain/admin/entity/Event.java‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@ public class Event extends BaseEntity {
4747
@Column(name = "event_end_time", nullable = false)
4848
private LocalDateTime eventEndTime;
4949

50-
/** 티켓팅 상품 수령 시작 시간 */
51-
@Column(name = "event_received_start_time")
52-
private LocalDateTime eventReceivedStartTime;
53-
54-
/** 티켓팅 상품 수령 종료 시간 */
55-
@Column(name = "event_received_end_time")
56-
private LocalDateTime eventReceivedEndTime;
57-
5850
/** 이제 단일 이미지 URL */
5951
@Column(name = "event_image_url")
6052
private String eventImageUrl;
@@ -97,14 +89,12 @@ public class Event extends BaseEntity {
9789
private EventStatus eventStatus;
9890

9991
@Builder
100-
public Event(Long id, String userId, Campus campus, LocalDateTime eventTime, LocalDateTime eventEndTime, LocalDateTime eventReceivedStartTime, LocalDateTime eventReceivedEndTime, String eventImageUrl, String title, String locationInfo, String target, String description, String inquiryNumber, String promotionLink, Stock stock) {
92+
public Event(Long id, String userId, Campus campus, LocalDateTime eventTime, LocalDateTime eventEndTime, String eventImageUrl, String title, String locationInfo, String target, String description, String inquiryNumber, String promotionLink, Stock stock) {
10193
this.id = id;
10294
this.userId = userId;
10395
this.campus = campus;
10496
this.eventTime = eventTime;
10597
this.eventEndTime = eventEndTime;
106-
this.eventReceivedStartTime = eventReceivedStartTime;
107-
this.eventReceivedEndTime = eventReceivedEndTime;
10898
this.eventImageUrl = eventImageUrl;
10999
this.title = title;
110100
this.locationInfo = locationInfo;
@@ -122,8 +112,6 @@ public void updateFrom(EventUpdateRequest dto) {
122112
this.campus = dto.getCampus();
123113
this.eventTime = dto.getEventTime();
124114
this.eventEndTime = dto.getEventEndTime();
125-
this.eventReceivedStartTime = dto.getEventReceivedStartTime();
126-
this.eventReceivedEndTime = dto.getEventReceivedEndTime();
127115
this.title = dto.getTitle();
128116
this.locationInfo = dto.getLocationInfo();
129117
this.target = dto.getTarget();

‎src/main/java/inu/codin/codinticketingapi/domain/ticketing/dto/response/EventDetailResponse.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,12 @@ public class EventDetailResponse {
4848
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
4949
@Schema(description = "이벤트 티켓팅 종료 시간", example = "2025.07.02 (수) 16:00")
5050
private LocalDateTime eventEndTime;
51-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
52-
@Schema(description = "티켓팅 상품 수령 시작 시간", example = "2025.07.02 (수) 16:00")
53-
private LocalDateTime eventReceivedStartTime;
54-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
55-
@Schema(description = "티켓팅 상품 수령 종료 시간", example = "2025.07.02 (수) 16:00")
56-
private LocalDateTime eventReceivedEndTime;
5751

5852
public static EventDetailResponse of(Event event, boolean isExistParticipationData, boolean isUserParticipatedInEvent) {
5953
return EventDetailResponse.builder()
6054
.eventId(event.getId())
6155
.eventTime(event.getEventTime())
6256
.eventEndTime(event.getEventEndTime())
63-
.eventReceivedStartTime(event.getEventReceivedStartTime())
64-
.eventReceivedEndTime(event.getEventReceivedEndTime())
6557
.eventImageUrls(event.getEventImageUrl())
6658
.eventTitle(event.getTitle())
6759
.locationInfo(event.getLocationInfo())

‎src/main/java/inu/codin/codinticketingapi/domain/ticketing/dto/response/EventPageDetailResponse.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ public class EventPageDetailResponse {
4343
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
4444
@Schema(description = "이벤트 티켓팅 종료 시간", example = "2025.07.02 (수) 16:00")
4545
private LocalDateTime eventEndTime;
46-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
47-
@Schema(description = "티켓팅 상품 수령 시작 시간", example = "2025.07.02 (수) 16:00")
48-
private LocalDateTime eventReceivedStartTime;
49-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
50-
@Schema(description = "티켓팅 상품 수령 종료 시간", example = "2025.07.02 (수) 16:00")
51-
private LocalDateTime eventReceivedEndTime;
5246

5347
public static EventPageDetailResponse of(Event event) {
5448
return EventPageDetailResponse.builder()
@@ -57,8 +51,6 @@ public static EventPageDetailResponse of(Event event) {
5751
.eventImageUrl(event.getEventImageUrl())
5852
.eventTime(event.getEventTime())
5953
.eventEndTime(event.getEventEndTime())
60-
.eventReceivedStartTime(event.getEventReceivedStartTime())
61-
.eventReceivedEndTime(event.getEventReceivedEndTime())
6254
.locationInfo(event.getLocationInfo())
6355
.quantity(event.getStock().getCurrentTotalStock())
6456
.currentQuantity(event.getStock().getRemainingStock())
@@ -73,8 +65,6 @@ public static EventPageDetailResponse of(Event event, int waitQuantity) {
7365
.eventImageUrl(event.getEventImageUrl())
7466
.eventTime(event.getEventTime())
7567
.eventEndTime(event.getEventEndTime())
76-
.eventReceivedStartTime(event.getEventReceivedStartTime())
77-
.eventReceivedEndTime(event.getEventReceivedEndTime())
7868
.locationInfo(event.getLocationInfo())
7969
.quantity(event.getStock().getCurrentTotalStock())
8070
.currentQuantity(event.getStock().getRemainingStock())

‎src/main/java/inu/codin/codinticketingapi/domain/ticketing/dto/response/EventParticipationHistoryDto.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ public class EventParticipationHistoryDto {
3131
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
3232
@Schema(description = "이벤트 티켓팅 종료 시간", example = "2025.07.02 (수) 16:00")
3333
private LocalDateTime eventEndTime;
34-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
35-
@Schema(description = "티켓팅 상품 수령 시작 시간", example = "2025.07.02 (수) 16:00")
36-
private LocalDateTime eventReceivedStartTime;
37-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
38-
@Schema(description = "티켓팅 상품 수령 종료 시간", example = "2025.07.02 (수) 16:00")
39-
private LocalDateTime eventReceivedEndTime;
4034

4135
@Schema(description = "참여 상태")
4236
private ParticipationStatus status;

‎src/main/java/inu/codin/codinticketingapi/domain/ticketing/dto/response/ParticipationResponse.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package inu.codin.codinticketingapi.domain.ticketing.dto.response;
22

33
import com.fasterxml.jackson.annotation.JsonCreator;
4-
import com.fasterxml.jackson.annotation.JsonFormat;
54
import com.fasterxml.jackson.annotation.JsonProperty;
65
import inu.codin.codinticketingapi.domain.ticketing.entity.Participation;
76
import inu.codin.codinticketingapi.domain.ticketing.entity.ParticipationStatus;
@@ -11,8 +10,6 @@
1110
import lombok.Getter;
1211
import lombok.NoArgsConstructor;
1312

14-
import java.time.LocalDateTime;
15-
1613
@Getter
1714
@Builder
1815
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -28,13 +25,6 @@ public class ParticipationResponse {
2825
@Schema(description = "서명 이미지 URL", example = "https://codin-s3-bucket.s3.ap-northeast-2.amazonaws.com/signature.jpeg")
2926
private String signatureImgUrl;
3027

31-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
32-
@Schema(description = "티켓팅 상품 수령 시작 시간", example = "2025.07.02 (수) 16:00")
33-
private LocalDateTime eventReceivedStartTime;
34-
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd (E) HH:mm", timezone = "Asia/Seoul")
35-
@Schema(description = "티켓팅 상품 수령 종료 시간", example = "2025.07.02 (수) 16:00")
36-
private LocalDateTime eventReceivedEndTime;
37-
3828
@Schema(description = "이벤트 장소 정보", example = "학생회관 301호")
3929
private String locationInfo;
4030

@@ -43,15 +33,11 @@ public ParticipationResponse(
4333
@JsonProperty("status") ParticipationStatus status,
4434
@JsonProperty("ticketNumber") Integer ticketNumber,
4535
@JsonProperty("signatureImgUrl") String signatureImgUrl,
46-
@JsonProperty("eventReceivedStartTime") LocalDateTime eventReceivedStartTime,
47-
@JsonProperty("eventReceivedEndTime") LocalDateTime eventReceivedEndTime,
4836
@JsonProperty("locationInfo") String locationInfo
4937
) {
5038
this.status = status;
5139
this.ticketNumber = ticketNumber;
5240
this.signatureImgUrl = signatureImgUrl;
53-
this.eventReceivedStartTime = eventReceivedStartTime;
54-
this.eventReceivedEndTime = eventReceivedEndTime;
5541
this.locationInfo = locationInfo;
5642
}
5743

@@ -60,8 +46,6 @@ public static ParticipationResponse of(Participation participation) {
6046
.status(participation.getStatus())
6147
.ticketNumber(participation.getTicketNumber())
6248
.signatureImgUrl(participation.getSignatureImgUrl())
63-
.eventReceivedStartTime(participation.getEvent().getEventReceivedStartTime())
64-
.eventReceivedEndTime(participation.getEvent().getEventReceivedEndTime())
6549
.locationInfo(participation.getEvent().getLocationInfo())
6650
.build();
6751
}

‎src/main/java/inu/codin/codinticketingapi/domain/ticketing/repository/ParticipationRepository.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ public interface ParticipationRepository extends JpaRepository<Participation, Lo
2626
e.locationInfo,
2727
e.eventTime,
2828
e.eventEndTime,
29-
e.eventReceivedStartTime,
30-
e.eventReceivedEndTime,
3129
p.status
3230
)
3331
FROM Participation p
@@ -46,8 +44,6 @@ public interface ParticipationRepository extends JpaRepository<Participation, Lo
4644
e.locationInfo,
4745
e.eventTime,
4846
e.eventEndTime,
49-
e.eventReceivedStartTime,
50-
e.eventReceivedEndTime,
5147
p.status
5248
)
5349
FROM Participation p

0 commit comments

Comments
 (0)