Merge pull request #112 from TaetaetaE01/main

event 오류 수정
developthreefeet · Aug 16, 2024 · 5089a8f · 5089a8f
2 parents a397920 + f9f7b0a
commit 5089a8f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/com/example/bigbrotherbe/domain/event/controller/EventAdminController.java b/src/main/java/com/example/bigbrotherbe/domain/event/controller/EventAdminController.java
@@ -32,7 +32,7 @@ public class EventAdminController {
     public ResponseEntity<ApiResponse<Void>> registerEvent(@RequestPart(value = "eventRegisterRequest") EventRegisterRequest eventRegisterRequest,
                                                            @RequestPart(value = "file", required = false) List<MultipartFile> multipartFiles) {
         eventService.registerEvent(eventRegisterRequest, multipartFiles);
-        return ResponseEntity.ok().build();
+        return ResponseEntity.ok(ApiResponse.success(SUCCESS));
     }
 
     @PutMapping("/{eventId}")

diff --git a/src/main/java/com/example/bigbrotherbe/domain/event/dto/response/EventResponse.java b/src/main/java/com/example/bigbrotherbe/domain/event/dto/response/EventResponse.java
@@ -15,24 +15,28 @@
 @Builder
 @AllArgsConstructor
 public class EventResponse {
-    private Long meetingsId;
+    private Long eventId;
     private String title;
     private String content;
     private String target;
     private LocalDateTime startDateTime;
     private LocalDateTime endDateTime;
+    private LocalDateTime createAt;
+    private LocalDateTime updateAt;
     private Long affiliationId;
     private List<FileResponse> fileInfo;
 
     public static EventResponse fromEventResponse(Event event, List<FileResponse> fileInfo) {
         return EventResponse.builder()
-                .meetingsId(event.getId())
+                .eventId(event.getId())
                 .title(event.getTitle())
                 .content(event.getContent())
                 .target(event.getTarget())
                 .startDateTime(event.getStartDateTime())
                 .endDateTime(event.getEndDateTime())
                 .affiliationId(event.getAffiliationId())
+                .createAt(event.getCreateAt())
+                .updateAt(event.getUpdateAt())
                 .fileInfo(fileInfo)
                 .build();
     }