diff --git a/src/main/java/gwangjang/server/domain/contents/domain/repository/ContentsRepository.java b/src/main/java/gwangjang/server/domain/contents/domain/repository/ContentsRepository.java index dcfba35..a165aaf 100644 --- a/src/main/java/gwangjang/server/domain/contents/domain/repository/ContentsRepository.java +++ b/src/main/java/gwangjang/server/domain/contents/domain/repository/ContentsRepository.java @@ -13,7 +13,7 @@ public interface ContentsRepository extends JpaRepository,ContentsCustomRepository{ List findByType(ApiType type); - List findByIssueTitleLike(String issue); + List findByIssueTitleLikeAndType(String issue,ApiType type); List findByKeywordLikeAndTypeOrderByPubDateDesc(String issueTitle, ApiType type); @Query( 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 index 024fa35..7b4ef41 100644 --- a/src/main/java/gwangjang/server/domain/contents/domain/service/ContentsService.java +++ b/src/main/java/gwangjang/server/domain/contents/domain/service/ContentsService.java @@ -10,7 +10,7 @@ public interface ContentsService { public Mono saveYoutubeContent(String[] search); public List getContents(ApiType type); - List getContentsTitle(String issue); + List getContentsTitle(String issue, ApiType type); List getKeywordAndType(String Keyword, ApiType apiType); ContentsRes getContentsById(Integer contentsId); List getContentLikeCount(); 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 index ca16b21..584c820 100644 --- a/src/main/java/gwangjang/server/domain/contents/domain/service/ContentsServiceImpl.java +++ b/src/main/java/gwangjang/server/domain/contents/domain/service/ContentsServiceImpl.java @@ -161,8 +161,8 @@ public List getContents(ApiType type) { .collect(Collectors.toList()); } - public List getContentsTitle(String issue) { - List contents = contentsRepository.findByIssueTitleLike("%" + issue + "%"); + public List getContentsTitle(String issue, ApiType type) { + List contents = contentsRepository.findByIssueTitleLikeAndType("%" + issue + "%", type); return contents.stream() .map(contentsMapper::toDto) .collect(Collectors.toList()); diff --git a/src/main/java/gwangjang/server/domain/contents/presentation/ContentsController.java b/src/main/java/gwangjang/server/domain/contents/presentation/ContentsController.java index 217338b..25ffedc 100644 --- a/src/main/java/gwangjang/server/domain/contents/presentation/ContentsController.java +++ b/src/main/java/gwangjang/server/domain/contents/presentation/ContentsController.java @@ -45,9 +45,9 @@ public ResponseEntity>> getYoutubeContents(@P return ResponseEntity.ok(SuccessResponse.create(GET_CONTENTS_SUCCESS.getMessage(),this.contentsService.getContents(type))); } - @GetMapping("/issueTitle/{issue}") - public ResponseEntity>> getContentsTitle(@PathVariable String issue) { - return ResponseEntity.ok(SuccessResponse.create(GET_CONTENTS_SUCCESS.getMessage(),this.contentsService.getContentsTitle(issue))); + @GetMapping("/issueTitle/{issue}/{type}") + public ResponseEntity>> getContentsTitleAndType(@PathVariable String issue, @PathVariable ApiType type) { + return ResponseEntity.ok(SuccessResponse.create(GET_CONTENTS_SUCCESS.getMessage(),this.contentsService.getContentsTitle(issue,type))); } @GetMapping("/keyword/{keyword}/{type}")