Merge pull request #21 from cmsong111/Refactor-Event

cmsong111 · web-flow · commit eefc08246af8 · 2024-05-30T15:33:10.000+09:00
Refactor event
diff --git a/src/main/java/ac/kr/deu/connect/luck/ad/AdRestController.kt b/src/main/java/ac/kr/deu/connect/luck/ad/AdRestController.kt
@@ -0,0 +1,26 @@
+package ac.kr.deu.connect.luck.ad
+
+import io.swagger.v3.oas.annotations.tags.Tag
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RestController
+
+@Tag(name = "10-Advertisement API", description = "광고 관련 API")
+@RestController
+class AdRestController {
+
+    val adList: List<String> = listOf(
+        "https://i.ibb.co/tXHJ42V/Lime-Wire-AI-Studio-Asset-7.jpg",
+        "https://i.ibb.co/MphYSMG/Lime-Wire-AI-Studio-Asset-6.jpg",
+        "https://i.ibb.co/8X33yyG/Lime-Wire-AI-Studio-Asset-5.jpg",
+        "https://i.ibb.co/gvmGnq1/Lime-Wire-AI-Studio-Asset-4.jpg",
+        "https://i.ibb.co/9Zt0868/Lime-Wire-AI-Studio-Asset-3.jpg",
+        "https://i.ibb.co/m6fwTnX/Lime-Wire-AI-Studio-Asset-2.jpg",
+        "https://i.ibb.co/c1mr03H/Lime-Wire-AI-Studio-Asset-1.jpg",
+        "https://i.ibb.co/Q99zZj0/Lime-Wire-AI-Studio-Asset.jpg"
+    )
+
+    @GetMapping("/ad")
+    fun getAd(): List<String> {
+        return adList;
+    }
+}
diff --git a/src/main/java/ac/kr/deu/connect/luck/event/EventMapper.java b/src/main/java/ac/kr/deu/connect/luck/event/EventMapper.java
@@ -2,6 +2,7 @@
 
 import ac.kr.deu.connect.luck.event.dto.EventDetailResponse;
 import ac.kr.deu.connect.luck.event.dto.EventRequest;
+import ac.kr.deu.connect.luck.event.dto.EventRequestV2;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
@@ -23,4 +24,6 @@ public interface EventMapper {
      */
     @Mapping(source = "manager.name", target = "managerName")
     EventDetailResponse toEventResponse(Event event);
+
+    Event toEvent(EventRequestV2 eventRequest);
 }
diff --git a/src/main/java/ac/kr/deu/connect/luck/event/EventService.java b/src/main/java/ac/kr/deu/connect/luck/event/EventService.java
@@ -2,20 +2,22 @@
 
 import ac.kr.deu.connect.luck.event.dto.EventDetailResponse;
 import ac.kr.deu.connect.luck.event.dto.EventRequest;
-import ac.kr.deu.connect.luck.event_application.EventApplication;
+import ac.kr.deu.connect.luck.event.dto.EventRequestV2;
 import ac.kr.deu.connect.luck.image.ImageUploader;
 import ac.kr.deu.connect.luck.user.User;
 import ac.kr.deu.connect.luck.user.UserRepository;
 import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
 @RequiredArgsConstructor
 public class EventService {
+    private static final Logger log = LoggerFactory.getLogger(EventService.class);
     private final EventRepository eventRepository;
     private final EventMapper eventMapper;
     private final UserRepository userRepository;
@@ -68,22 +70,22 @@ public EventDetailResponse getEvent(Long id) {
     /**
      * 이벤트 생성
      *
-     * @param eventRequest  이벤트 생성 요청 폼
-     * @param multipartFile 이벤트 대표 이미지
-     *                      null이면 기본 이미지 사용
-     * @param managerEmail  매니저 이름
+     * @param eventRequest 이벤트 생성 요청 폼
+     *                     null이면 기본 이미지 사용
+     * @param managerEmail 매니저 이름
      * @return 생성된 이벤트
      */
-    public Event createEvent(EventRequest eventRequest, MultipartFile multipartFile, String managerEmail) {
+    public Event createEvent(EventRequestV2 eventRequest, String managerEmail) {
         Event eventSaved = eventMapper.toEvent(eventRequest);
 
         User user = userRepository.findByEmail(managerEmail).orElseThrow(
                 () -> new IllegalArgumentException("해당 유저가 존재하지 않습니다.")
         );
         // 기본 이미지 설정 후 이미지가 있으면 업로드
         String image = "https://picsum.photos/1600/900";
-        if (multipartFile != null) {
-            image = imageUploader.uploadImage(multipartFile).getData().getUrl();
+        log.info("image : {}", eventRequest.getImage());
+        if (eventRequest.getImage() != null) {
+            image = imageUploader.uploadImage(eventRequest.getImage()).getData().getUrl();
         }
         eventSaved.setImageUrl(image);
         eventSaved.setManager(user);
@@ -97,11 +99,10 @@ public Event createEvent(EventRequest eventRequest, MultipartFile multipartFile,
      *
      * @param id            이벤트 UID
      * @param eventRequest  이벤트 생성 요청 폼
-     * @param multipartFile 이벤트 대표 이미지
      * @param managerEmail  이벤트 매니저 이메일
      * @return 수정된 이벤트
      */
-    public Event updateEvent(Long id, EventRequest eventRequest, MultipartFile multipartFile, String managerEmail) {
+    public Event updateEvent(Long id, EventRequestV2 eventRequest, String managerEmail) {
         Event findEvent = eventRepository.findById(id).orElseThrow(
                 () -> new IllegalArgumentException("해당 이벤트가 존재하지 않습니다.")
         );
@@ -110,37 +111,19 @@ public Event updateEvent(Long id, EventRequest eventRequest, MultipartFile multi
             throw new IllegalArgumentException("해당 이벤트의 매니저가 아닙니다.");
         }
 
-        if (multipartFile != null) {
-            String image = imageUploader.uploadImage(multipartFile).getData().getUrl();
+        if (eventRequest.getImage() != null) {
+            String image = imageUploader.uploadImage(eventRequest.getImage()).getData().getUrl();
             findEvent.setImageUrl(image);
         }
-        if (eventRequest.title() != null) {
-            findEvent.setTitle(eventRequest.title());
-        }
-
-        if (eventRequest.content() != null) {
-            findEvent.setContent(eventRequest.content());
-        }
-
-        if (eventRequest.zipCode() != null) {
-            findEvent.setZipCode(eventRequest.zipCode());
-        }
 
-        if (eventRequest.streetAddress() != null) {
-            findEvent.setStreetAddress(eventRequest.streetAddress());
-        }
-
-        if (eventRequest.detailAddress() != null) {
-            findEvent.setDetailAddress(eventRequest.detailAddress());
-        }
+        findEvent.setTitle(eventRequest.getTitle());
+        findEvent.setContent(eventRequest.getContent());
+        findEvent.setZipCode(eventRequest.getZipCode());
+        findEvent.setStreetAddress(eventRequest.getStreetAddress());
+        findEvent.setDetailAddress(eventRequest.getDetailAddress());
+        findEvent.setStartAt(eventRequest.getStartAt());
+        findEvent.setEndAt(eventRequest.getEndAt());
 
-        if (eventRequest.startAt() != null) {
-            findEvent.setStartAt(eventRequest.startAt());
-        }
-
-        if (eventRequest.endAt() != null) {
-            findEvent.setEndAt(eventRequest.endAt());
-        }
         return eventRepository.save(findEvent);
     }
 
diff --git a/src/main/java/ac/kr/deu/connect/luck/event/controller/EventController.java b/src/main/java/ac/kr/deu/connect/luck/event/controller/EventController.java
@@ -3,14 +3,19 @@
 import ac.kr.deu.connect.luck.event.EventService;
 import ac.kr.deu.connect.luck.event.EventStatus;
 import ac.kr.deu.connect.luck.event.dto.EventRequest;
+import ac.kr.deu.connect.luck.event.dto.EventRequestV2;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.security.Principal;
+import java.time.LocalDateTime;
 
+@Slf4j
 @Controller
 @RequestMapping("/event")
 @RequiredArgsConstructor
@@ -38,15 +43,16 @@ public String getEventDetail(@PathVariable("id") Long id, Model model) {
 
     @GetMapping("/register")
     public String getEventRegister(Model model) {
+        model.addAttribute("eventRequest", new EventRequestV2("", "", "", "", "", LocalDateTime.now(), LocalDateTime.now(), null));
         return "event/event_register";
     }
 
-    @PostMapping("/create")
+    @PostMapping(value = "/create", consumes = "multipart/form-data")
     public String registerEventPost(
             Principal principal,
-            EventRequest eventRequest, @RequestParam("multipartFile") MultipartFile multipartFile
-    ){
-        eventService.createEvent(eventRequest, multipartFile, principal.getName());
+            EventRequestV2 eventRequest
+    ) {
+        eventService.createEvent(eventRequest, principal.getName());
         return "redirect:/event/my";
     }
 
@@ -63,21 +69,22 @@ public String getEventUpdate(@PathVariable("id") Long id, Model model) {
     }
 
     @PostMapping("/update")
+    @PreAuthorize("hasRole('ROLE_EVENT_MANAGER')")
     public String updateEventPost(
             @RequestParam("eventId") Long id,
             Principal principal,
-            EventRequest eventRequest,
-            @RequestParam("multipartFile") MultipartFile multipartFile
-    ){
-        eventService.updateEvent(id, eventRequest, multipartFile, principal.getName());
+            EventRequestV2 eventRequest
+    ) {
+        eventService.updateEvent(id, eventRequest, principal.getName());
         return "redirect:/event/my";
     }
+
     @PostMapping("/statusUpdate/{id}")
     public String updateEventPost(
             @PathVariable("id") Long id,
             Principal principal,
             @RequestParam("status") EventStatus eventStatus
-    ){
+    ) {
         eventService.changeEventStatus(id, eventStatus, principal.getName());
         return "redirect:/event/my";
     }
diff --git a/src/main/java/ac/kr/deu/connect/luck/event/controller/EventRestController.java b/src/main/java/ac/kr/deu/connect/luck/event/controller/EventRestController.java
@@ -4,6 +4,7 @@
 import ac.kr.deu.connect.luck.event.EventService;
 import ac.kr.deu.connect.luck.event.EventStatus;
 import ac.kr.deu.connect.luck.event.dto.EventDetailResponse;
+import ac.kr.deu.connect.luck.event.dto.EventRequestV2;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -12,7 +13,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.security.Principal;
 import java.util.List;
@@ -39,40 +39,34 @@ public ResponseEntity<EventDetailResponse> getEvent(@PathVariable Long id) {
         return ResponseEntity.ok(eventService.getEvent(id));
     }
 
-    //서비스 로직 수정함 레스트도 수정되어야할듯
-    /*@PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    /**
+     * 이벤트 생성 Rest API
+     *
+     * @param eventRequest 이벤트 생성 요청 정보
+     * @param principal    로그인 한 사용자 정보
+     * @return 생성된 이벤트 정보
+     */
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @PreAuthorize("hasRole('ROLE_EVENT_MANAGER')")
     @Operation(summary = "이벤트 생성", description = "이벤트 생성\n이벤트 주소입력 시 카카오 우편번호 서비스를 사용해서 주소를 입력받아야함.")
     public ResponseEntity<Event> createEvent(
-            @Parameter(description = "행사 이름") @RequestPart(value = "title") String title,
-            @Parameter(description = "이벤트 내용") @RequestPart(value = "content") String content,
-            @Parameter(description = "우편번호") @RequestPart(value = "zipCode") String zipCode,
-            @Parameter(description = "도로명주소") @RequestPart(value = "streetAddress") String streetAddress,
-            @Parameter(description = "상세주소") @RequestPart(value = "detailAddress") String detailAddress,
-            @Parameter(description = "시작일자 예시)2021-08-01T00:00:00") @RequestPart(value = "startAt") String startAt,
-            @Parameter(description = "종료일자 예시)2021-08-01T00:00:00") @RequestPart(value = "endAt") String endAt,
-            @Parameter(description = "이벤트 대표 이미지") @RequestPart(value = "image", required = false) MultipartFile multipartFile,
+            @ModelAttribute EventRequestV2 eventRequest,
             Principal principal
     ) {
-        return ResponseEntity.ok(eventService.createEvent(title, content, zipCode, streetAddress, detailAddress, startAt, endAt, multipartFile, principal.getName()));
+        return ResponseEntity.ok(eventService.createEvent(eventRequest, principal.getName()));
     }
 
+
+
     @PatchMapping(value = "/{id}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @PreAuthorize("hasRole('ROLE_EVENT_MANAGER')")
     @Operation(summary = "이벤트 수정", description = "이벤트 수정")
     public ResponseEntity<Event> updateEvent(
             @Parameter(description = "이벤트 UID") @PathVariable(value = "id", required = false) Long id,
-            @Parameter(description = "행사 이름") @RequestPart(value = "title", required = false) String title,
-            @Parameter(description = "이벤트 내용") @RequestPart(value = "content", required = false) String content,
-            @Parameter(description = "우편번호") @RequestPart(value = "zipCode", required = false) String zipCode,
-            @Parameter(description = "도로명주소") @RequestPart(value = "streetAddress", required = false) String streetAddress,
-            @Parameter(description = "상세주소") @RequestPart(value = "detailAddress", required = false) String detailAddress,
-            @Parameter(description = "시작일자 예시)2021-08-01T00:00:00") @RequestPart(value = "startAt", required = false) String startAt,
-            @Parameter(description = "종료일자 예시)2021-08-01T00:00:00") @RequestPart(value = "endAt", required = false) String endAt,
-            @Parameter(description = "이벤트 대표 이미지") @RequestPart(value = "image", required = false) MultipartFile multipartFile,
+            @ModelAttribute EventRequestV2 eventRequest,
             Principal principal) {
-        return ResponseEntity.ok(eventService.updateEvent(id, title, content, zipCode, streetAddress, detailAddress, startAt, endAt, multipartFile, principal.getName()));
-    }*/
+        return ResponseEntity.ok(eventService.updateEvent(id, eventRequest, principal.getName()));
+    }
 
 
     @DeleteMapping("/{id}")
diff --git a/src/main/java/ac/kr/deu/connect/luck/event/dto/EventRequestV2.kt b/src/main/java/ac/kr/deu/connect/luck/event/dto/EventRequestV2.kt
@@ -0,0 +1,33 @@
+package ac.kr.deu.connect.luck.event.dto
+
+import io.swagger.v3.oas.annotations.media.Schema
+import org.springframework.format.annotation.DateTimeFormat
+import org.springframework.web.multipart.MultipartFile
+import java.time.LocalDateTime
+
+@Schema(description = "이벤트 요청 V2")
+data class EventRequestV2(
+    @field:Schema(description = "제목", example = "이벤트 제목")
+    val title: String,
+    @field:Schema(description = "내용", example = "이벤트 내용")
+    val content: String,
+    @field:Schema(description = "우편번호", example = "12345")
+    val zipCode: String,
+    @field:Schema(description = "도로명 주소", example = "서울시 강남구 테헤란로 123")
+    val streetAddress: String,
+    @field:Schema(description = "상세 주소", example = "역삼동 123-456")
+    val detailAddress: String,
+    @field:Schema(description = "이벤트 시작일", example = "2021-01-01T00:00:00Z")
+    @field:DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+    val startAt: LocalDateTime,
+    @field:Schema(description = "이벤트 종료일", example = "2021-01-01T23:59:59Z")
+    @field:DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+    val endAt: LocalDateTime,
+    @field:Schema(description = "이미지", format = "binary")
+    var image: MultipartFile?
+) {
+
+    override fun toString(): String {
+        return "EventRequestV2(title='$title', content='$content', zipCode='$zipCode', streetAddress='$streetAddress', detailAddress='$detailAddress', startAt=$startAt, endAt=$endAt, image=${image?.originalFilename})"
+    }
+}
diff --git a/src/main/resources/templates/event/event_register.html b/src/main/resources/templates/event/event_register.html
@@ -12,50 +12,50 @@
     </style>
     <div class="container mt-5">
         <h1 class="text-center">이벤트 생성</h1>
-        <form th:action="@{/event/create}" method="post" enctype="multipart/form-data">
+        <form th:action="@{/event/create}" method="post" enctype="multipart/form-data" th:object="${eventRequest}">
             <div class="form-group">
                 <label for="title">이벤트 제목</label>
-                <input type="text" class="form-control" id="title" name="title" required>
+                <input type="text" class="form-control" id="title" name="title" th:field="*{title}" required>
             </div>
 
             <div class="form-group">
                 <label for="content">이벤트 내용</label>
-                <textarea class="form-control" id="content" name="content" rows="3" required></textarea>
+                <textarea class="form-control" id="content" name="content" rows="3" th:field="*{content}" required></textarea>
             </div>
 
             <div class="form-group">
                 <label for="zipCode">우편번호</label>
-                <input type="text" class="form-control" id="zipCode" name="zipCode" required>
+                <input type="text" class="form-control" id="zipCode" name="zipCode" th:field="*{zipCode}" required>
             </div>
 
             <div class="form-group">
                 <label for="streetAddress">도로명 주소</label>
-                <input type="text" class="form-control" id="streetAddress" name="streetAddress" required>
+                <input type="text" class="form-control" id="streetAddress" name="streetAddress" th:field="*{streetAddress}" required>
             </div>
 
             <div class="form-group">
                 <label for="detailAddress">상세 주소</label>
-                <input type="text" class="form-control" id="detailAddress" name="detailAddress" required>
+                <input type="text" class="form-control" id="detailAddress" name="detailAddress" th:field="*{detailAddress}" required>
             </div>
 
             <div class="form-group">
                 <label for="startAt">시작 일시</label>
-                <input type="datetime-local" class="form-control" id="startAt" name="startAt" required>
+                <input type="datetime-local" class="form-control" id="startAt" name="startAt" th:field="*{startAt}" required>
             </div>
 
             <div class="form-group">
                 <label for="endAt">종료 일시</label>
-                <input type="datetime-local" class="form-control" id="endAt" name="endAt" required>
+                <input type="datetime-local" class="form-control" id="endAt" name="endAt" th:field="*{endAt}" required>
             </div>
 
             <div class="form-group">
-                <label for="multipartFile">이벤트 대표 이미지</label>
-                <input type="file" class="form-control" id="multipartFile" name="multipartFile">
+                <label for="image">이벤트 대표 이미지</label>
+                <input type="file" class="form-control-file" id="image" name="image" th:field="*{image}" required>
             </div>
 
             <button type="submit" class="btn btn-primary">이벤트 생성</button>
             <button type="button" class="btn btn-secondary" onclick="location.href='/event/my'">취소하기</button>
         </form>
     </div>
 </th:block>
-</html>
+</html>
