Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public static Event toEvent(EventRequestDTO.CreateEventRequestDTO request) {
return Event.builder()
.eventTitle(request.getEventTitle())
.eventBody(request.getEventBody())
.eventColor(request.getEventColor())
.startDate(request.getStartDate())
.endDate(request.getEndDate())
.build();
Expand All @@ -26,6 +27,7 @@ public static EventResponseDTO.CreateEventResultDTO toCreateResultDTO(Event even
.generatorId(event.getGenerator() != null ? event.getGenerator().getGeneratorId() : null) // generatorId 추가
.eventTitle(event.getEventTitle())
.eventBody(event.getEventBody())
.eventColor(event.getEventColor())
.startDate(event.getStartDate())
.endDate(event.getEndDate())
.build();
Expand All @@ -37,6 +39,7 @@ public static EventResponseDTO.UpdateEventResultDTO UpdateEventResultDTO(Event e
.eventId(event.getEventId())
.eventTitle(event.getEventTitle())
.eventBody(event.getEventBody())
.eventColor(event.getEventColor())
.startDate(event.getStartDate())
.endDate(event.getEndDate())
.build();
Expand All @@ -49,6 +52,7 @@ public static EventResponseDTO.MemberEventPreviewDTO toMemberEventPreviewDTO(Eve
.eventId(event.getEventId())
.eventTitle(event.getEventTitle())
.eventBody(event.getEventBody())
.eventColor(event.getEventColor())
.startDate(event.getStartDate())
.endDate(event.getEndDate())
.build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ public class Event extends BaseEntity {
@Column(name = "event_body", nullable = false, columnDefinition = "varchar(256)")
private String eventBody;

@Column(name = "event_color", nullable = false, columnDefinition = "varchar(256)")
private String eventColor;

@Column(name = "start_date", nullable = false, columnDefinition = "timestamp")
private LocalDateTime startDate;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public class EventRequestDTO {
public static class CreateEventRequestDTO {
private String eventTitle;
private String eventBody;
private String eventColor;
private LocalDateTime startDate;
private LocalDateTime endDate;
}
Expand All @@ -27,6 +28,7 @@ public static class CreateEventRequestDTO {
public static class UpdateEventDTO {
private String eventTitle;
private String eventBody;
private String eventColor;
private LocalDateTime startDate;
private LocalDateTime endDate;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public static class CreateEventResultDTO {
Long generatorId;
String eventTitle;
String eventBody;
String eventColor;
LocalDateTime startDate;
LocalDateTime endDate;
}
Expand All @@ -33,6 +34,7 @@ public static class UpdateEventResultDTO {
Long eventId;
String eventTitle;
String eventBody;
String eventColor;
LocalDateTime startDate;
LocalDateTime endDate;
}
Expand All @@ -47,6 +49,7 @@ public static class MemberEventPreviewDTO {
Long eventId;
String eventTitle;
String eventBody;
String eventColor;
LocalDateTime startDate;
LocalDateTime endDate;
}
Expand All @@ -57,11 +60,6 @@ public static class MemberEventPreviewDTO {
@AllArgsConstructor
public static class MemberEventPreviewListDTO {
List<MemberEventPreviewDTO> events;
// Integer listSize;
// Integer totalPage;
// Long totalElements;
// boolean isFirst;
// boolean isLast;
}


Expand Down
Loading