Feature/15: 이벤트 관련 API 개발

src/main/java/com/cmc/suppin/event/events/controller/EventApi.java

@@ -1,6 +1,7 @@
 package com.cmc.suppin.event.events.controller;
 
 import com.cmc.suppin.event.events.controller.dto.EventRequestDTO;
+import com.cmc.suppin.event.events.controller.dto.EventResponseDTO;
 import com.cmc.suppin.event.events.service.EventService;
 import com.cmc.suppin.global.response.ApiResponse;
 import com.cmc.suppin.global.response.ResponseCode;
@@ -13,25 +14,56 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @RestController
 @Slf4j
 @RequiredArgsConstructor
 @Validated
 @Tag(name = "Event", description = "Event 관련 API")
-@RequestMapping("/api/v1/event")
+@RequestMapping("/api/v1/events")
 public class EventApi {
 
     private final EventService eventService;
 
-    @PostMapping("/new")
-    @Operation(summary = "댓글 이벤트 생성 API", description = "request : eventType, title, url, startDate, endDate")
-    public ResponseEntity<ApiResponse<Void>> createEvent(@RequestBody @Valid EventRequestDTO.CommentEventCreateDTO request, @CurrentAccount Account account) {
-        eventService.createEvent(request, account.userId());
+    @GetMapping("/all")
+    @Operation(summary = "전체 이벤트 조회 API", description = "로그인한 사용자의 모든 이벤트와 설문 및 댓글 수를 조회합니다., JWT 토큰만 주시면 됩니다.")
+    public ResponseEntity<ApiResponse<List<EventResponseDTO.EventInfoDTO>>> getAllEventsWithCounts(@CurrentAccount Account account) {
+        List<EventResponseDTO.EventInfoDTO> events = eventService.getAllEvents(account.userId());
+        return ResponseEntity.ok(ApiResponse.of(events));
+    }
+
+    @PostMapping("/new/comment/crawling")
+    @Operation(summary = "댓글 이벤트 생성 API",
+            description = "Request : type(ENUM 타입으로, 'COMMENT와 SURVEY' 둘 중 하나를 입력해주시면 됩니다), " +
+                    "title, description, url, startDate(yyyy-MM-dd), endDate(yyyy-MM-dd), announcementDate(yyyy-MM-dd)")
+    public ResponseEntity<ApiResponse<Void>> createCommentEvent(@RequestBody @Valid EventRequestDTO.CommentEventCreateDTO request, @CurrentAccount Account account) {
+        eventService.createCommentEvent(request, account.userId());
+        return ResponseEntity.ok(ApiResponse.of(ResponseCode.SUCCESS));
+    }
+
+    @PostMapping("/new/survey")
+    @Operation(summary = "설문조사 이벤트 생성 API",
+            description = "Request : type(ENUM 타입으로, 'COMMENT와 SURVEY' 둘 중 하나를 입력해주시면 됩니다), " +
+                    "title, description, startDate(yyyy-MM-dd), endDate(yyyy-MM-dd), announcementDate(yyyy-MM-dd)")
+    public ResponseEntity<ApiResponse<Void>> createSurveyEvent(@RequestBody @Valid EventRequestDTO.SurveyEventCreateDTO request, @CurrentAccount Account account) {
+        eventService.createSurveyEvent(request, account.userId());
+        return ResponseEntity.ok(ApiResponse.of(ResponseCode.SUCCESS));
+    }
+
+    @PutMapping("/{eventId}/update")
+    @Operation(summary = "이벤트 수정 API", description = "PathVariable: eventId, Request : title, description, url, startDate, endDate, announcementDate")
+    public ResponseEntity<ApiResponse<Void>> updateEvent(@PathVariable Long eventId, @RequestBody @Valid EventRequestDTO.EventUpdateDTO request, @CurrentAccount Account account) {
+        eventService.updateEvent(eventId, request, account.userId());
+        return ResponseEntity.ok(ApiResponse.of(ResponseCode.SUCCESS));
+    }
+
+    @DeleteMapping("/{eventId}")
+    @Operation(summary = "이벤트 삭제 API", description = "PathVariable: eventId, JWT 토큰만 주시면 됩니다.")
+    public ResponseEntity<ApiResponse<Void>> deleteEvent(@PathVariable Long eventId, @CurrentAccount Account account) {
+        eventService.deleteEvent(eventId, account.userId());
         return ResponseEntity.ok(ApiResponse.of(ResponseCode.SUCCESS));
     }
 }

src/main/java/com/cmc/suppin/event/events/controller/dto/EventRequestDTO.java

@@ -1,6 +1,8 @@
 package com.cmc.suppin.event.events.controller.dto;
 
 import com.cmc.suppin.global.enums.EventType;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -13,8 +15,50 @@ public class EventRequestDTO {
     @AllArgsConstructor
     @Builder
     public static class CommentEventCreateDTO {
+        @NotNull
         private EventType type;
+        @NotEmpty
         private String title;
+        @NotEmpty
+        private String description;
+        @NotEmpty
+        private String url;
+        @NotEmpty
+        private String startDate;
+        @NotEmpty
+        private String endDate;
+        @NotEmpty
+        private String announcementDate;
+    }
+
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Builder
+    public static class SurveyEventCreateDTO {
+        @NotNull
+        private EventType type;
+        @NotEmpty
+        private String title;
+        @NotEmpty
+        private String description;
+        @NotEmpty
+        private String startDate;
+        @NotEmpty
+        private String endDate;
+        @NotEmpty
+        private String announcementDate;
+    }
+
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Builder
+    public static class EventUpdateDTO {
+        @NotNull
+        private EventType type;
+        private String title;
+        private String description;
         private String url;
         private String startDate;
         private String endDate;

src/main/java/com/cmc/suppin/event/events/controller/dto/EventResponseDTO.java

@@ -1,5 +1,6 @@
 package com.cmc.suppin.event.events.controller.dto;
 
+import com.cmc.suppin.global.enums.EventStatus;
 import com.cmc.suppin.global.enums.EventType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -12,8 +13,25 @@ public class EventResponseDTO {
     @Getter
     @NoArgsConstructor
     @AllArgsConstructor
-    public static class CommentEventDetailDTO {
+    public static class EventInfoDTO {
+        private Long eventId;
+        private EventType type;
+        private String title;
+        private String url;
+        private String startDate;
+        private String endDate;
+        private String announcementDate;
+        private Integer surveyCount;
+        private Integer commentCount;
+        private EventStatus status;
 
+    }
+
+    @Builder
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class CommentEventDetailDTO {
         private EventType type;
         private String title;
         private String url;

src/main/java/com/cmc/suppin/event/events/converter/EventConverter.java

@@ -3,32 +3,86 @@
 import com.cmc.suppin.event.events.controller.dto.EventRequestDTO;
 import com.cmc.suppin.event.events.controller.dto.EventResponseDTO;
 import com.cmc.suppin.event.events.domain.Event;
+import com.cmc.suppin.global.enums.EventType;
 import com.cmc.suppin.member.domain.Member;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
 public class EventConverter {
 
     public static Event toCommentEventEntity(EventRequestDTO.CommentEventCreateDTO request, Member member) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         return Event.builder()
                 .type(request.getType())
                 .title(request.getTitle())
+                .description(request.getDescription())
                 .url(request.getUrl())
-                .startDate(LocalDateTime.parse(request.getStartDate()))
-                .endDate(LocalDateTime.parse(request.getEndDate()))
-                .announcementDate(LocalDateTime.parse(request.getAnnouncementDate()))
+                .startDate(LocalDate.parse(request.getStartDate(), formatter).atStartOfDay())
+                .endDate(LocalDate.parse(request.getEndDate(), formatter).atStartOfDay())
+                .announcementDate(LocalDate.parse(request.getAnnouncementDate(), formatter).atStartOfDay())
+                .member(member)
+                .build();
+    }
+
+    public static Event toSurveyEventEntity(EventRequestDTO.SurveyEventCreateDTO request, Member member) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        return Event.builder()
+                .type(request.getType())
+                .title(request.getTitle())
+                .description(request.getDescription())
+                .startDate(LocalDate.parse(request.getStartDate(), formatter).atStartOfDay())
+                .endDate(LocalDate.parse(request.getEndDate(), formatter).atStartOfDay())
+                .announcementDate(LocalDate.parse(request.getAnnouncementDate(), formatter).atStartOfDay())
                 .member(member)
                 .build();
     }
 
     public static EventResponseDTO.CommentEventDetailDTO toEventDetailDTO(Event event) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         return EventResponseDTO.CommentEventDetailDTO.builder()
                 .type(event.getType())
                 .title(event.getTitle())
                 .url(event.getUrl())
-                .startDate(event.getStartDate().toString())
-                .endDate(event.getEndDate().toString())
-                .announcementDate(event.getAnnouncementDate().toString())
+                .startDate(event.getStartDate().format(formatter))
+                .endDate(event.getEndDate().format(formatter))
+                .announcementDate(event.getAnnouncementDate().format(formatter))
+                .build();
+    }
+
+    public static EventResponseDTO.EventInfoDTO toEventInfoDTO(Event event) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        return EventResponseDTO.EventInfoDTO.builder()
+                .eventId(event.getId())
+                .type(event.getType())
+                .title(event.getTitle())
+                .url(event.getUrl())
+                .startDate(event.getStartDate().format(formatter))
+                .endDate(event.getEndDate().format(formatter))
+                .announcementDate(event.getAnnouncementDate().format(formatter))
+                .surveyCount(event.getSurveyList().size())
+                .commentCount(event.getCommentList().size())
+                .status(event.getStatus())
                 .build();
     }
+
+    public static Event toUpdatedEventEntity(EventRequestDTO.EventUpdateDTO request, Member member) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        Event.EventBuilder eventBuilder = Event.builder()
+                .title(request.getTitle())
+                .description(request.getDescription())
+                .startDate(LocalDate.parse(request.getStartDate(), formatter).atStartOfDay())
+                .endDate(LocalDate.parse(request.getEndDate(), formatter).atStartOfDay())
+                .announcementDate(LocalDate.parse(request.getAnnouncementDate(), formatter).atStartOfDay())
+                .member(member);
+
+        // Only set URL if the event type is COMMENT
+        if (request.getType() == EventType.COMMENT) {
+            eventBuilder.url(request.getUrl());
+        }
+
+        return eventBuilder.build();
+    }
+
+
 }

src/main/java/com/cmc/suppin/event/events/domain/Event.java

@@ -39,7 +39,7 @@ public class Event extends BaseDateTimeEntity {
     @Column(columnDefinition = "VARCHAR(100)", nullable = false)
     private String title;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(columnDefinition = "TEXT", nullable = false)
     private String description;
 
     @Enumerated(EnumType.STRING)
@@ -66,6 +66,11 @@ public void setMember(Member member) {
         member.getEventList().add(this);
     }
 
-    // Getters and Setters
+    public void setStatus(EventStatus status) {
+        this.status = status;
+    }
 
+    public void setId(Long id) {
+        this.id = id;
+    }
 }

src/main/java/com/cmc/suppin/event/events/domain/repository/EventRepository.java

@@ -4,7 +4,11 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface EventRepository extends JpaRepository<Event, Long> {
     List<Event> findByMemberId(Long memberId);
+
+    Optional<Event> findByIdAndMemberId(Long id, Long memberId);
+
 }

src/main/java/com/cmc/suppin/event/events/service/EventService.java

@@ -1,28 +1,93 @@
 package com.cmc.suppin.event.events.service;
 
 import com.cmc.suppin.event.events.controller.dto.EventRequestDTO;
+import com.cmc.suppin.event.events.controller.dto.EventResponseDTO;
 import com.cmc.suppin.event.events.converter.EventConverter;
 import com.cmc.suppin.event.events.domain.Event;
 import com.cmc.suppin.event.events.domain.repository.EventRepository;
+import com.cmc.suppin.global.enums.EventStatus;
 import com.cmc.suppin.global.enums.UserStatus;
 import com.cmc.suppin.member.domain.Member;
 import com.cmc.suppin.member.domain.repository.MemberRepository;
+import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 @RequiredArgsConstructor
 public class EventService {
 
     private final EventRepository eventRepository;
     private final MemberRepository memberRepository;
 
-    public void createEvent(EventRequestDTO.CommentEventCreateDTO request, String userId) {
+    // 이벤트 상태 업데이트 메서드
+    @Transactional
+    public void updateEventStatus() {
+        LocalDateTime now = LocalDateTime.now();
+        List<Event> events = eventRepository.findAll();
+
+        for (Event event : events) {
+            if (event.getEndDate().isBefore(now) && event.getStatus() != EventStatus.DONE) {
+                event.setStatus(EventStatus.DONE);
+            } else if (event.getEndDate().isAfter(now) && event.getStatus() != EventStatus.PROCESSING) {
+                event.setStatus(EventStatus.PROCESSING);
+            }
+        }
+    }
+
+    public List<EventResponseDTO.EventInfoDTO> getAllEvents(String userId) {
+        Member member = memberRepository.findByUserIdAndStatusNot(userId, UserStatus.DELETED)
+                .orElseThrow(() -> new IllegalArgumentException("Member not found"));
+
+        List<Event> events = eventRepository.findByMemberId(member.getId());
+        return events.stream()
+                .map(EventConverter::toEventInfoDTO)
+                .collect(Collectors.toList());
+    }
+
+    public void createCommentEvent(EventRequestDTO.CommentEventCreateDTO request, String userId) {
         Member member = memberRepository.findByUserIdAndStatusNot(userId, UserStatus.DELETED)
                 .orElseThrow(() -> new IllegalArgumentException("Member not found"));
 
         Event event = EventConverter.toCommentEventEntity(request, member);
         event.setMember(member);
+        event.setStatus(EventStatus.PROCESSING);
+        eventRepository.save(event);
+    }
+
+    public void createSurveyEvent(EventRequestDTO.SurveyEventCreateDTO request, String userId) {
+        Member member = memberRepository.findByUserIdAndStatusNot(userId, UserStatus.DELETED)
+                .orElseThrow(() -> new IllegalArgumentException("Member not found"));
+
+        Event event = EventConverter.toSurveyEventEntity(request, member);
+        event.setMember(member);
+        event.setStatus(EventStatus.PROCESSING);
         eventRepository.save(event);
     }
+
+    public void updateEvent(Long eventId, EventRequestDTO.EventUpdateDTO request, String userId) {
+        Member member = memberRepository.findByUserIdAndStatusNot(userId, UserStatus.DELETED)
+                .orElseThrow(() -> new IllegalArgumentException("Member not found"));
+
+        Event event = eventRepository.findByIdAndMemberId(eventId, member.getId())
+                .orElseThrow(() -> new IllegalArgumentException("Event not found"));
+
+        Event updatedEvent = EventConverter.toUpdatedEventEntity(request, member);
+        updatedEvent.setId(event.getId());  // 유지하려는 ID 설정
+        eventRepository.save(updatedEvent);
+    }
+
+    public void deleteEvent(Long eventId, String userId) {
+        Member member = memberRepository.findByUserIdAndStatusNot(userId, UserStatus.DELETED)
+                .orElseThrow(() -> new IllegalArgumentException("Member not found"));
+
+        Event event = eventRepository.findByIdAndMemberId(eventId, member.getId())
+                .orElseThrow(() -> new IllegalArgumentException("Event not found"));
+
+        eventRepository.delete(event);
+    }
 }