Skip to content

Commit

Permalink
Merge branch 'dev' into test
Browse files Browse the repository at this point in the history
  • Loading branch information
@gouyeonch
gouyeonch committed Sep 11, 2024
2 parents 012903b + e646a74 commit 3aefde7
Show file tree
Hide file tree
Showing 10 changed files with 220 additions and 75 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/kkokkomu/short_news/core/constant/Constant.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class Constant {
"/comment/reply/oldest/guest",

//뉴스 탐색
"/news/filter",
"/search/news/filter",

//뉴스 검색
"/search/news/guest"
Expand Down
14 changes: 4 additions & 10 deletions src/main/java/com/kkokkomu/short_news/news/controller/HomeNewsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
import com.kkokkomu.short_news.core.dto.ResponseDto;
import com.kkokkomu.short_news.core.type.EHomeFilter;
import com.kkokkomu.short_news.news.dto.news.request.SharedCntDto;
import com.kkokkomu.short_news.news.dto.news.response.GuestNewsListDto;
import com.kkokkomu.short_news.news.dto.news.response.GuestNewsInfoDto;
import com.kkokkomu.short_news.news.dto.news.response.NewsDto;
import com.kkokkomu.short_news.news.dto.news.response.NewsInfoDto;
import com.kkokkomu.short_news.news.dto.news.response.NewsListDto;
import com.kkokkomu.short_news.news.service.HomeNewsService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand All @@ -29,7 +28,7 @@ public class HomeNewsController {

@Operation(summary = "뉴스 리스트 조회")
@GetMapping("/list")
public ResponseDto<PagingResponseDto<List<NewsListDto>>> readNewsList(@Parameter(hidden = true) @UserId Long userId,
public ResponseDto<PagingResponseDto<List<NewsInfoDto>>> readNewsList(@Parameter(hidden = true) @UserId Long userId,
@Parameter(description = "politics, economy, social, entertain, sports, living, world, it를 , 로 구분", example = "social,world") @RequestParam String category,
@RequestParam EHomeFilter filter,
@RequestParam int page, @RequestParam int size) {
Expand All @@ -39,17 +38,12 @@ public ResponseDto<PagingResponseDto<List<NewsListDto>>> readNewsList(@Parameter

@Operation(summary = "비로그인 뉴스 리스트 조회")
@GetMapping("/list/guest")
public ResponseDto<PagingResponseDto<List<GuestNewsListDto>>> guestReadNewsList(@RequestParam int page, @RequestParam int size) {
public ResponseDto<PagingResponseDto<List<GuestNewsInfoDto>>> guestReadNewsList(@RequestParam int page, @RequestParam int size) {
log.info("guestReadNewsList controller");
return ResponseDto.ok(homeNewsService.guestReadNewsList(page, size));
}

@Operation(summary = "뉴스 정보 조회")
@GetMapping("/info")
public ResponseDto<NewsInfoDto> readNewsInfo(@RequestParam Long newsId) {
log.info("readNewsInfo controller");
return ResponseDto.ok(homeNewsService.readNewsInfo(newsId));
}


@Operation(summary = "뉴스 공유 수 증가")
@PostMapping("/shared")
Expand Down
48 changes: 42 additions & 6 deletions src/main/java/com/kkokkomu/short_news/news/controller/SearchNewsController.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
package com.kkokkomu.short_news.news.controller;

import com.kkokkomu.short_news.core.annotation.UserId;
import com.kkokkomu.short_news.core.dto.CursorResponseDto;
import com.kkokkomu.short_news.core.dto.ResponseDto;
import com.kkokkomu.short_news.core.type.EHomeFilter;
import com.kkokkomu.short_news.news.dto.news.response.GuestNewsInfoDto;
import com.kkokkomu.short_news.news.dto.news.response.NewsInfoDto;
import com.kkokkomu.short_news.news.dto.news.response.NewsWithKeywordDto;
import com.kkokkomu.short_news.news.dto.news.response.SearchNewsDto;
import com.kkokkomu.short_news.news.service.SearchNewsService;
import io.swagger.v3.oas.annotations.Operation;
Expand All @@ -27,15 +31,30 @@ public class SearchNewsController {

@Operation(summary = "탐색 화면 카테고리 필터 조회")
@GetMapping("/filter")
public ResponseDto<CursorResponseDto<List<SearchNewsDto>>> readFilteredNews(@Parameter(description = "popular | politics | economy | social | entertain | sports | living | world | it") @RequestParam String category,
public ResponseDto<CursorResponseDto<List<NewsInfoDto>>> readFilteredNews(@Parameter(description = "popular | politics | economy | social | entertain | sports | living | world | it") @RequestParam String category,
@RequestParam(required = false) Long cursorId,
@RequestParam int size) {
@RequestParam int size,
@UserId Long userId) {
log.info("readFilteredNews controller");

if (category.equals("popular")) {
return ResponseDto.ok(searchNewsService.getPopularNewsFilteredByCategory(cursorId, size));
return ResponseDto.ok(searchNewsService.getPopularNewsFilteredByCategory(cursorId, size, userId));
} else {
return ResponseDto.ok(searchNewsService.getLatestNewsFilteredByCategory(category, cursorId, size));
return ResponseDto.ok(searchNewsService.getLatestNewsFilteredByCategory(category, cursorId, size, userId));
}
}

@Operation(summary = "비로그인 탐색 화면 카테고리 필터 조회")
@GetMapping("/filter/guest")
public ResponseDto<CursorResponseDto<List<GuestNewsInfoDto>>> readGuestFilteredNews(@Parameter(description = "popular | politics | economy | social | entertain | sports | living | world | it") @RequestParam String category,
@RequestParam(required = false) Long cursorId,
@RequestParam int size) {
log.info("readGuestFilteredNews controller");

if (category.equals("popular")) {
return ResponseDto.ok(searchNewsService.getGuestPopularNewsFilteredByCategory(cursorId, size));
} else {
return ResponseDto.ok(searchNewsService.getGuestLatestNewsFilteredByCategory(category, cursorId, size));
}
}

Expand All @@ -45,7 +64,8 @@ public ResponseDto<CursorResponseDto<List<SearchNewsDto>>> searchNews(@Parameter
@RequestParam String text,
@RequestParam EHomeFilter filter,
@RequestParam(required = false) Long cursorId,
@RequestParam int size) {
@RequestParam int size,
@UserId Long userId) {
log.info("searchNews controller");

if (filter == EHomeFilter.LATEST) {
Expand All @@ -61,7 +81,8 @@ public ResponseDto<CursorResponseDto<List<SearchNewsDto>>> guestSearchNews(@Para
@RequestParam String text,
@RequestParam EHomeFilter filter,
@RequestParam(required = false) Long cursorId,
@RequestParam int size) {
@RequestParam int size,
@UserId Long userId) {
log.info("guestSearchNews controller");

if (filter == EHomeFilter.LATEST) {
Expand All @@ -70,4 +91,19 @@ public ResponseDto<CursorResponseDto<List<SearchNewsDto>>> guestSearchNews(@Para
return ResponseDto.ok(searchNewsService.searchPopularNews(category, text, cursorId, size));
}
}

@Operation(summary = "뉴스 정보 조회")
@GetMapping("/info")
public ResponseDto<NewsInfoDto> readNewsInfo(@UserId Long userId,
@RequestParam Long newsId) {
log.info("readNewsInfo controller");
return ResponseDto.ok(searchNewsService.readNewsInfo(userId, newsId));
}

@Operation(summary = "비로그인 뉴스 정보 조회")
@GetMapping("/info/guest")
public ResponseDto<GuestNewsInfoDto> GuestReadNewsInfo(@RequestParam Long newsId) {
log.info("GuestReadNewsInfo controller");
return ResponseDto.ok(searchNewsService.guestReadNewsInfo(newsId));
}
}
4 changes: 2 additions & 2 deletions ...s/dto/news/response/GuestNewsListDto.java → ...s/dto/news/response/GuestNewsInfoDto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import lombok.Builder;

@Builder
public record GuestNewsListDto(
NewsSummaryDto shortformList,
public record GuestNewsInfoDto(
NewsWithKeywordDto info,
ReactionCntDto reactionCnt
) {
}
9 changes: 5 additions & 4 deletions src/main/java/com/kkokkomu/short_news/news/dto/news/response/NewsInfoDto.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package com.kkokkomu.short_news.news.dto.news.response;

import com.kkokkomu.short_news.news.dto.newsReaction.response.NewReactionByUserDto;
import com.kkokkomu.short_news.news.dto.newsReaction.response.ReactionCntDto;
import lombok.Builder;

import java.util.List;

@Builder
public record NewsInfoDto(
NewsDto news,
List<String> keywords
NewsWithKeywordDto info,
ReactionCntDto reactionCnt,
NewReactionByUserDto userReaction
) {
}
13 changes: 0 additions & 13 deletions src/main/java/com/kkokkomu/short_news/news/dto/news/response/NewsListDto.java
View file

This file was deleted.

21 changes: 21 additions & 0 deletions src/main/java/com/kkokkomu/short_news/news/dto/news/response/NewsWithKeywordDto.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.kkokkomu.short_news.news.dto.news.response;

import com.kkokkomu.short_news.news.domain.News;
import lombok.Builder;

import java.util.List;

@Builder
public record NewsWithKeywordDto(
NewsDto news,
List<String> keywords
) {
public static NewsWithKeywordDto of(News news) {
return NewsWithKeywordDto.builder()
.news(NewsDto.of(news))
.keywords(news.getNewsKeywords().stream()
.map(newsKeyword -> newsKeyword.getKeyword().getKeyword())
.toList())
.build();
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/kkokkomu/short_news/news/repository/NewsRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Page<News> findFirstPageByCategoryOrderByIdDesc(

// 인기순 필터 쿼리
@Query(value = """
SELECT n.* FROM News n
SELECT n.* FROM news n
LEFT JOIN comments c ON n.id = c.news_id
LEFT JOIN reactions r ON n.id = r.news_id
WHERE (n.viewCnt * :viewWeight + COUNT(c.id) * :commentWeight + COUNT(r.id) * :reactionWeight + n.sharedCnt * :shareWeight +
Expand All @@ -142,7 +142,7 @@ Page<News> findByPopularityLessThan(

// 첫 페이지 인기순 필터 쿼리
@Query(value = """
SELECT n.* FROM News n
SELECT n.* FROM news n
LEFT JOIN comments c ON n.id = c.news_id
LEFT JOIN reactions r ON n.id = r.news_id
GROUP BY n.id
Expand Down
39 changes: 10 additions & 29 deletions src/main/java/com/kkokkomu/short_news/news/service/HomeNewsService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.kkokkomu.short_news.core.dto.PageInfoDto;
import com.kkokkomu.short_news.core.dto.PagingResponseDto;
import com.kkokkomu.short_news.core.type.EHomeFilter;
import com.kkokkomu.short_news.keyword.service.NewsKeywordService;
import com.kkokkomu.short_news.news.domain.News;
import com.kkokkomu.short_news.news.dto.news.request.SharedCntDto;
import com.kkokkomu.short_news.news.dto.news.response.*;
Expand All @@ -29,12 +28,12 @@ public class HomeNewsService {
private final NewsRepository newsRepository;

private final UserLookupService userLookupService;
private final NewsKeywordService newsKeywordService;
private final NewsReactionService newsReactionService;
private final NewsLookupService newsLookupService;

/* 홈화면 */
public PagingResponseDto<List<NewsListDto>> readNewsList(Long userId, String category, EHomeFilter filter, int page, int size) {
@Transactional(readOnly = true)
public PagingResponseDto<List<NewsInfoDto>> readNewsList(Long userId, String category, EHomeFilter filter, int page, int size) {
User user = userLookupService.findUserById(userId);

// 일단 최신순으로 조회
Expand All @@ -43,12 +42,8 @@ public PagingResponseDto<List<NewsListDto>> readNewsList(Long userId, String cat
List<News> news = results.getContent();
PageInfoDto pageInfo = PageInfoDto.fromPageInfo(results);

List<NewsListDto> newsListDtos = new ArrayList<>();
List<NewsInfoDto> newsListDtos = new ArrayList<>();
for (News newsItem : news) {

// 뉴스 url 및 기본 정보
NewsSummaryDto newsSummaryDto = NewsSummaryDto.of(newsItem);

// 각 감정표현 별 갯수
ReactionCntDto reactionCntDto = newsReactionService.countNewsReaction(newsItem.getId());

Expand All @@ -57,8 +52,8 @@ public PagingResponseDto<List<NewsListDto>> readNewsList(Long userId, String cat

// dto 생성
newsListDtos.add(
NewsListDto.builder()
.shortformList(newsSummaryDto)
NewsInfoDto.builder()
.info(NewsWithKeywordDto.of(newsItem))
.reactionCnt(reactionCntDto)
.userReaction(newReactionByUserDto)
.build()
Expand All @@ -68,26 +63,23 @@ public PagingResponseDto<List<NewsListDto>> readNewsList(Long userId, String cat
return PagingResponseDto.fromEntityAndPageInfo(newsListDtos, pageInfo);
} // 숏폼 리스트 조회

public PagingResponseDto<List<GuestNewsListDto>> guestReadNewsList(int page, int size) {
@Transactional(readOnly = true)
public PagingResponseDto<List<GuestNewsInfoDto>> guestReadNewsList(int page, int size) {
// 일단 최신순으로 조회
Page<News> results = newsRepository.findAllCreatedAtDesc(PageRequest.of(page, size));

List<News> news = results.getContent();
PageInfoDto pageInfo = PageInfoDto.fromPageInfo(results);

List<GuestNewsListDto> newsListDtos = new ArrayList<>();
List<GuestNewsInfoDto> newsListDtos = new ArrayList<>();
for (News newsItem : news) {

// 뉴스 url 및 기본 정보
NewsSummaryDto newsSummaryDto = NewsSummaryDto.of(newsItem);

// 각 감정표현 별 갯수
ReactionCntDto reactionCntDto = newsReactionService.countNewsReaction(newsItem.getId());

// dto 생성
newsListDtos.add(
GuestNewsListDto.builder()
.shortformList(newsSummaryDto)
GuestNewsInfoDto.builder()
.info(NewsWithKeywordDto.of(newsItem))
.reactionCnt(reactionCntDto)
.build()
);
Expand All @@ -96,18 +88,7 @@ public PagingResponseDto<List<GuestNewsListDto>> guestReadNewsList(int page, int
return PagingResponseDto.fromEntityAndPageInfo(newsListDtos, pageInfo);
} // 비로그인 숏폼 리스트 조회

@Transactional(readOnly = true)
public NewsInfoDto readNewsInfo(Long newsId) {
News news = newsLookupService.findNewsById(newsId);

// 키워드
List<String> keywords = newsKeywordService.getStrKeywordListByNewsId(newsId);

return NewsInfoDto.builder()
.news(NewsDto.of(news))
.keywords(keywords)
.build();
} // 뉴스 정보 조회

public NewsDto updateSharedCnt(SharedCntDto sharedCntDto) {
News news = newsLookupService.findNewsById(sharedCntDto.newsId());
Expand Down
Loading

0 comments on commit 3aefde7

Please sign in to comment.