feat: 버블차트 API

kusitms-28th-Meetup-E · Nov 22, 2023 · 40c4c0e · 40c4c0e
1 parent 0b43ed1
commit 40c4c0e
Show file tree

Hide file tree

Showing 34 changed files with 219 additions and 156 deletions.
diff --git a/...orpheme/application/dto/req/TotalReq.java → ...ontents/application/dto/req/TotalReq.java b/...orpheme/application/dto/req/TotalReq.java → ...ontents/application/dto/req/TotalReq.java
@@ -1,4 +1,4 @@
-package gwangjang.server.domain.morpheme.application.dto.req;
+package gwangjang.server.domain.contents.application.dto.req;
 
 import lombok.*;
 

diff --git a/src/main/java/gwangjang/server/domain/contents/application/dto/res/BubbleChartRes.java b/src/main/java/gwangjang/server/domain/contents/application/dto/res/BubbleChartRes.java
@@ -0,0 +1,22 @@
+package gwangjang.server.domain.contents.application.dto.res;
+
+
+import lombok.*;
+
+@Getter
+@Builder
+@Setter
+@NoArgsConstructor
+public class BubbleChartRes {
+    String issueTitle;
+    String keyword;
+    String date;
+    Long rank;
+
+    public BubbleChartRes(String issueTitle, String keyword, String date, Long rank) {
+        this.issueTitle = issueTitle;
+        this.keyword = keyword;
+        this.date = date;
+        this.rank = rank;
+    }
+}
diff --git a/...lication/dto/res/ContentLikeCountRes.java → ...lication/dto/res/ContentLikeCountRes.java b/...lication/dto/res/ContentLikeCountRes.java → ...lication/dto/res/ContentLikeCountRes.java
@@ -1,6 +1,6 @@
-package gwangjang.server.domain.morpheme.application.dto.res;
+package gwangjang.server.domain.contents.application.dto.res;
 
-import gwangjang.server.domain.morpheme.domain.entity.constant.ApiType;
+import gwangjang.server.domain.contents.domain.entity.constant.ApiType;
 import lombok.*;
 
 @Getter

diff --git a/.../application/dto/res/ContentsDataRes.java → .../application/dto/res/ContentsDataRes.java b/.../application/dto/res/ContentsDataRes.java → .../application/dto/res/ContentsDataRes.java
@@ -1,4 +1,4 @@
-package gwangjang.server.domain.morpheme.application.dto.res;
+package gwangjang.server.domain.contents.application.dto.res;
 
 
 import lombok.*;

diff --git a/...heme/application/dto/res/ContentsRes.java → ...ents/application/dto/res/ContentsRes.java b/...heme/application/dto/res/ContentsRes.java → ...ents/application/dto/res/ContentsRes.java
@@ -1,9 +1,6 @@
-package gwangjang.server.domain.morpheme.application.dto.res;
+package gwangjang.server.domain.contents.application.dto.res;
 
-import gwangjang.server.domain.morpheme.domain.entity.Contents;
-import gwangjang.server.domain.morpheme.domain.entity.constant.ApiType;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
+import gwangjang.server.domain.contents.domain.entity.constant.ApiType;
 import lombok.*;
 
 @Getter

diff --git a/...pheme/application/dto/res/YoutubeRes.java → ...tents/application/dto/res/YoutubeRes.java b/...pheme/application/dto/res/YoutubeRes.java → ...tents/application/dto/res/YoutubeRes.java
@@ -1,7 +1,7 @@
-package gwangjang.server.domain.morpheme.application.dto.res;
+package gwangjang.server.domain.contents.application.dto.res;
 
 
-import gwangjang.server.domain.morpheme.domain.entity.Contents;
+import gwangjang.server.domain.contents.domain.entity.Contents;
 
 import java.util.List;
 

diff --git a/...me/application/mapper/ContentsMapper.java → ...ts/application/mapper/ContentsMapper.java b/...me/application/mapper/ContentsMapper.java → ...ts/application/mapper/ContentsMapper.java
@@ -1,8 +1,8 @@
-package gwangjang.server.domain.morpheme.application.mapper;
+package gwangjang.server.domain.contents.application.mapper;
 
 
-import gwangjang.server.domain.morpheme.application.dto.res.ContentsRes;
-import gwangjang.server.domain.morpheme.domain.entity.Contents;
+import gwangjang.server.domain.contents.application.dto.res.ContentsRes;
+import gwangjang.server.domain.contents.domain.entity.Contents;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;

diff --git a/...ion/service/ContentsSubscribeUseCase.java → ...ion/service/ContentsSubscribeUseCase.java b/...ion/service/ContentsSubscribeUseCase.java → ...ion/service/ContentsSubscribeUseCase.java
@@ -1,9 +1,9 @@
-package gwangjang.server.domain.morpheme.application.service;
+package gwangjang.server.domain.contents.application.service;
 
-import gwangjang.server.domain.morpheme.application.dto.res.ContentsDataRes;
-import gwangjang.server.domain.morpheme.domain.service.ContentsQueryService;
+import gwangjang.server.domain.contents.application.dto.res.BubbleChartRes;
+import gwangjang.server.domain.contents.application.dto.res.ContentsDataRes;
+import gwangjang.server.domain.contents.domain.service.ContentsQueryService;
 import gwangjang.server.global.feign.client.FindMemberFeignClient;
-import gwangjang.server.global.feign.dto.SubscribeIssueFeignRes;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -26,4 +26,8 @@ public List<ContentsDataRes> getContentsByIssue(String issue) {
 
         return contentsQueryService.getContentsByIssue(issue);
     }
+
+    public List<BubbleChartRes> getBubbleChart(String issueTitle) {
+        return contentsQueryService.getBubbleChart(issueTitle);
+    }
 }
diff --git a/...main/morpheme/domain/entity/Contents.java → ...main/contents/domain/entity/Contents.java b/...main/morpheme/domain/entity/Contents.java → ...main/contents/domain/entity/Contents.java
@@ -1,9 +1,8 @@
-package gwangjang.server.domain.morpheme.domain.entity;
+package gwangjang.server.domain.contents.domain.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import gwangjang.server.domain.like.domain.entity.ContentLike;
-import gwangjang.server.domain.morpheme.application.dto.res.ContentsRes;
-import gwangjang.server.domain.morpheme.domain.entity.constant.ApiType;
+import gwangjang.server.domain.contents.domain.entity.constant.ApiType;
 import gwangjang.server.global.entity.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;

diff --git a/.../domain/morpheme/domain/entity/Issue.java → .../domain/contents/domain/entity/Issue.java b/.../domain/morpheme/domain/entity/Issue.java → .../domain/contents/domain/entity/Issue.java
@@ -1,4 +1,4 @@
-package gwangjang.server.domain.morpheme.domain.entity;
+package gwangjang.server.domain.contents.domain.entity;
 
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;

diff --git a/.../domain/morpheme/domain/entity/Topic.java → .../domain/contents/domain/entity/Topic.java b/.../domain/morpheme/domain/entity/Topic.java → .../domain/contents/domain/entity/Topic.java
@@ -1,4 +1,4 @@
-package gwangjang.server.domain.morpheme.domain.entity;
+package gwangjang.server.domain.contents.domain.entity;
 
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;

diff --git a/...pheme/domain/entity/constant/ApiType.java → ...tents/domain/entity/constant/ApiType.java b/...pheme/domain/entity/constant/ApiType.java → ...tents/domain/entity/constant/ApiType.java
@@ -1,4 +1,4 @@
-package gwangjang.server.domain.morpheme.domain.entity.constant;
+package gwangjang.server.domain.contents.domain.entity.constant;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

diff --git a/.../repository/ContentsCustomRepository.java → .../repository/ContentsCustomRepository.java b/.../repository/ContentsCustomRepository.java → .../repository/ContentsCustomRepository.java
@@ -1,7 +1,9 @@
-package gwangjang.server.domain.morpheme.domain.repository;
+package gwangjang.server.domain.contents.domain.repository;
 
-import gwangjang.server.domain.morpheme.application.dto.res.ContentsDataRes;
-import gwangjang.server.domain.morpheme.domain.entity.Contents;
+import gwangjang.server.domain.contents.application.dto.res.BubbleChartRes;
+import gwangjang.server.domain.contents.application.dto.res.ContentsDataRes;
+import gwangjang.server.domain.contents.domain.entity.Contents;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 

diff --git a/...ository/ContentsCustomRepositoryImpl.java → ...ository/ContentsCustomRepositoryImpl.java b/...ository/ContentsCustomRepositoryImpl.java → ...ository/ContentsCustomRepositoryImpl.java
@@ -1,20 +1,26 @@
-package gwangjang.server.domain.morpheme.domain.repository;
+package gwangjang.server.domain.contents.domain.repository;
 
+import com.querydsl.core.Tuple;
+import com.querydsl.core.types.EntityPath;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.Expressions;
-import com.querydsl.core.types.dsl.NumberTemplate;
+import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
+import gwangjang.server.domain.contents.application.dto.res.BubbleChartRes;
+import gwangjang.server.domain.contents.domain.entity.constant.ApiType;
 import gwangjang.server.domain.like.domain.entity.QContentLike;
-import gwangjang.server.domain.morpheme.application.dto.res.ContentLikeCountRes;
-import gwangjang.server.domain.morpheme.application.dto.res.ContentsDataRes;
-import gwangjang.server.domain.morpheme.domain.entity.Contents;
-import gwangjang.server.domain.morpheme.domain.entity.QContents;
+import gwangjang.server.domain.contents.application.dto.res.ContentsDataRes;
+import gwangjang.server.domain.contents.domain.entity.Contents;
+import gwangjang.server.domain.contents.domain.entity.QContents;
 import jakarta.persistence.EntityManager;
-
+import com.querydsl.core.types.dsl.StringTemplate;
+import com.querydsl.core.types.dsl.StringExpression;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
-import static gwangjang.server.domain.morpheme.domain.entity.QContents.contents;
+import static com.querydsl.core.types.Projections.fields;
+import static gwangjang.server.domain.contents.domain.entity.QContents.contents;
 
 
 public class ContentsCustomRepositoryImpl implements ContentsCustomRepository {
@@ -86,5 +92,10 @@ public void updateContentsImageUrl(Integer contentsId, String newImageUrl) {
                 .execute();
     }
 
+
+
+
+
+
 }
 
diff --git a/src/main/java/gwangjang/server/domain/contents/domain/repository/ContentsRepository.java b/src/main/java/gwangjang/server/domain/contents/domain/repository/ContentsRepository.java
@@ -0,0 +1,33 @@
+package gwangjang.server.domain.contents.domain.repository;
+
+import gwangjang.server.domain.contents.application.dto.res.BubbleChartRes;
+import gwangjang.server.domain.contents.domain.entity.Contents;
+import gwangjang.server.domain.contents.domain.entity.constant.ApiType;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ContentsRepository extends JpaRepository<Contents, Integer>,ContentsCustomRepository{
+
+    List<Contents> findByType(ApiType type);
+    List<Contents> findByIssueTitleLike(String issue);
+    List<Contents> findByKeywordLikeAndTypeOrderByPubDateDesc(String issueTitle, ApiType type);
+
+    @Query(
+            value = "SELECT issue_title, keyword, MAX(month) AS max_occurrence_date, MAX(occurrences) AS max_occurrences\n" +
+                    "FROM (\n" +
+                    "    SELECT issue_title, keyword, SUBSTRING(pub_date, 1, 7) AS month, COUNT(*) AS occurrences\n" +
+                    "    FROM contents\n" +
+                    "    WHERE TYPE = 'YOUTUBE'\n" +
+                    "    GROUP BY issue_title, keyword, month\n" +
+                    ") AS subquery\n" +
+                    "GROUP BY issue_title, keyword\n" +
+                    "ORDER BY max_occurrences DESC",
+            nativeQuery = true)
+    List<Object[]> findMaxOccurrencesByIssueAndKeyword();
+
+
+}
diff --git a/src/main/java/gwangjang/server/domain/contents/domain/service/ContentsQueryService.java b/src/main/java/gwangjang/server/domain/contents/domain/service/ContentsQueryService.java
@@ -0,0 +1,56 @@
+package gwangjang.server.domain.contents.domain.service;
+
+import gwangjang.server.domain.contents.application.dto.req.TotalReq;
+import gwangjang.server.domain.contents.application.dto.res.BubbleChartRes;
+import gwangjang.server.domain.contents.application.dto.res.ContentsDataRes;
+import gwangjang.server.domain.contents.domain.repository.ContentsRepository;
+import gwangjang.server.global.annotation.DomainService;
+import gwangjang.server.global.feign.client.FindKeywordFeignClient;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@DomainService
+@RequiredArgsConstructor
+public class ContentsQueryService {
+    private final ContentsRepository contentsRepository;
+    private final FindKeywordFeignClient findKeywordFeignClient;
+
+    public List<ContentsDataRes> getContentsByIssue(String issue) {
+        return contentsRepository.getContentsByIssueId(issue);
+    }
+    public List<BubbleChartRes> getBubbleChart(String issue) {
+        List<TotalReq> keywordList = findKeywordFeignClient.getAll().getBody().getData();
+        Map<String, Long> keywordIdMap = keywordList.stream()
+                .collect(Collectors.toMap(keyword -> keyword.getIssueTitle() + " " + keyword.getKeyword(), TotalReq::getKeywordId));
+
+        return contentsRepository.findMaxOccurrencesByIssueAndKeyword().stream()
+                .filter(objects -> {
+                    String issueTitle = (String) objects[0];
+                    return issueTitle.contains(issue);
+                })
+                .map(objects -> {
+                    String issueTitle = (String) objects[0];
+                    String keyword = (String) objects[1];
+                    String date = (String) objects[2];
+                    Long count = (Long) objects[3];
+
+                    // Construct the key to look up keywordId in the map
+                    String key = issueTitle + keyword;
+                    Long keywordId = keywordIdMap.getOrDefault(key, null);
+
+                    return new BubbleChartRes(issueTitle, keyword, date, keywordId != null ? keywordId : count);
+                })
+                .collect(Collectors.toList());
+    }
+
+
+
+
+
+}
diff --git a/...pheme/domain/service/ContentsService.java → ...tents/domain/service/ContentsService.java b/...pheme/domain/service/ContentsService.java → ...tents/domain/service/ContentsService.java
@@ -1,11 +1,7 @@
-package gwangjang.server.domain.morpheme.domain.service;
-import gwangjang.server.domain.morpheme.application.dto.res.ContentsRes;
-import gwangjang.server.domain.morpheme.domain.entity.Contents;
-import gwangjang.server.domain.morpheme.domain.entity.constant.ApiType;
+package gwangjang.server.domain.contents.domain.service;
+import gwangjang.server.domain.contents.application.dto.res.ContentsRes;
+import gwangjang.server.domain.contents.domain.entity.constant.ApiType;
 import gwangjang.server.global.annotation.DomainService;
-import jakarta.transaction.Transactional;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 
 import java.util.List;

diff --git a/...e/domain/service/ContentsServiceImpl.java → ...s/domain/service/ContentsServiceImpl.java b/...e/domain/service/ContentsServiceImpl.java → ...s/domain/service/ContentsServiceImpl.java
@@ -1,14 +1,11 @@
-package gwangjang.server.domain.morpheme.domain.service;
+package gwangjang.server.domain.contents.domain.service;
 
-import gwangjang.server.domain.like.domain.entity.ContentLike;
 import gwangjang.server.domain.like.domain.repository.LikeRepository;
-import gwangjang.server.domain.morpheme.application.dto.res.ContentLikeCountRes;
-import gwangjang.server.domain.morpheme.application.dto.res.ContentsRes;
-import gwangjang.server.domain.morpheme.application.mapper.ContentsMapper;
-import gwangjang.server.domain.morpheme.domain.entity.Contents;
-import gwangjang.server.domain.morpheme.domain.entity.constant.ApiType;
-import gwangjang.server.domain.morpheme.domain.repository.ContentsRepository;
-import gwangjang.server.domain.morpheme.domain.service.ContentsService;
+import gwangjang.server.domain.contents.application.dto.res.ContentsRes;
+import gwangjang.server.domain.contents.application.mapper.ContentsMapper;
+import gwangjang.server.domain.contents.domain.entity.Contents;
+import gwangjang.server.domain.contents.domain.entity.constant.ApiType;
+import gwangjang.server.domain.contents.domain.repository.ContentsRepository;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.json.JSONArray;

diff --git a/...domain/service/ImageUrlUpdateService.java → ...domain/service/ImageUrlUpdateService.java b/...domain/service/ImageUrlUpdateService.java → ...domain/service/ImageUrlUpdateService.java
@@ -1,9 +1,9 @@
-package gwangjang.server.domain.morpheme.domain.service;
+package gwangjang.server.domain.contents.domain.service;
 
-import gwangjang.server.domain.morpheme.application.dto.res.ContentsRes;
-import gwangjang.server.domain.morpheme.application.mapper.ContentsMapper;
-import gwangjang.server.domain.morpheme.domain.entity.Contents;
-import gwangjang.server.domain.morpheme.domain.repository.ContentsRepository;
+import gwangjang.server.domain.contents.application.dto.res.ContentsRes;
+import gwangjang.server.domain.contents.application.mapper.ContentsMapper;
+import gwangjang.server.domain.contents.domain.entity.Contents;
+import gwangjang.server.domain.contents.domain.repository.ContentsRepository;
 import jakarta.transaction.Transactional;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;

diff --git a/...rpheme/domain/service/NewsAPIService.java → ...ntents/domain/service/NewsAPIService.java b/...rpheme/domain/service/NewsAPIService.java → ...ntents/domain/service/NewsAPIService.java
@@ -1,11 +1,9 @@
-package gwangjang.server.domain.morpheme.domain.service;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import gwangjang.server.domain.morpheme.application.dto.res.ContentsRes;
-import gwangjang.server.domain.morpheme.application.mapper.ContentsMapper;
-import gwangjang.server.domain.morpheme.domain.entity.Contents;
-import gwangjang.server.domain.morpheme.domain.entity.constant.ApiType;
-import gwangjang.server.domain.morpheme.domain.repository.ContentsRepository;
+package gwangjang.server.domain.contents.domain.service;
+
+import gwangjang.server.domain.contents.application.dto.res.ContentsRes;
+import gwangjang.server.domain.contents.application.mapper.ContentsMapper;
+import gwangjang.server.domain.contents.domain.entity.constant.ApiType;
+import gwangjang.server.domain.contents.domain.repository.ContentsRepository;
 import gwangjang.server.global.annotation.DomainService;
 import jakarta.transaction.Transactional;
 import org.json.simple.JSONArray;
@@ -14,7 +12,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 

diff --git a/...heme/domain/service/ScheduledService.java → ...ents/domain/service/ScheduledService.java b/...heme/domain/service/ScheduledService.java → ...ents/domain/service/ScheduledService.java
@@ -1,13 +1,10 @@
-package gwangjang.server.domain.morpheme.domain.service;
+package gwangjang.server.domain.contents.domain.service;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import gwangjang.server.domain.morpheme.application.dto.req.TotalReq;
-import gwangjang.server.domain.morpheme.application.service.ContentsSubscribeUseCase;
+import gwangjang.server.domain.contents.application.dto.req.TotalReq;
 import gwangjang.server.global.annotation.DomainService;
 import gwangjang.server.global.feign.client.FindKeywordFeignClient;
 import lombok.RequiredArgsConstructor;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 
 import java.util.List;