Merge branch 'dev' into test

Kkokkomu · Sep 3, 2024 · 9990a00 · 9990a00
2 parents 7ba1198 + 5a84589
commit 9990a00
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/src/main/java/com/kkokkomu/short_news/comment/repository/CommentRepository.java b/src/main/java/com/kkokkomu/short_news/comment/repository/CommentRepository.java
@@ -19,9 +19,9 @@ public interface CommentRepository extends JpaRepository<Comment, Long> {
     SELECT c FROM Comment c 
     WHERE c.news.id = :newsId 
     AND c.id < :cursorId 
-    ORDER BY c.id DESC
+    ORDER BY c.editedAt DESC, c.id DESC
     """)
-    Page<Comment> findByNewsIdAndIdLessThanOrderByIdDescGuest(
+    Page<Comment> findByNewsIdAndIdLessThanOrderByEditedAtDescGuest(
             @Param("newsId") Long newsId,
             @Param("cursorId") Long cursorId,
             Pageable pageable
@@ -32,9 +32,9 @@ Page<Comment> findByNewsIdAndIdLessThanOrderByIdDescGuest(
     @Query("""
     SELECT c FROM Comment c 
     WHERE c.news.id = :newsId 
-    ORDER BY c.id DESC
+    ORDER BY c.editedAt DESC, c.id DESC
     """)
-    Page<Comment> findFirstPageByNewsIdOrderByIdDescGuest(
+    Page<Comment> findFirstPageByNewsIdOrderByEditedAtDescGuest(
             @Param("newsId") Long newsId,
             Pageable pageable
     );
@@ -46,31 +46,31 @@ Page<Comment> findFirstPageByNewsIdOrderByIdDescGuest(
     WHERE c.news.id = :newsId 
     AND c.id < :cursorId 
     AND hu.id IS NULL
-    ORDER BY c.id DESC
+    ORDER BY c.editedAt DESC, c.id DESC
     """)
-    Page<Comment> findByNewsIdAndIdLessThanOrderByIdDesc(
+    Page<Comment> findByNewsIdAndIdLessThanOrderByEditedAtDesc(
             @Param("newsId") Long newsId,
             @Param("cursorId") Long cursorId,
             @Param("user") User user,
             Pageable pageable
     );
 
-
     // 최신순 댓글 초기화 조회
     @Query("""
     SELECT c FROM Comment c 
     LEFT JOIN HideUser hu ON hu.hidedUser = c.user AND hu.user = :user
     WHERE c.news.id = :newsId 
     AND hu.id IS NULL
-    ORDER BY c.id DESC
+    ORDER BY c.editedAt DESC, c.id DESC
     """)
-    Page<Comment> findFirstPageByNewsIdOrderByIdDesc(
+    Page<Comment> findFirstPageByNewsIdOrderByEditedAtDesc(
             @Param("newsId") Long newsId,
             @Param("user") User user,
             Pageable pageable
     );
 
 
+
     // 인기순 조회
     @Query("""
     SELECT c FROM Comment c 

diff --git a/src/main/java/com/kkokkomu/short_news/comment/service/CommentService.java b/src/main/java/com/kkokkomu/short_news/comment/service/CommentService.java
@@ -58,6 +58,7 @@ public CommentDto createComment(Long userId, CreateCommentDto createCommentDto)
         );
 
         return CommentDto.builder()
+                .id(comment.getId())
                 .newsId(createCommentDto.newsId())
                 .content(comment.getContent())
                 .userId(userId)
@@ -106,11 +107,11 @@ public CursorResponseDto<List<CommentListDto>> readLatestComments(Long userId, L
         Page<Comment> results;
         if (cursorId == null) {
             // 처음 요청
-            results = commentRepository.findFirstPageByNewsIdOrderByIdDesc(newsId, user, pageRequest);
+            results = commentRepository.findFirstPageByNewsIdOrderByEditedAtDesc(newsId, user, pageRequest);
             comments = results.getContent();
         } else {
             // 2번째부터
-            results = commentRepository.findByNewsIdAndIdLessThanOrderByIdDesc(newsId, cursorId, user, pageRequest);
+            results = commentRepository.findByNewsIdAndIdLessThanOrderByEditedAtDesc(newsId, cursorId, user, pageRequest);
             comments = results.getContent();
         }
 
@@ -161,11 +162,11 @@ public CursorResponseDto<List<GuestCommentListDto>> guestReadLatestComments(Long
         Page<Comment> results;
         if (cursorId == null) {
             // 처음 요청
-            results = commentRepository.findFirstPageByNewsIdOrderByIdDescGuest(newsId, pageRequest);
+            results = commentRepository.findFirstPageByNewsIdOrderByEditedAtDescGuest(newsId, pageRequest);
             comments = results.getContent();
         } else {
             // 2번째부터
-            results = commentRepository.findByNewsIdAndIdLessThanOrderByIdDescGuest(newsId, cursorId, pageRequest);
+            results = commentRepository.findByNewsIdAndIdLessThanOrderByEditedAtDescGuest(newsId, cursorId, pageRequest);
             comments = results.getContent();
         }
 

diff --git a/src/main/java/com/kkokkomu/short_news/news/service/NewsService.java b/src/main/java/com/kkokkomu/short_news/news/service/NewsService.java
@@ -58,7 +58,6 @@ public class NewsService{
     private final CategoryUtil categoryUtil;
 
     /* 홈화면 */
-
     public PagingResponseDto<List<NewsListDto>> readNewsList(Long userId, String category, EHomeFilter filter, int page, int size) {
         User user = userLookupService.findUserById(userId);
 
@@ -260,7 +259,6 @@ public CursorResponseDto<List<SearchNewsDto>> searchPopularNews(String category,
     } // 인기순 뉴스 검색
 
     /* 관리자 */
-
     @jakarta.transaction.Transactional
     public List<GenerateNewsDto> generateNews(CreateGenerateNewsDto createGenerateNewsDto) {
         int repeat = createGenerateNewsDto.count_news() + createGenerateNewsDto.count_entertain() + createGenerateNewsDto.count_sports();
@@ -320,7 +318,8 @@ public List<GenerateNewsDto> generateNews(CreateGenerateNewsDto createGenerateNe
             throw new RuntimeException("Error processing JSON", e);
         }
 
-        log.info("response data : {}", Objects.requireNonNull(response.getBody()).length);
+        log.info("response data length: {}", Objects.requireNonNull(response.getBody()).length);
+        log.info("response data : {}", (Object) Objects.requireNonNull(response.getBody()));
         GenerateResponseDto[] generateResponseDtos = response.getBody();
 
         // 영상 생성 서버에서 영상 url 및 정보 받아옴
@@ -351,9 +350,11 @@ public List<GenerateNewsDto> generateNews(CreateGenerateNewsDto createGenerateNe
             String s3Url = generateResponseDto.s3();
             String thumnailUrl = "";
             String title = dataDto.title();
+            log.info("data : {}", dataDto);
             log.info("section : {}", dataDto.section());
             ECategory category = categoryUtil.getCategoryByName(dataDto.section());
             String relatedUrl = dataDto.url();
+            log.info("relatedUrl : {}", dataDto.url());
 
             // 뉴스 키워드 생성
             List<NewsKeyword> newsKeywords = newsKeywordService.registerNewsKeyword(news, keywords);
@@ -362,8 +363,8 @@ public List<GenerateNewsDto> generateNews(CreateGenerateNewsDto createGenerateNe
                     s3Url,
                     "",
                     "",
-                    thumnailUrl,
                     relatedUrl,
+                    thumnailUrl,
                     title,
                     summary,
                     category