Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test #42

Merged
merged 6 commits into from
Sep 4, 2024
Merged

Test #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
06818dd
FIX : 댓글 생성시 반환 dto에 id 추가
gouyeonch Sep 3, 2024
82f7d19
FIX : 댓글 최신순 정렬 수정 시작 기준으로 변경
gouyeonch Sep 3, 2024
5a84589
FIX : 뉴스 생성시 relatedUrl 반영
gouyeonch Sep 3, 2024
9990a00
Merge branch 'dev' into test
gouyeonch Sep 3, 2024
ebb3086
[KKM-86] FEAT : 뉴스 생성시 썸네일 저장 구현
gouyeonch Sep 3, 2024
e2ce902
Merge branch 'dev' into test
gouyeonch Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/main/java/com/kkokkomu/short_news/comment/repository/CommentRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
);
Expand All @@ -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
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/com/kkokkomu/short_news/comment/service/CommentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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();
}

Expand Down Expand Up @@ -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();
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/kkokkomu/short_news/news/dto/news/response/GenerateResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
@Builder
public record GenerateResponseDto(
Map<String, Object> data,
String s3
String s3,
String thumbnail
) {
}
4 changes: 2 additions & 2 deletions src/main/java/com/kkokkomu/short_news/news/dto/news/response/SearchNewsDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ public record SearchNewsDto(
Long newsId,
String title,
String createdAt,
String thumnailUrl,
String thumbnailUrl,
int viewCnt
) {
static public SearchNewsDto of(News news) {
return SearchNewsDto.builder()
.newsId(news.getId())
.title(news.getTitle())
.createdAt(news.getCreatedAt().toString())
.thumnailUrl(news.getThumbnail())
.thumbnailUrl(news.getThumbnail())
.viewCnt(news.getViewCnt())
.build();
}
Expand Down
12 changes: 7 additions & 5 deletions src/main/java/com/kkokkomu/short_news/news/service/NewsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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 및 정보 받아옴
Expand Down Expand Up @@ -349,11 +348,14 @@ public List<GenerateNewsDto> generateNews(CreateGenerateNewsDto createGenerateNe
String summary = summaryDto.sentence_total();
List<String> keywords = new ArrayList<>(Arrays.asList(keywordMap.get("keyword_0"), keywordMap.get("keyword_1"), keywordMap.get("keyword_2")));
String s3Url = generateResponseDto.s3();
String thumnailUrl = "";
String thumbnailUrl = generateResponseDto.thumbnail();
log.info("thumbnailUrl : {}", generateResponseDto.thumbnail());
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);
Expand All @@ -362,8 +364,8 @@ public List<GenerateNewsDto> generateNews(CreateGenerateNewsDto createGenerateNe
s3Url,
"",
"",
thumnailUrl,
relatedUrl,
thumbnailUrl,
title,
summary,
category
Expand Down
Loading