diff --git a/src/main/java/com/movelog/domain/news/application/NewsService.java b/src/main/java/com/movelog/domain/news/application/NewsService.java index aef9679..bd4a2d2 100644 --- a/src/main/java/com/movelog/domain/news/application/NewsService.java +++ b/src/main/java/com/movelog/domain/news/application/NewsService.java @@ -6,6 +6,7 @@ import com.movelog.domain.news.dto.request.NewsHeadLineReq; import com.movelog.domain.news.dto.response.HeadLineRes; import com.movelog.domain.news.dto.response.RecentKeywordsRes; +import com.movelog.domain.news.dto.response.RecentNewsRes; import com.movelog.domain.record.domain.Keyword; import com.movelog.domain.record.domain.VerbType; import com.movelog.domain.record.exception.KeywordNotFoundException; @@ -17,10 +18,13 @@ import com.movelog.global.config.security.token.UserPrincipal; import com.movelog.global.util.S3Util; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; +import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -81,6 +85,32 @@ public List getRecentKeywords(UserPrincipal userPrincipal) { .toList(); } + public List getRecentNews(UserPrincipal userPrincipal, Integer page) { + User user = validateUser(userPrincipal); + // User user = userRepository.findById(5L).orElseThrow(UserNotFoundException::new); + + //페이징 객체 생성 + Pageable pageable = PageRequest.of(page, 15); + + // 최근 일주일간 생성한 뉴스 목록 조회 + LocalDateTime createdAt = LocalDateTime.now().minusDays(7); + List recentNews = newsRepository.findRecentNewsByUser(user, createdAt, pageable); + + // 최신순 정렬 + recentNews.sort((n1, n2) -> n2.getCreatedAt().compareTo(n1.getCreatedAt())); + + return recentNews.stream() + .map(news -> RecentNewsRes.builder() + .newsId(news.getNewsId()) + .newsImageUrl(news.getNewsUrl()) + .headLine(news.getHeadLine()) + .noun(news.getKeyword().getKeyword()) + .verb(VerbType.getStringVerbType(news.getKeyword().getVerbType())) + .createdAt(news.getCreatedAt()) + .build()) + .toList(); + } + // User 정보 검증 private User validateUser(UserPrincipal userPrincipal) { diff --git a/src/main/java/com/movelog/domain/news/domain/repository/NewsRepository.java b/src/main/java/com/movelog/domain/news/domain/repository/NewsRepository.java index 644fcf0..4a38445 100644 --- a/src/main/java/com/movelog/domain/news/domain/repository/NewsRepository.java +++ b/src/main/java/com/movelog/domain/news/domain/repository/NewsRepository.java @@ -1,9 +1,27 @@ package com.movelog.domain.news.domain.repository; import com.movelog.domain.news.domain.News; +import com.movelog.domain.user.domain.User; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import java.time.LocalDateTime; +import java.util.List; + @Repository public interface NewsRepository extends JpaRepository { + + @Query("SELECT n FROM News n " + + "JOIN n.keyword k " + + "WHERE k.user = :user " + + "AND n.createdAt > :createdAt " + + "ORDER BY n.createdAt DESC") + List findRecentNewsByUser( + @Param("user") User user, + @Param("createdAt") LocalDateTime createdAt, + Pageable pageable + ); } diff --git a/src/main/java/com/movelog/domain/news/dto/response/RecentNewsRes.java b/src/main/java/com/movelog/domain/news/dto/response/RecentNewsRes.java new file mode 100644 index 0000000..c5b85b2 --- /dev/null +++ b/src/main/java/com/movelog/domain/news/dto/response/RecentNewsRes.java @@ -0,0 +1,36 @@ +package com.movelog.domain.news.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Getter +public class RecentNewsRes { + + @Schema( type = "int", example ="1", description="뉴스 ID") + private Long newsId; + + @Schema( type = "String", example ="https://movelog.s3.ap-northeast-2.amazonaws.com/record/2021-08-01/1.jpg", description="뉴스 이미지 url") + private String newsImageUrl; + + @Schema( type = "String", example ="5년 만의 첫 도전, 무엇이 그를 움직이게 했나?", description="뉴스 헤드라인 추천 내용입니다.") + private String headLine; + + @Schema( type = "String", example = "헬스", description="명사") + private String noun; + + @Schema( type = "String", example = "했어요", description="동사") + private String verb; + + @Schema( type = "LocalDateTime", example ="2021-08-01T00:00:00", description="뉴스 생성 시간") + private LocalDateTime createdAt; + + +} diff --git a/src/main/java/com/movelog/domain/news/presentation/NewsController.java b/src/main/java/com/movelog/domain/news/presentation/NewsController.java index 097ff5a..497e633 100644 --- a/src/main/java/com/movelog/domain/news/presentation/NewsController.java +++ b/src/main/java/com/movelog/domain/news/presentation/NewsController.java @@ -5,6 +5,7 @@ import com.movelog.domain.news.dto.request.NewsHeadLineReq; import com.movelog.domain.news.dto.response.HeadLineRes; import com.movelog.domain.news.dto.response.RecentKeywordsRes; +import com.movelog.domain.news.dto.response.RecentNewsRes; import com.movelog.global.config.security.token.CurrentUser; import com.movelog.global.config.security.token.UserPrincipal; import com.movelog.global.payload.Message; @@ -55,7 +56,7 @@ public ResponseEntity createHeadLine( } - @Operation(summary = "뉴스 생성 및 저장 API(기존 이미지 기록 기반)", description = "사용자의 기존 기록 이미지로 뉴스를 생성합니다.") + @Operation(summary = "뉴스 생성 및 저장 API", description = "새로운 뉴스를 생성하고 저장합니다.") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "뉴스 생성 및 저장 성공", content = @Content(mediaType = "application/json", schema = @Schema(implementation = Message.class))), @@ -90,6 +91,28 @@ public ResponseEntity getRecentKeywords( return ResponseEntity.ok(ApiResponseUtil.success(response)); } + @Operation(summary = "최근 뉴스 목록 조회 API", description = "최근 일주일간 생성한 뉴스 목록을 1페이지 당 15개씩 조회합니다.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "최근 뉴스 목록 조회 성공", + content = @Content(mediaType = "application/json", + schema = @Schema(type = "array", implementation = RecentNewsRes.class))), + @ApiResponse(responseCode = "400", description = "최근 뉴스 목록 조회 실패", + content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))) + }) + @GetMapping("/week") + public ResponseEntity getRecentNews( + @Parameter(description = "Access Token을 입력해주세요.", required = true) + @AuthenticationPrincipal UserPrincipal userPrincipal, + @Parameter(description = "뉴스 목록의 페이지 번호를 입력해주세요. **Page는 1부터 시작됩니다!**", required = true) + @RequestParam(value = "page", required = false, defaultValue = "0") Integer page + ) { + List response = newsService.getRecentNews(userPrincipal, page); + return ResponseEntity.ok(ApiResponseUtil.success(response)); + } + + + + diff --git a/src/main/java/com/movelog/domain/record/dto/request/SearchKeywordReq.java b/src/main/java/com/movelog/domain/record/dto/request/SearchKeywordReq.java new file mode 100644 index 0000000..8446bc8 --- /dev/null +++ b/src/main/java/com/movelog/domain/record/dto/request/SearchKeywordReq.java @@ -0,0 +1,16 @@ +package com.movelog.domain.record.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Getter +public class SearchKeywordReq { + @Schema( type = "String", example ="헬스", description="검색할 명사") + private String searchKeyword; +} diff --git a/src/main/java/com/movelog/domain/record/dto/response/SearchKeywordRes.java b/src/main/java/com/movelog/domain/record/dto/response/SearchKeywordRes.java new file mode 100644 index 0000000..a6f7c05 --- /dev/null +++ b/src/main/java/com/movelog/domain/record/dto/response/SearchKeywordRes.java @@ -0,0 +1,24 @@ +package com.movelog.domain.record.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Getter +public class SearchKeywordRes { + + @Schema( type = "int", example = "1", description="키워드 ID") + private Long keywordId; + + @Schema( type = "String", example ="헬스", description="검색어가 포함된 명사") + private String noun; + + @Schema( type = "String", example ="했어요", description="명사에 해당하는 동사") + private String verb; + +} diff --git a/src/main/java/com/movelog/domain/record/presentation/RecordController.java b/src/main/java/com/movelog/domain/record/presentation/RecordController.java index 74f078b..9a33fe7 100644 --- a/src/main/java/com/movelog/domain/record/presentation/RecordController.java +++ b/src/main/java/com/movelog/domain/record/presentation/RecordController.java @@ -1,7 +1,9 @@ package com.movelog.domain.record.presentation; import com.movelog.domain.record.dto.request.CreateRecordReq; +import com.movelog.domain.record.dto.request.SearchKeywordReq; import com.movelog.domain.record.dto.response.RecentRecordImagesRes; +import com.movelog.domain.record.dto.response.SearchKeywordRes; import com.movelog.domain.record.dto.response.TodayRecordStatus; import com.movelog.domain.record.service.RecordService; import com.movelog.global.config.security.token.UserPrincipal; @@ -81,5 +83,23 @@ public ResponseEntity retrieveRecentRecordImages( } + @Operation(summary = "기록 내 명사 검색 API", description = "사용자가 생성한 기록 중 명사를 통해 동사-명사 쌍을 검색하는 API입니다.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "기록 내 명사 검색 성공", + content = @Content(mediaType = "application/json", + schema = @Schema(type = "array", implementation = SearchKeywordRes.class))), + @ApiResponse(responseCode = "400", description = "기록 내 명사 검색 실패", + content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))) + }) + @GetMapping("/search") + public ResponseEntity searchKeyword( + @Parameter(description = "User의 토큰을 입력해주세요.", required = true) @AuthenticationPrincipal UserPrincipal userPrincipal, + @Parameter(description = "검색할 명사를 입력해주세요.", required = true) @RequestBody SearchKeywordReq searchKeywordReq + ) { + List result = recordService.searchKeyword(userPrincipal, searchKeywordReq); + return ResponseEntity.ok(ApiResponseUtil.success(result)); + } + + } diff --git a/src/main/java/com/movelog/domain/record/repository/KeywordRepository.java b/src/main/java/com/movelog/domain/record/repository/KeywordRepository.java index ec569ce..4cb26b3 100644 --- a/src/main/java/com/movelog/domain/record/repository/KeywordRepository.java +++ b/src/main/java/com/movelog/domain/record/repository/KeywordRepository.java @@ -18,4 +18,6 @@ public interface KeywordRepository extends JpaRepository { boolean existsByUserAndKeywordAndVerbType(User user, String noun, VerbType verbType); Keyword findByUserAndKeywordAndVerbType(User user, String noun, VerbType verbType); + + List findAllByUserAndKeywordContaining(User user, String keyword); } diff --git a/src/main/java/com/movelog/domain/record/service/RecordService.java b/src/main/java/com/movelog/domain/record/service/RecordService.java index 576c48a..6302203 100644 --- a/src/main/java/com/movelog/domain/record/service/RecordService.java +++ b/src/main/java/com/movelog/domain/record/service/RecordService.java @@ -4,7 +4,9 @@ import com.movelog.domain.record.domain.Record; import com.movelog.domain.record.domain.VerbType; import com.movelog.domain.record.dto.request.CreateRecordReq; +import com.movelog.domain.record.dto.request.SearchKeywordReq; import com.movelog.domain.record.dto.response.RecentRecordImagesRes; +import com.movelog.domain.record.dto.response.SearchKeywordRes; import com.movelog.domain.record.dto.response.TodayRecordStatus; import com.movelog.domain.record.repository.KeywordRepository; import com.movelog.domain.record.repository.RecordRepository; @@ -19,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; +import java.text.Collator; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; @@ -131,6 +134,33 @@ public List retrieveRecentRecordImages(UserPrincipal user } + + public List searchKeyword(UserPrincipal userPrincipal, SearchKeywordReq searchKeywordReq) { + User user = validUserById(userPrincipal.getId()); + // User user = validUserById(5L); + String keyword = searchKeywordReq.getSearchKeyword(); + List keywords = keywordRepository.findAllByUserAndKeywordContaining(user, keyword); + keywords.forEach(k -> log.info("Keyword in DB: {}", k.getKeyword())); + + // Collator 생성 + Collator collator = Collator.getInstance(Locale.KOREA); + + // Collator를 이용한 오름차순 정렬 + List sortedResults = keywords.stream() + .map(k -> SearchKeywordRes.builder() + .keywordId(k.getKeywordId()) + .noun(k.getKeyword()) + .verb(VerbType.getStringVerbType(k.getVerbType())) + .build()) + .sorted((o1, o2) -> collator.compare(o1.getNoun(), o2.getNoun())) // Collator로 비교 + .collect(Collectors.toList()); + + // 정렬된 명사 목록 출력 + sortedResults.forEach(r -> log.info("Sorted Noun: {}", r.getNoun())); + + return sortedResults; + } + private User validUserById(Long userId) { Optional userOptional = userRepository.findById(userId); return userOptional.get(); @@ -153,5 +183,4 @@ private void validateCreateRecordReq(CreateRecordReq createRecordReq) { throw new IllegalArgumentException("noun is required."); } } - }