Fix: Event startTime, endTime 삭제

SMWU-Cookiee · Sep 18, 2024 · 226675a · 226675a
1 parent 09ff256
commit 226675a
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 27 deletions.
diff --git a/src/main/java/com/cookiee/cookieeserver/event/domain/Event.java b/src/main/java/com/cookiee/cookieeserver/event/domain/Event.java
@@ -46,12 +46,6 @@ public class Event extends BaseTimeEntity {
     @Column(nullable = false)
     private int eventDate;
 
-    @Column
-    private String startTime;
-
-    @Column
-    private String endTime;
-
     //@ApiParam(value="이벤트 사진", required=true, example="https:블라블라,amazom.블라블라")
     @ElementCollection
     @Column(nullable = true)
@@ -69,26 +63,22 @@ public class Event extends BaseTimeEntity {
 
     @Builder
     public Event(String eventWhat, String eventWhere, String withWho, int eventYear, int eventMonth, int eventDate,
-                 String startTime, String endTime, List<String> imageUrl, User user, List<EventCategory> eventCategoryList){
+                 List<String> imageUrl, User user, List<EventCategory> eventCategoryList){
         this.eventWhat = eventWhat;
         this.eventWhere = eventWhere;
         this.withWho = withWho;
         this.eventYear = eventYear;
         this.eventMonth = eventMonth;
         this.eventDate = eventDate;
-        this.startTime = startTime;
-        this.endTime = endTime;
         this.imageUrl = imageUrl;
         this.user = user;
         this.eventCategories = eventCategoryList;
     }
 
-    public void update(String eventWhat, String eventWhere, String withWho, String startTime, String endTime, List<String> imageUrl, List<EventCategory> eventCategoryList){
+    public void update(String eventWhat, String eventWhere, String withWho, List<String> imageUrl, List<EventCategory> eventCategoryList){
         this.eventWhat = eventWhat;
         this.eventWhere = eventWhere;
         this.withWho = withWho;
-        this.startTime = startTime;
-        this.endTime = endTime;
         this.imageUrl = imageUrl;
         this.eventCategories = eventCategoryList;
     }

diff --git a/src/main/java/com/cookiee/cookieeserver/event/dto/request/EventRegisterRequestDto.java b/src/main/java/com/cookiee/cookieeserver/event/dto/request/EventRegisterRequestDto.java
@@ -17,8 +17,6 @@ public record EventRegisterRequestDto (
     int eventYear,
     int eventMonth,
     int eventDate,
-    String startTime,
-    String endTime,
     List<Long> categoryIds){
 
     public Event toEntity(User user, List<EventCategory> eventCategories, List<String> imageUrls){
@@ -29,8 +27,6 @@ public Event toEntity(User user, List<EventCategory> eventCategories, List<Strin
                 .eventYear(eventYear)
                 .eventMonth(eventMonth)
                 .eventDate(eventDate)
-                .startTime(startTime)
-                .endTime(endTime)
                 .user(user)
                 .eventCategoryList(eventCategories)
                 .imageUrl(imageUrls)

diff --git a/src/main/java/com/cookiee/cookieeserver/event/dto/request/EventUpdateRequestDto.java b/src/main/java/com/cookiee/cookieeserver/event/dto/request/EventUpdateRequestDto.java
@@ -18,8 +18,6 @@ public Event toEntity(List<EventCategory> eventCategories, List<String> imageUrl
                 .eventWhat(eventWhat)
                 .eventWhere(eventWhere)
                 .withWho(withWho)
-                .startTime(startTime)
-                .endTime(endTime)
                 .eventCategoryList(eventCategories)
                 .imageUrl(imageUrls)
                 .build();

diff --git a/src/main/java/com/cookiee/cookieeserver/event/dto/response/EventResponseDto.java b/src/main/java/com/cookiee/cookieeserver/event/dto/response/EventResponseDto.java
@@ -18,8 +18,6 @@ public record EventResponseDto(
         int EventYear,
         int EventMonth,
         int EventDate,
-        String startTime,
-        String endTime,
         List<String> eventImageUrlList,
         List<CategoryGetResponseDto> categories){
 
@@ -32,8 +30,6 @@ public static EventResponseDto from(Event event){
                 event.getEventYear(),
                 event.getEventMonth(),
                 event.getEventDate(),
-                event.getStartTime(),
-                event.getEndTime(),
                 event.getImageUrl(),
                 event.getEventCategories().stream()
                         .map(EventCategory::getCategory)

diff --git a/src/main/java/com/cookiee/cookieeserver/event/service/EventUserByDeviceService.java b/src/main/java/com/cookiee/cookieeserver/event/service/EventUserByDeviceService.java
@@ -141,8 +141,6 @@ public EventResponseDto updateEvent(String deviceId, long eventId, EventUpdateRe
                     eventUpdateRequestDto.eventWhat(),
                     eventUpdateRequestDto.eventWhere(),
                     eventUpdateRequestDto.withWho(),
-                    eventUpdateRequestDto.startTime(),
-                    eventUpdateRequestDto.endTime(),
                     storedFileNames,
                     eventCategoryList
             );

diff --git a/src/main/java/com/cookiee/cookieeserver/event/service/EventUserBySocialLoginService.java b/src/main/java/com/cookiee/cookieeserver/event/service/EventUserBySocialLoginService.java
@@ -131,8 +131,6 @@ public EventResponseDto updateEvent(long userId, long eventId, EventUpdateReques
                     eventUpdateRequestDto.eventWhat(),
                     eventUpdateRequestDto.eventWhere(),
                     eventUpdateRequestDto.withWho(),
-                    eventUpdateRequestDto.startTime(),
-                    eventUpdateRequestDto.endTime(),
                     storedFileNames,
                     eventCategoryList
             );

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -20,4 +20,23 @@ logging:
   logback:
     rollingpolicy:
       max-history: 7
-      max-file-size: 10MB
+      max-file-size: 10MB
+
+swagger:
+  enabled: true
+  base-package: com.cookiee.cookieeserver
+
+springdoc:
+  swagger-ui:
+    path: /swagger-ui.html
+    groups-order: DESC
+    operationsSorter: method
+    disable-swagger-default-url: true
+    display-request-duration: true
+  api-docs:
+    path: /api-docs
+  show-actuator: true
+  default-consumes-media-type: application/json
+  default-produces-media-type: application/json
+  paths-to-match:
+    - /v1/**