Merge pull request #40 from Central-MakeUs/refactor/39

Refactor/39: 이벤트 관련 API 리팩토링-1
Central-MakeUs · Aug 15, 2024 · 47c94a7 · 47c94a7
2 parents df538bd + 613e5b4
commit 47c94a7
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 12 deletions.
diff --git a/src/main/java/com/cmc/suppin/event/crawl/controller/dto/CrawlResponseDTO.java b/src/main/java/com/cmc/suppin/event/crawl/controller/dto/CrawlResponseDTO.java
@@ -12,7 +12,7 @@ public class CrawlResponseDTO {
     @NoArgsConstructor
     @AllArgsConstructor
     public static class CrawlResultDTO {
-        private String crawlingDate;
+        private String crawlTime;
         private int totalCommentCount;
     }
 }
diff --git a/src/main/java/com/cmc/suppin/event/crawl/converter/CommentConverter.java b/src/main/java/com/cmc/suppin/event/crawl/converter/CommentConverter.java
@@ -60,7 +60,7 @@ public static CommentResponseDTO.WinnerResponseDTO toWinnerResponseDTO(List<Comm
 
     public static CrawlResponseDTO.CrawlResultDTO toCrawlResultDTO(LocalDateTime crawlingDate, int totalCommentCount) {
         return CrawlResponseDTO.CrawlResultDTO.builder()
-                .crawlingDate(crawlingDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")))
+                .crawlTime(crawlingDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")))
                 .totalCommentCount(totalCommentCount)
                 .build();
     }

diff --git a/src/main/java/com/cmc/suppin/event/crawl/domain/Comment.java b/src/main/java/com/cmc/suppin/event/crawl/domain/Comment.java
@@ -38,4 +38,11 @@ public class Comment extends BaseDateTimeEntity {
     @Column(nullable = false)
     private LocalDateTime commentDate;
 
+    @Column(nullable = false)
+    private LocalDateTime crawlTime;
+
+    public void setCrawlTime(LocalDateTime crawlTime) {
+        this.crawlTime = crawlTime;
+    }
+
 }
diff --git a/src/main/java/com/cmc/suppin/event/crawl/service/CommentService.java b/src/main/java/com/cmc/suppin/event/crawl/service/CommentService.java
@@ -48,7 +48,7 @@ public CommentResponseDTO.CrawledCommentListDTO getComments(Long eventId, String
 
         int totalComments = commentRepository.countByEventIdAndUrl(eventId, url);
 
-        String crawlTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy. MM. dd HH:mm"));
+        String crawlTime = comments.isEmpty() ? "" : comments.getContent().get(0).getCrawlTime().format(DateTimeFormatter.ofPattern("yyyy. MM. dd HH:mm"));
 
         return CommentConverter.toCommentListDTO(comments.getContent(), crawlTime, totalComments);
     }

diff --git a/src/main/java/com/cmc/suppin/event/crawl/service/CrawlService.java b/src/main/java/com/cmc/suppin/event/crawl/service/CrawlService.java
@@ -118,6 +118,8 @@ public CrawlResponseDTO.CrawlResultDTO crawlYoutubeComments(String url, Long eve
 
                 currentCommentCount = comments.size();
 
+                LocalDateTime crawlTime = LocalDateTime.now();
+
                 for (Element commentElement : comments) {
                     String author = commentElement.select("#author-text span").text();
                     String text = commentElement.select("#content yt-attributed-string#content-text").text();
@@ -129,6 +131,7 @@ public CrawlResponseDTO.CrawlResultDTO crawlYoutubeComments(String url, Long eve
                         // 엔티티 저장
                         LocalDateTime actualCommentDate = DateConverter.convertRelativeTime(time);
                         Comment comment = CommentConverter.toCommentEntity(author, text, actualCommentDate, url, event);
+                        comment.setCrawlTime(crawlTime);
                         commentRepository.save(comment);
                     }
                 }
@@ -137,7 +140,6 @@ public CrawlResponseDTO.CrawlResultDTO crawlYoutubeComments(String url, Long eve
                 if (currentCommentCount == previousCommentCount) {
                     break; // 새로운 댓글이 로드되지 않으면 루프를 종료합니다.
                 }
-
                 previousCommentCount = currentCommentCount;
             }
         } catch (InterruptedException e) {

diff --git a/src/main/java/com/cmc/suppin/event/events/controller/dto/EventResponseDTO.java b/src/main/java/com/cmc/suppin/event/events/controller/dto/EventResponseDTO.java
@@ -26,7 +26,8 @@ public static class EventInfoDTO {
         private Integer surveyCount;
         private Integer commentCount;
         private EventStatus status;
-
+        private Long surveyId;
+        private String uuid;
     }
 
     @Builder

diff --git a/src/main/java/com/cmc/suppin/event/events/converter/EventConverter.java b/src/main/java/com/cmc/suppin/event/events/converter/EventConverter.java
@@ -3,6 +3,7 @@
 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.event.survey.domain.Survey;
 import com.cmc.suppin.global.enums.EventType;
 import com.cmc.suppin.member.domain.Member;
 
@@ -64,6 +65,11 @@ public static EventResponseDTO.EventInfoDTO toEventInfoDTO(Event event) {
                 .mapToInt(survey -> survey.getAnonymousParticipantList().size())
                 .sum();
 
+        // 이벤트에 설문이 존재하는 경우 surveyId와 uuid 값을 설정
+        Survey survey = event.getSurveyList().stream().findFirst().orElse(null);
+        Long surveyId = (survey != null) ? survey.getId() : null;
+        String uuid = (survey != null) ? survey.getUuid() : null;
+
         return EventResponseDTO.EventInfoDTO.builder()
                 .eventId(event.getId())
                 .type(event.getType())
@@ -75,6 +81,8 @@ public static EventResponseDTO.EventInfoDTO toEventInfoDTO(Event event) {
                 .surveyCount(surveyAnswerCount)
                 .commentCount(event.getCommentList().size())
                 .status(event.getStatus())
+                .surveyId(surveyId)
+                .uuid(uuid)
                 .build();
     }
 

diff --git a/src/main/java/com/cmc/suppin/event/survey/controller/SurveyApi.java b/src/main/java/com/cmc/suppin/event/survey/controller/SurveyApi.java
@@ -34,10 +34,24 @@ public ResponseEntity<ApiResponse<SurveyResponseDTO.SurveyCreateResponse>> creat
         return ResponseEntity.ok(ApiResponse.of(response));
     }
 
-    @GetMapping("/{surveyId}")
-    @Operation(summary = "설문지 조회 API", description = "생성된 설문지 전체 정보를 조회합니다. 자세한 요청 및 응답 형식은 노션 API 문서를 참고해주세요.")
-    public ResponseEntity<ApiResponse<SurveyResponseDTO.SurveyResultDTO>> getSurvey(@PathVariable("surveyId") Long surveyId) {
-        SurveyResponseDTO.SurveyResultDTO response = surveyService.getSurvey(surveyId);
+    @GetMapping("/view")
+    @Operation(summary = "설문지 조회 API", description = "생성된 설문지 전체 정보를 조회합니다. surveyId와 uuid, 둘 중 하나로 요청할 수 있습니다.")
+    public ResponseEntity<ApiResponse<SurveyResponseDTO.SurveyResultDTO>> getSurvey(
+            @Parameter(description = "required = false")
+            @RequestParam(value = "surveyId", required = false) Long surveyId,
+            @Parameter(description = "required = false")
+            @RequestParam(value = "uuid", required = false) String uuid) {
+
+        SurveyResponseDTO.SurveyResultDTO response;
+
+        if (uuid != null) {
+            response = surveyService.getSurveyByUuid(uuid);
+        } else if (surveyId != null) {
+            response = surveyService.getSurvey(surveyId);
+        } else {
+            throw new IllegalArgumentException("Either surveyId or uuid must be provided");
+        }
+
         return ResponseEntity.ok(ApiResponse.of(response));
     }
 

diff --git a/src/main/java/com/cmc/suppin/event/survey/domain/repository/SurveyRepository.java b/src/main/java/com/cmc/suppin/event/survey/domain/repository/SurveyRepository.java
@@ -3,7 +3,8 @@
 import com.cmc.suppin.event.survey.domain.Survey;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface SurveyRepository extends JpaRepository<Survey, Long> {
-
+import java.util.Optional;
 
+public interface SurveyRepository extends JpaRepository<Survey, Long> {
+    Optional<Survey> findByUuid(String uuid);
 }
diff --git a/src/main/java/com/cmc/suppin/event/survey/service/SurveyService.java b/src/main/java/com/cmc/suppin/event/survey/service/SurveyService.java
@@ -92,6 +92,15 @@ public SurveyResponseDTO.SurveyResultDTO getSurvey(Long surveyId) {
         return SurveyConverter.toSurveyResultDTO(survey, event);
     }
 
+    @Transactional(readOnly = true)
+    public SurveyResponseDTO.SurveyResultDTO getSurveyByUuid(String uuid) {
+        Survey survey = surveyRepository.findByUuid(uuid)
+                .orElseThrow(() -> new IllegalArgumentException("Survey not found for UUID: " + uuid));
+
+        Event event = survey.getEvent();
+        return SurveyConverter.toSurveyResultDTO(survey, event);
+    }
+
     // 설문 응답 저장
     @Transactional
     public void saveSurveyAnswers(SurveyRequestDTO.SurveyAnswerDTO request) {

diff --git a/src/main/java/com/cmc/suppin/global/security/config/WebMvcConfig.java b/src/main/java/com/cmc/suppin/global/security/config/WebMvcConfig.java
@@ -39,7 +39,8 @@ private String[] getAllowOrigins() {
                 "https://api.suppin.store",
                 "https://suppin.store",
                 "http://192.168.200.120:3000",  // 테스트 디바이스 IP 허용
-                "https://coherent-midge-probably.ngrok-free.app"
+                "https://coherent-midge-probably.ngrok-free.app",
+                "https://suppin-servey.vercel.app/"
         ).toArray(String[]::new);
     }
 }
diff --git a/src/main/java/com/cmc/suppin/global/security/config/WebSecurityConfig.java b/src/main/java/com/cmc/suppin/global/security/config/WebSecurityConfig.java
@@ -122,6 +122,7 @@ private RequestMatcher[] requestPermitAll() {
                 antMatcher("/api/v1/members/join/**"),
                 antMatcher("/api/v1/members/checkUserId"),
                 antMatcher("/api/v1/members/checkEmail"),
+                antMatcher("/api/v1/survey/view/**"),
                 antMatcher("/api/v1/survey/reply/**")   // 설문조사 응답 시 적용
         );
         return requestMatchers.toArray(RequestMatcher[]::new);