From 1b7ecc4afeaad778607ede989ddb7a8f2d87d5e8 Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 11 Jan 2024 16:59:32 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=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=98=A4=ED=94=88=20=EC=98=88=EC=A0=95=EC=9D=BC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/admin/content/AdminContentRepository.kt | 7 ++++--- .../sodalive/admin/content/GetAdminContentListResponse.kt | 3 ++- .../creator/admin/content/CreatorAdminContentRepository.kt | 7 ++++--- .../admin/content/GetCreatorAdminContentListResponse.kt | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentRepository.kt index 1db3529..ecd4c4d 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentRepository.kt @@ -29,7 +29,7 @@ class AdminAudioContentQueryRepositoryImpl( override fun getAudioContentTotalCount(searchWord: String): Int { var where = audioContent.duration.isNotNull .and(audioContent.member.isNotNull) - .and(audioContent.isActive.isTrue) + .and(audioContent.isActive.isTrue.or(audioContent.releaseDate.isNotNull)) if (searchWord.trim().length > 1) { where = where.and( @@ -49,7 +49,7 @@ class AdminAudioContentQueryRepositoryImpl( override fun getAudioContentList(offset: Long, limit: Long, searchWord: String): List { var where = audioContent.duration.isNotNull .and(audioContent.member.isNotNull) - .and(audioContent.isActive.isTrue) + .and(audioContent.isActive.isTrue.or(audioContent.releaseDate.isNotNull)) if (searchWord.trim().length > 1) { where = where.and( @@ -73,7 +73,8 @@ class AdminAudioContentQueryRepositoryImpl( audioContent.isAdult, audioContent.duration, audioContent.content, - formattedDateExpression(audioContent.createdAt) + formattedDateExpression(audioContent.createdAt), + formattedDateExpression(audioContent.releaseDate, "%Y-%m-%d %r") ) ) .from(audioContent) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/GetAdminContentListResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/GetAdminContentListResponse.kt index 81b88b8..f1101cd 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/GetAdminContentListResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/GetAdminContentListResponse.kt @@ -20,7 +20,8 @@ data class GetAdminContentListItem @QueryProjection constructor( val isAdult: Boolean, val remainingTime: String, var contentUrl: String, - val date: String + val date: String, + val releaseDate: String? ) { var tags: String = "" } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentRepository.kt index 6067cc5..0dbf851 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentRepository.kt @@ -35,7 +35,7 @@ class CreatorAdminAudioContentQueryRepositoryImpl( override fun getAudioContentTotalCount(memberId: Long, searchWord: String): Int { var where = audioContent.duration.isNotNull .and(audioContent.member.isNotNull) - .and(audioContent.isActive.isTrue) + .and(audioContent.isActive.isTrue.or(audioContent.releaseDate.isNotNull)) .and(audioContent.member.id.eq(memberId)) if (searchWord.trim().length > 1) { @@ -61,7 +61,7 @@ class CreatorAdminAudioContentQueryRepositoryImpl( ): List { var where = audioContent.duration.isNotNull .and(audioContent.member.isNotNull) - .and(audioContent.isActive.isTrue) + .and(audioContent.isActive.isTrue.or(audioContent.releaseDate.isNotNull)) .and(audioContent.member.id.eq(memberId)) if (searchWord.trim().length > 1) { @@ -85,7 +85,8 @@ class CreatorAdminAudioContentQueryRepositoryImpl( audioContent.isCommentAvailable, audioContent.duration, audioContent.content, - formattedDateExpression(audioContent.createdAt) + formattedDateExpression(audioContent.createdAt), + formattedDateExpression(audioContent.releaseDate, "%Y-%m-%d %r") ) ) .from(audioContent) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/GetCreatorAdminContentListResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/GetCreatorAdminContentListResponse.kt index 7284b11..5467fd3 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/GetCreatorAdminContentListResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/GetCreatorAdminContentListResponse.kt @@ -19,7 +19,8 @@ data class GetCreatorAdminContentListItem @QueryProjection constructor( val isCommentAvailable: Boolean, val remainingTime: String, var contentUrl: String, - val date: String + val date: String, + val releaseDate: String? ) { var tags: String = "" }