Feature/33: FCM 푸시알림 구현-2

.gitignore

@@ -6,6 +6,8 @@ build/
 !**/src/test/**/build/
 /src/main/resources/firebase/
 /src/main/resources/firebase/suppin-a5657-firebase-adminsdk-s75m9-d65cc88029.json
+/src/main/resources/drivers/
+
 
 ### STS ###
 .apt_generated
@@ -37,3 +39,5 @@ out/
 
 ### VS Code ###
 .vscode/
+
+app.log

.platform/nginx.conf

@@ -11,53 +11,57 @@ events {
 }
 
 http {
-  include       /etc/nginx/mime.types;
-  default_type  application/octet-stream;
-
-
-  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                    '$status $body_bytes_sent "$http_referer" '
-                    '"$http_user_agent" "$http_x_forwarded_for"';
-
-  include       conf.d/*.conf;
-
-  map $http_upgrade $connection_upgrade {
-      default     "upgrade";
-  }
-
-  upstream springboot {
-    server 127.0.0.1:8080;
-    keepalive 1024;
-  }
-
-  server {
-      listen        80 default_server;
-      listen        [::]:80 default_server;
-
-      location / {
-          proxy_pass          http://springboot;
-                  # CORS 관련 헤더 추가
-          add_header 'Access-Control-Allow-Origin' '*';
-          add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
-          add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type';
-          proxy_http_version  1.1;
-          proxy_set_header    Connection          $connection_upgrade;
-          proxy_set_header    Upgrade             $http_upgrade;
-
-          proxy_set_header    Host                $host;
-          proxy_set_header    X-Real-IP           $remote_addr;
-          proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
-      }
-
-      access_log    /var/log/nginx/access.log main;
-
-      client_header_timeout 60;
-      client_body_timeout   60;
-      keepalive_timeout     60;
-      gzip                  off;
-      gzip_comp_level       4;
-
-      # Include the Elastic Beanstalk generated locations
-      include conf.d/elasticbeanstalk/healthd.conf;
-  }
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    include       conf.d/*.conf;
+
+    map $http_upgrade $connection_upgrade {
+        default     "upgrade";
+    }
+
+    upstream springboot {
+        server 127.0.0.1:8080;
+        keepalive 1024;
+    }
+
+    server {
+        listen        80 default_server;
+        listen        [::]:80 default_server;
+
+        location / {
+            proxy_pass          http://springboot;
+            # CORS 관련 헤더 추가
+            # add_header 'Access-Control-Allow-Origin' '*';
+            # add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
+            # add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type';
+            proxy_http_version  1.1;
+            proxy_set_header    Connection          $connection_upgrade;
+            proxy_set_header    Upgrade             $http_upgrade;
+
+            proxy_set_header    Host                $host;
+            proxy_set_header    X-Real-IP           $remote_addr;
+            proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
+
+            # 타임아웃 설정 추가
+            proxy_read_timeout  900s;      # 백엔드 서버로부터의 응답을 기다리는 시간
+            proxy_connect_timeout  900s;  # 백엔드 서버에 연결을 시도하는 시간
+            proxy_send_timeout  900s;     # Nginx가 백엔드 서버로 요청을 전송하는 시간
+        }
+
+        access_log    /var/log/nginx/access.log main;
+
+        client_header_timeout 60;
+        client_body_timeout   60;
+        keepalive_timeout     60;
+        gzip                  off;
+        gzip_comp_level       4;
+
+        # Include the Elastic Beanstalk generated locations
+        # include conf.d/elasticbeanstalk/healthd.conf;
+    }
 }

build.gradle

@@ -39,10 +39,9 @@ dependencies {
     implementation 'io.jsonwebtoken:jjwt-jackson:0.12.2'
 
     //selenium
-    implementation 'org.seleniumhq.selenium:selenium-java:4.1.4'
-    implementation 'io.github.bonigarcia:webdrivermanager:5.0.3'
+    implementation 'org.seleniumhq.selenium:selenium-java:4.22.0'
+    implementation 'io.github.bonigarcia:webdrivermanager:5.4.0'
     implementation 'org.jsoup:jsoup:1.13.1'
-    testImplementation 'org.seleniumhq.selenium:selenium-java:4.22.0'
 
     //Google Firebase
     implementation 'com.google.firebase:firebase-admin:9.2.0'

src/main/java/com/cmc/suppin/SuppinApplication.java

@@ -3,9 +3,11 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableJpaAuditing
+@EnableScheduling
 public class SuppinApplication {
 
     public static void main(String[] args) {

src/main/java/com/cmc/suppin/event/crawl/controller/CommentApi.java

@@ -4,6 +4,7 @@
 import com.cmc.suppin.event.crawl.controller.dto.CommentResponseDTO;
 import com.cmc.suppin.event.crawl.service.CommentService;
 import com.cmc.suppin.global.response.ApiResponse;
+import com.cmc.suppin.global.response.ResponseCode;
 import com.cmc.suppin.global.security.reslover.Account;
 import com.cmc.suppin.global.security.reslover.CurrentAccount;
 import io.swagger.v3.oas.annotations.Operation;
@@ -44,7 +45,7 @@ public ResponseEntity<ApiResponse<CommentResponseDTO.CrawledCommentListDTO>> get
     }
 
     @PostMapping("/draft-winners")
-    @Operation(summary = "조건별 당첨자 추첨 API(댓글 이벤트)", description = "주어진 조건에 따라 이벤트의 당첨자를 추첨합니다.")
+    @Operation(summary = "당첨자 랜덤 추첨 결과 조회 API(댓글 이벤트)", description = "주어진 조건에 따라 이벤트의 당첨자를 추첨합니다.")
     public ResponseEntity<ApiResponse<CommentResponseDTO.WinnerResponseDTO>> drawWinners(
             @RequestBody @Valid CommentRequestDTO.WinnerRequestDTO request,
             @CurrentAccount Account account) {
@@ -61,4 +62,11 @@ public ResponseEntity<ApiResponse<List<CommentResponseDTO.CommentDetailDTO>>> ge
         List<CommentResponseDTO.CommentDetailDTO> filteredWinners = commentService.getCommentsByKeyword(eventId, keyword, account.userId());
         return ResponseEntity.ok(ApiResponse.of(filteredWinners));
     }
+
+    @DeleteMapping("/")
+    @Operation(summary = "댓글 이벤트 당첨자 리스트 삭제 API(당첨자 재추첨 시, 기존 당첨자 리스트를 삭제한 후 진행해야 합니다.", description = "모든 당첨자들의 isWinner 값을 false로 변경합니다.")
+    public ResponseEntity<ApiResponse<Void>> deleteWinners(@RequestParam("eventId") Long eventId, @CurrentAccount Account account) {
+        commentService.deleteWinners(eventId);
+        return ResponseEntity.ok(ApiResponse.of(ResponseCode.SUCCESS));
+    }
 }

src/main/java/com/cmc/suppin/event/crawl/controller/CrawlApi.java

@@ -1,5 +1,6 @@
 package com.cmc.suppin.event.crawl.controller;
 
+import com.cmc.suppin.event.crawl.controller.dto.CrawlResponseDTO;
 import com.cmc.suppin.event.crawl.service.CrawlService;
 import com.cmc.suppin.global.response.ApiResponse;
 import com.cmc.suppin.global.response.ResponseCode;
@@ -51,9 +52,9 @@ public ResponseEntity<ApiResponse<String>> checkExistingComments(@RequestParam("
                     "크롤링하려는 URL이 중복되지 않았을 때의 요청이기 때문에, 새로운 댓글을 크롤링합니다. <br>" +
                     "- DB에 기존 댓글이 존재하는 경우: 크롤링을 중지하고 예외를 던집니다. <br>" +
                     "- DB에 기존 댓글이 존재하지 않는 경우: 새로운 댓글을 크롤링하고 이를 DB에 저장합니다.")
-    public ResponseEntity<ApiResponse<String>> crawlYoutubeComments(@RequestParam("url") String url, @RequestParam("eventId") Long eventId, @RequestParam("forceUpdate") boolean forceUpdate, @CurrentAccount Account account) {
-        crawlService.crawlYoutubeComments(url, eventId, account.userId(), forceUpdate);
-        return ResponseEntity.ok(ApiResponse.of(ResponseCode.SUCCESS, "댓글 수집이 완료되었습니다."));
+    public ResponseEntity<ApiResponse<CrawlResponseDTO.CrawlResultDTO>> crawlYoutubeComments(@RequestParam("url") String url, @RequestParam("eventId") Long eventId, @RequestParam("forceUpdate") boolean forceUpdate, @CurrentAccount Account account) {
+        CrawlResponseDTO.CrawlResultDTO crawlResultDTO = crawlService.crawlYoutubeComments(url, eventId, account.userId(), forceUpdate);
+        return ResponseEntity.ok(ApiResponse.of(ResponseCode.SUCCESS, crawlResultDTO));
     }
 
 //    @GetMapping("/count")

src/main/java/com/cmc/suppin/event/crawl/controller/dto/CommentRequestDTO.java

@@ -1,6 +1,5 @@
 package com.cmc.suppin.event.crawl.controller.dto;
 
-import jakarta.validation.constraints.Pattern;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -27,14 +26,10 @@ public static class CommentListRequestDTO {
     @Builder
     public static class WinnerRequestDTO {
         private Long eventId;
-        private int winnerCount;
-        private int minLength;
-
-        @Pattern(regexp = "\\d{4}\\. \\d{2}\\. \\d{2} \\d{2}:\\d{2}", message = "날짜 형식은 yyyy. MM. dd HH:mm 이어야 합니다.")
+        private Integer winnerCount;
+        private Integer minLength;
         private String startDate;
-        @Pattern(regexp = "\\d{4}\\. \\d{2}\\. \\d{2} \\d{2}:\\d{2}", message = "날짜 형식은 yyyy. MM. dd HH:mm 이어야 합니다.")
         private String endDate;
-
         private List<String> keywords;
     }
 }

src/main/java/com/cmc/suppin/event/crawl/controller/dto/CommentResponseDTO.java

@@ -41,4 +41,27 @@ public static class WinnerResponseDTO {
         private String endDate;
         private List<CommentDetailDTO> winners;
     }
+
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Builder
+    public static class CommentEventWinnersWithCriteria {
+        private Integer winnerCount;
+        private Integer minLength;
+        private String startDate;
+        private String endDate;
+        private List<String> keywords;
+        private List<CommentEventWinners> winners;
+    }
+
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Builder
+    public static class CommentEventWinners {
+        private String author;
+        private String commentText;
+        private String commentDate;
+    }
 }

src/main/java/com/cmc/suppin/event/crawl/controller/dto/CrawlResponseDTO.java

@@ -12,8 +12,7 @@ public class CrawlResponseDTO {
     @NoArgsConstructor
     @AllArgsConstructor
     public static class CrawlResultDTO {
-        private String author;
-        private String commentText;
-        private String date;
+        private String crawlTime;
+        private int totalCommentCount;
     }
 }

src/main/java/com/cmc/suppin/event/crawl/converter/CommentConverter.java

@@ -2,6 +2,7 @@
 
 import com.cmc.suppin.event.crawl.controller.dto.CommentRequestDTO;
 import com.cmc.suppin.event.crawl.controller.dto.CommentResponseDTO;
+import com.cmc.suppin.event.crawl.controller.dto.CrawlResponseDTO;
 import com.cmc.suppin.event.crawl.domain.Comment;
 import com.cmc.suppin.event.events.domain.Event;
 
@@ -56,5 +57,20 @@ public static CommentResponseDTO.WinnerResponseDTO toWinnerResponseDTO(List<Comm
                 .winners(winnerDetails)
                 .build();
     }
+
+    public static CrawlResponseDTO.CrawlResultDTO toCrawlResultDTO(LocalDateTime crawlingDate, int totalCommentCount) {
+        return CrawlResponseDTO.CrawlResultDTO.builder()
+                .crawlTime(crawlingDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")))
+                .totalCommentCount(totalCommentCount)
+                .build();
+    }
+
+    public static CommentResponseDTO.CommentEventWinners toCommentEventWinners(Comment comment) {
+        return CommentResponseDTO.CommentEventWinners.builder()
+                .author(comment.getAuthor())
+                .commentText(comment.getCommentText())
+                .commentDate(comment.getCommentDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")))
+                .build();
+    }
 }
 

src/main/java/com/cmc/suppin/event/crawl/domain/Comment.java

@@ -38,4 +38,19 @@ public class Comment extends BaseDateTimeEntity {
     @Column(nullable = false)
     private LocalDateTime commentDate;
 
+    @Column(nullable = false)
+    private LocalDateTime crawlTime;
+
+    @Builder.Default
+    @Column(nullable = false)
+    private boolean isWinner = false;
+
+    public void setCrawlTime(LocalDateTime crawlTime) {
+        this.crawlTime = crawlTime;
+    }
+
+    public void setIsWinner(boolean isWinner) {
+        this.isWinner = isWinner;
+    }
+
 }

src/main/java/com/cmc/suppin/event/crawl/domain/repository/CommentRepository.java

@@ -24,4 +24,9 @@ public interface CommentRepository extends JpaRepository<Comment, Long> {
     List<Comment> findByEventIdAndCommentDateBetween(Long eventId, LocalDateTime start, LocalDateTime end);
 
     List<Comment> findByEventIdAndCommentTextContaining(Long eventId, String keyword);
+
+    List<Comment> findByEventIdAndIsWinnerTrue(Long eventId);
+
+
+    boolean existsByUrlAndEventId(String url, Long eventId);
 }