Merge remote-tracking branch 'origin/develop' into OPS-360-BE-refactor-folder-datasource-리펙토링

Author: yonggi1234

src/main/java/org/tuna/zoopzoop/backend/BackendApplication.java

@@ -2,8 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 @SpringBootApplication
+@EnableJpaAuditing
 public class BackendApplication {
     public static void main(String[] args) {
         SpringApplication.run(BackendApplication.class, args);

src/main/java/org/tuna/zoopzoop/backend/domain/auth/controller/ApiV1AuthController.java

@@ -130,6 +130,7 @@ public ResponseEntity<RsData<Void>> refreshToken(
      */
     @GetMapping("/result")
     @Operation(summary = "확장프로그램 백그라운드 풀링 대응 API")
+    @CrossOrigin(origins = "*")
     public ResponseEntity<RsData<AuthResultData>> pullingResult(
             @RequestParam String state
     ) {

src/main/java/org/tuna/zoopzoop/backend/domain/auth/entity/AuthResult.java

@@ -20,7 +20,7 @@ public void put(String state, String accessToken, String sessionId) {
 
     public AuthResultData get(String state) {
         AuthResultData data = redisTemplate.opsForValue().get(PREFIX + state);
-        if (data != null) redisTemplate.delete("auth:" + state);
+        if (data != null) redisTemplate.delete(PREFIX + state);
         return data;
     }
 }

src/main/java/org/tuna/zoopzoop/backend/domain/auth/handler/OAuth2SuccessHandler.java

@@ -92,6 +92,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
             if ("extension".equals(source)) {
                 authResult.put(customState, accessToken, sessionId);
                 response.sendRedirect(redirect_domain + "/extension/success");
+                response.flushBuffer();
                 return;
             }
         }

src/main/java/org/tuna/zoopzoop/backend/domain/datasource/crawler/dto/SpecificSiteDto.java

@@ -9,4 +9,14 @@ public record SpecificSiteDto(
         String imageUrl, // 썸네일 이미지 url
         String source // 출처
 ) {
+    @Override
+    public String toString() {
+        return "SpecificSiteDto {\n" +
+                "  title='" + title + "',\n" +
+                "  dataCreatedDate=" + dataCreatedDate + ",\n" +
+                "  content='" + content + "',\n" +
+                "  imageUrl='" + imageUrl + "',\n" +
+                "  source='" + source + "'\n" +
+                "}";
+    }
 }

src/main/java/org/tuna/zoopzoop/backend/domain/datasource/crawler/service/SupportedDomain.java

@@ -2,7 +2,8 @@
 
 public enum SupportedDomain {
     NAVERNEWS("n.news.naver.com"),
-    NAVERBLOG("blog.naver.com");
+    NAVERBLOG("blog.naver.com"),
+    VELOG("velog.io");
 
     private final String domain;
 

src/main/java/org/tuna/zoopzoop/backend/domain/datasource/crawler/service/VelogCrawler.java

@@ -0,0 +1,62 @@
+package org.tuna.zoopzoop.backend.domain.datasource.crawler.service;
+
+import org.jsoup.nodes.Document;
+import org.springframework.stereotype.Component;
+import org.tuna.zoopzoop.backend.domain.datasource.crawler.dto.CrawlerResult;
+import org.tuna.zoopzoop.backend.domain.datasource.crawler.dto.SpecificSiteDto;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+@Component
+public class VelogCrawler implements Crawler{
+    private static final SupportedDomain DOMAIN = SupportedDomain.VELOG;
+    private static final DateTimeFormatter VELOG_FORMATTER = DateTimeFormatter.ofPattern("yyyy년 M월 d일");
+
+    @Override
+    public boolean supports(String domain) {
+        return domain.contains(DOMAIN.getDomain());
+    }
+
+    @Override
+    public CrawlerResult<?> extract(Document doc) {
+        // 제목
+        String title = doc.selectFirst("meta[property=og:title]").attr("content");
+
+        // 작성 날짜
+        String publishedAt = doc.selectFirst(
+                "div.information > span:not([class])"
+        ).text();
+
+        LocalDate dataCreatedDate = transLocalDate(publishedAt);
+
+        // 내용(ai한테 줘야함)
+        String content = doc.selectFirst("div.atom-one").text();
+
+        // 썸네일 이미지 url
+        String imageUrl = doc.selectFirst("meta[property=og:image]").attr("content");
+
+        // 출처
+        String source = doc.selectFirst("span.username > a").text();
+
+        return new CrawlerResult<>(
+                CrawlerResult.CrawlerType.SPECIFIC,
+                new SpecificSiteDto(title, dataCreatedDate, content, imageUrl, source)
+        );
+    }
+
+    @Override
+    public LocalDate transLocalDate(String rawDate) {
+
+        if(rawDate.contains("일 전")){
+            int daysAgo = Integer.parseInt(rawDate.split("일 전")[0].trim());
+            return LocalDate.now().minusDays(daysAgo);
+        }else if(rawDate.contains("방금 전")) {
+            return LocalDate.now();
+        }else if(rawDate.contains("시간 전")||rawDate.contains("분 전")){
+            return LocalDate.now();
+        }
+
+        return LocalDate.parse(rawDate, VELOG_FORMATTER);
+    }
+}

src/main/java/org/tuna/zoopzoop/backend/domain/space/space/service/SpaceService.java

@@ -3,7 +3,6 @@
 import jakarta.persistence.NoResultException;
 import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
-import org.hibernate.service.spi.ServiceException;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
@@ -99,6 +98,7 @@ public Space createSpace(@NotBlank @Length(max = 50) String name, String thumbna
      * @return 삭제된 스페이스 이름
      * @throws IllegalArgumentException 스페이스가 존재하지 않을 경우
      */
+
     @Transactional
     public String deleteSpace(Integer spaceId) {
         Space space = spaceRepository.findById(spaceId)
@@ -118,6 +118,7 @@ public String deleteSpace(Integer spaceId) {
      * @throws IllegalArgumentException 스페이스가 존재하지 않을 경우
      * @throws DuplicateSpaceNameException 새로운 스페이스 이름이 중복될 경우
      */
+
     @Transactional
     public Space updateSpaceName(Integer spaceId, @NotBlank @Length(max = 50) String name) {
         Space space = spaceRepository.findById(spaceId)

src/main/resources/application-dev.yml

@@ -10,6 +10,17 @@ spring:
       ddl-auto: create-drop
     show-sql: true
 
+  data: #RedisTemplate 등을 사용하기 위한 직접 연결용
+    redis:
+      host: localhost
+      port: 6379
+      timeout: 6000
+  cache: #Spring Cache를 사용하기 위한 Redis
+    type: redis
+    redis:
+      time-to-live: 300000
+      cache-null-values: false
+
 app:
   seed:
     enabled: true

src/main/resources/application-server.yml

@@ -8,6 +8,18 @@ spring:
     hibernate:
       ddl-auto: update
 
+  data: #RedisTemplate 등을 사용하기 위한 직접 연결용
+    redis:
+      host: 10.0.1.246
+      port: 6379
+      timeout: 6000
+      password: zoopzoopRedisTest!
+  cache: #Spring Cache를 사용하기 위한 Redis
+    type: redis
+    redis:
+      time-to-live: 300000
+      cache-null-values: false
+
 management:
   endpoints:
     web: