From 078e6011006e2cf4a53454f1cd8d6c13cd21a90c Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 16 Oct 2024 12:25:26 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20-=20?= =?UTF-8?q?=EC=B0=BE=EA=B8=B0=EC=97=90=20content=20release=20status=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/admin/content/AdminContentController.kt | 9 ++++++++- .../sodalive/admin/content/AdminContentService.kt | 9 +++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentController.kt index 088d95b..fa875fb 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentController.kt @@ -27,9 +27,16 @@ class AdminContentController(private val service: AdminContentService) { @GetMapping("/search") fun searchAudioContent( + @RequestParam(value = "status", required = false) status: ContentReleaseStatus?, @RequestParam(value = "search_word") searchWord: String, pageable: Pageable - ) = ApiResponse.ok(service.searchAudioContent(searchWord, pageable)) + ) = ApiResponse.ok( + service.searchAudioContent( + status = status ?: ContentReleaseStatus.OPEN, + searchWord, + pageable + ) + ) @PutMapping fun modifyAudioContent( diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentService.kt index 7d79051..ebf0445 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentService.kt @@ -43,10 +43,15 @@ class AdminContentService( return GetAdminContentListResponse(totalCount, audioContentList) } - fun searchAudioContent(searchWord: String, pageable: Pageable): GetAdminContentListResponse { + fun searchAudioContent( + status: ContentReleaseStatus, + searchWord: String, + pageable: Pageable + ): GetAdminContentListResponse { if (searchWord.length < 2) throw SodaException("2글자 이상 입력하세요.") - val totalCount = repository.getAudioContentTotalCount(searchWord) + val totalCount = repository.getAudioContentTotalCount(searchWord, status = status) val audioContentAndThemeList = repository.getAudioContentList( + status = status, offset = pageable.offset, limit = pageable.pageSize.toLong(), searchWord = searchWord