Merge pull request #45 from kusitms-28th-Meetup-E/feat/contents

Feat/contents
kusitms-28th-Meetup-E · Nov 26, 2023 · 9da0cb1 · 9da0cb1
2 parents e8d9daf + 2a1f497
commit 9da0cb1
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 21 deletions.
diff --git a/src/main/java/gwangjang/server/domain/contents/application/dto/res/ContentsLikeCount.java b/src/main/java/gwangjang/server/domain/contents/application/dto/res/ContentsLikeCount.java
@@ -0,0 +1,54 @@
+package gwangjang.server.domain.contents.application.dto.res;
+
+import gwangjang.server.domain.contents.domain.entity.constant.ApiType;
+import io.swagger.models.auth.In;
+import lombok.*;
+
+@Getter
+@Builder
+@Setter
+@NoArgsConstructor
+public class ContentsLikeCount {
+    private Integer contentsId;
+    private String url;
+    private String title;
+    private String description;
+    private ApiType type;
+    private String issueTitle;
+    private String keyword;
+    private String pubDate;
+    private String topic;
+    private String imgUrl;
+    private long likeCount; // Change from int to long
+    private boolean userLiked;
+
+    public ContentsLikeCount(
+            Integer contentsId,
+            String url,
+            String title,
+            String description,
+            ApiType type,
+            String issueTitle,
+            String keyword,
+            String pubDate,
+            String topic,
+            String imgUrl,
+            long likeCount, // Change from int to long
+            boolean userLiked
+    ) {
+        this.contentsId = contentsId;
+        this.url = url;
+        this.title = title;
+        this.description = description;
+        this.type = type;
+        this.issueTitle = issueTitle;
+        this.keyword = keyword;
+        this.pubDate = pubDate;
+        this.topic = topic;
+        this.imgUrl = imgUrl;
+        this.likeCount = likeCount;
+        this.userLiked = userLiked;
+    }
+
+    // Add getters for all fields
+}
diff --git a/src/main/java/gwangjang/server/domain/contents/application/dto/res/ContentsRes.java b/src/main/java/gwangjang/server/domain/contents/application/dto/res/ContentsRes.java
@@ -20,4 +20,6 @@ public class ContentsRes {
     private String topic;
     private String imgUrl;
 
+    private Long likeCount;
+
 }
diff --git a/...main/java/gwangjang/server/domain/contents/application/dto/res/ContentsWithLikeCount.java b/...main/java/gwangjang/server/domain/contents/application/dto/res/ContentsWithLikeCount.java
@@ -0,0 +1,24 @@
+package gwangjang.server.domain.contents.application.dto.res;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import gwangjang.server.domain.contents.domain.entity.Contents;
+import gwangjang.server.domain.contents.domain.entity.constant.ApiType;
+
+public class ContentsWithLikeCount {
+    private Integer contents_id;
+    private String url;
+    private String title;
+    private String description;
+    ApiType type;
+    private String issueTitle;
+    private String keyword;
+    private String pubDate;
+    private String topic;
+    private String imgUrl;
+
+    private Long likeCount;
+
+    private long likeStatus;
+
+
+}
diff --git a/...ain/java/gwangjang/server/domain/contents/domain/repository/ContentsCustomRepository.java b/...ain/java/gwangjang/server/domain/contents/domain/repository/ContentsCustomRepository.java
@@ -2,14 +2,16 @@
 
 import gwangjang.server.domain.contents.application.dto.res.BubbleChartRes;
 import gwangjang.server.domain.contents.application.dto.res.ContentsDataRes;
+import gwangjang.server.domain.contents.application.dto.res.ContentsRes;
+import gwangjang.server.domain.contents.application.dto.res.ContentsWithLikeCount;
 import gwangjang.server.domain.contents.domain.entity.Contents;
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
 public interface ContentsCustomRepository {
     List<ContentsDataRes> getContentsByIssueId(String issue);
-    List<Contents> findAllOrderByLikeCountDesc();
+    List<ContentsWithLikeCount> findAllOrderByLikeCountDesc();
     List<Contents> findContentsByLoginId(String loginId);
     void updateContentsImageUrl(Integer contentsId, String newImageUrl);
 

diff --git a/...java/gwangjang/server/domain/contents/domain/repository/ContentsCustomRepositoryImpl.java b/...java/gwangjang/server/domain/contents/domain/repository/ContentsCustomRepositoryImpl.java
@@ -6,10 +6,9 @@
 import com.querydsl.core.types.dsl.Expressions;
 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.application.dto.res.*;
 import gwangjang.server.domain.contents.domain.entity.constant.ApiType;
 import gwangjang.server.domain.like.domain.entity.QContentLike;
-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;
@@ -47,12 +46,16 @@ public List<ContentsDataRes> getContentsByIssueId(String issue) {
                 .limit(10).fetch();
     }
 
-    public List<Contents> findAllOrderByLikeCountDesc() {
+    public List<ContentsWithLikeCount> findAllOrderByLikeCountDesc() {
         QContents contents = QContents.contents;
         QContentLike contentLike = QContentLike.contentLike;
 
-        List<Contents> result = queryFactory
-                .select(contents)
+        List<ContentsWithLikeCount> result = queryFactory
+                .select(Projections.constructor(
+                        ContentsWithLikeCount.class,
+                        contents,
+                        contentLike.likeId.count().as("likeCount")
+                ))
                 .from(contents)
                 .leftJoin(contentLike).on(contents.contents_id.eq(contentLike.contents.contents_id))
                 .groupBy(contents.contents_id)
@@ -93,9 +96,51 @@ public void updateContentsImageUrl(Integer contentsId, String newImageUrl) {
     }
 
 
-
-
-
+//    public List<ContentsLikeCount> searchContentsWithLikeCount(String keyword, ApiType type, String loginId) {
+//        QContents contents = QContents.contents;
+//        QContentLike contentLike = QContentLike.contentLike;
+//
+//        List<Tuple> result = queryFactory
+//                .select(
+//                        contents.contents_id,
+//                        contents.url,
+//                        contents.title,
+//                        contents.description,
+//                        contents.type,
+//                        contents.issueTitle,
+//                        contents.keyword,
+//                        contents.pubDate,
+//                        contents.topic,
+//                        contents.imgUrl,
+//                        contentLike.likeId.count().coalesce(0L).as("likeCount"),
+//                        contentLike.likeId.count().coalesce(0L)
+//                                .as("userLiked")
+//                )
+//                .from(contents)
+//                .leftJoin(contentLike).on(contents.contents_id.eq(contentLike.contents.contents_id).and(contentLike.loginId.eq(loginId)))
+//                .where(contents.keyword.containsIgnoreCase(keyword).and(contents.type.eq(type)))
+//                .groupBy(contents.contents_id, contents.url, contents.title, contents.description, contents.type, contents.issueTitle,
+//                        contents.keyword, contents.pubDate, contents.topic, contents.imgUrl)
+//                .fetch();
+//
+//        return result.stream()
+//                .map(tuple -> new ContentsLikeCount(
+//                        tuple.get(contents.contents_id),
+//                        tuple.get(contents.url),
+//                        tuple.get(contents.title),
+//                        tuple.get(contents.description),
+//                        tuple.get(contents.type),
+//                        tuple.get(contents.issueTitle),
+//                        tuple.get(contents.keyword),
+//                        tuple.get(contents.pubDate),
+//                        tuple.get(contents.topic),
+//                        tuple.get(contents.imgUrl),
+//                        tuple.get("likeCount", Integer.class), // Change to Integer.class
+//                        tuple.get("userLiked", Boolean.class)
+//                ))
+//                .collect(Collectors.toList());
+//
+//    }
 
 }
 
diff --git a/src/main/java/gwangjang/server/domain/contents/domain/service/ContentsService.java b/src/main/java/gwangjang/server/domain/contents/domain/service/ContentsService.java
@@ -1,5 +1,6 @@
 package gwangjang.server.domain.contents.domain.service;
 import gwangjang.server.domain.contents.application.dto.res.ContentsRes;
+import gwangjang.server.domain.contents.application.dto.res.ContentsWithLikeCount;
 import gwangjang.server.domain.contents.domain.entity.constant.ApiType;
 import gwangjang.server.global.annotation.DomainService;
 import reactor.core.publisher.Mono;
@@ -13,7 +14,7 @@ public interface ContentsService {
     List<ContentsRes> getContentsTitle(String issue, ApiType type);
     List<ContentsRes> getKeywordAndType(String Keyword, ApiType apiType);
     ContentsRes getContentsById(Integer contentsId);
-    List<ContentsRes> getContentLikeCount();
+    List<ContentsWithLikeCount> getContentLikeCount();
     List<ContentsRes> findContentsByLoginId(String loginId);
 
 }

diff --git a/src/main/java/gwangjang/server/domain/contents/domain/service/ContentsServiceImpl.java b/src/main/java/gwangjang/server/domain/contents/domain/service/ContentsServiceImpl.java
@@ -1,5 +1,6 @@
 package gwangjang.server.domain.contents.domain.service;
 
+import gwangjang.server.domain.contents.application.dto.res.ContentsWithLikeCount;
 import gwangjang.server.domain.like.domain.repository.LikeRepository;
 import gwangjang.server.domain.contents.application.dto.res.ContentsRes;
 import gwangjang.server.domain.contents.application.mapper.ContentsMapper;
@@ -162,7 +163,7 @@ public List<ContentsRes> getContents(ApiType type) {
     }
 
     public List<ContentsRes> getContentsTitle(String issue, ApiType type) {
-        List<Contents> contents = contentsRepository.findByIssueTitleLikeAndType("%" + issue + "%", type);
+        List<Contents> contents = contentsRepository.findByIssueTitleLikeAndType("%" + issue + "%", type).subList(0,20);
         return contents.stream()
                 .map(contentsMapper::toDto)
                 .collect(Collectors.toList());
@@ -181,12 +182,10 @@ public ContentsRes getContentsById(Integer contentsId) {
         return contentsMapper.toDto(contents);
     }
 
-    public List<ContentsRes> getContentLikeCount(){
-        List<Contents> contents = contentsRepository.findAllOrderByLikeCountDesc();
+    public List<ContentsWithLikeCount> getContentLikeCount(){
+        List<ContentsWithLikeCount> contents = contentsRepository.findAllOrderByLikeCountDesc();
 
-        return contents.stream()
-                .map(contentsMapper::toDto)
-                .collect(Collectors.toList());
+        return contents;
     }
     public List<ContentsRes> findContentsByLoginId(String loginId){
         List<Contents> contents = contentsRepository.findContentsByLoginId(loginId);

diff --git a/src/main/java/gwangjang/server/domain/contents/presentation/ContentsController.java b/src/main/java/gwangjang/server/domain/contents/presentation/ContentsController.java
@@ -1,9 +1,6 @@
 package gwangjang.server.domain.contents.presentation;
 
-import gwangjang.server.domain.contents.application.dto.res.BubbleChartRes;
-import gwangjang.server.domain.contents.application.dto.res.BubbleFrontRes;
-import gwangjang.server.domain.contents.application.dto.res.ContentsDataRes;
-import gwangjang.server.domain.contents.application.dto.res.ContentsRes;
+import gwangjang.server.domain.contents.application.dto.res.*;
 import gwangjang.server.domain.contents.application.service.ContentsSubscribeUseCase;
 
 import gwangjang.server.domain.contents.domain.entity.constant.ApiType;
@@ -64,7 +61,7 @@ public ResponseEntity<SuccessResponse<String>> getNaverContents() {
         return ResponseEntity.ok(SuccessResponse.create(GET_CONTENTS_SUCCESS.getMessage(),this.newsAPIService.naverAPI("test")));
     }
     @GetMapping("/contents/like")
-    public ResponseEntity<SuccessResponse<List<ContentsRes>>> getContentLikeCount() {
+    public ResponseEntity<SuccessResponse<List<ContentsWithLikeCount>>> getContentLikeCount() {
         return ResponseEntity.ok(SuccessResponse.create(GET_CONTENTS_SUCCESS.getMessage(),this.contentsService.getContentLikeCount()));
     }
     @PostMapping("/my-page/like")