From 1b7ecc4afeaad778607ede989ddb7a8f2d87d5e8 Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 11 Jan 2024 16:59:32 +0900 Subject: [PATCH 1/5] =?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 = "" } -- 2.40.1 From d2ecca55b31219f840b2e2dadf5400f0426b6988 Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 11 Jan 2024 17:01:54 +0900 Subject: [PATCH 2/5] =?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=EC=88=98=EC=A0=95=20-=20isActive=EA=B0=80?= =?UTF-8?q?=20false=EC=9D=B4=EB=A9=B4=20releaseDate=20null=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/vividnext/sodalive/admin/content/AdminContentService.kt | 3 +++ .../creator/admin/content/CreatorAdminContentService.kt | 3 +++ 2 files changed, 6 insertions(+) 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 677e3b9..0808d08 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 @@ -94,6 +94,9 @@ class AdminContentService( } if (request.isActive != null) { + if (!request.isActive) { + audioContent.releaseDate = null + } audioContent.isActive = request.isActive } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentService.kt index 9646bdb..9d1438d 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentService.kt @@ -118,6 +118,9 @@ class CreatorAdminContentService( } if (request.isActive != null) { + if (!request.isActive) { + audioContent.releaseDate = null + } audioContent.isActive = request.isActive } -- 2.40.1 From 844f9fd79b34efbce02b5aa9b8eacd994db643c3 Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 11 Jan 2024 17:10:09 +0900 Subject: [PATCH 3/5] =?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=ED=8F=AC?= =?UTF-8?q?=EB=A7=B7=20=EC=88=98=EC=A0=95=20(2024-01-01=20PM=2005:00)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/admin/content/AdminContentRepository.kt | 2 +- .../creator/admin/content/CreatorAdminContentRepository.kt | 2 +- 2 files changed, 2 insertions(+), 2 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 ecd4c4d..64fb8e7 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 @@ -74,7 +74,7 @@ class AdminAudioContentQueryRepositoryImpl( audioContent.duration, audioContent.content, formattedDateExpression(audioContent.createdAt), - formattedDateExpression(audioContent.releaseDate, "%Y-%m-%d %r") + formattedDateExpression(audioContent.releaseDate, "%Y-%m-%d %p %H:%i") ) ) .from(audioContent) 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 0dbf851..dbac206 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 @@ -86,7 +86,7 @@ class CreatorAdminAudioContentQueryRepositoryImpl( audioContent.duration, audioContent.content, formattedDateExpression(audioContent.createdAt), - formattedDateExpression(audioContent.releaseDate, "%Y-%m-%d %r") + formattedDateExpression(audioContent.releaseDate, "%Y-%m-%d %p %H:%i") ) ) .from(audioContent) -- 2.40.1 From 92bcbbe065cd762c412b51a0fb754e13a89871eb Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 11 Jan 2024 17:22:11 +0900 Subject: [PATCH 4/5] =?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=ED=8F=AC?= =?UTF-8?q?=EB=A7=B7=20=EC=88=98=EC=A0=95=20(2024-01-01=2017:00)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creator/admin/content/CreatorAdminContentRepository.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 dbac206..3cb2364 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 @@ -86,7 +86,7 @@ class CreatorAdminAudioContentQueryRepositoryImpl( audioContent.duration, audioContent.content, formattedDateExpression(audioContent.createdAt), - formattedDateExpression(audioContent.releaseDate, "%Y-%m-%d %p %H:%i") + formattedDateExpression(audioContent.releaseDate, "%Y-%m-%d %H:%i") ) ) .from(audioContent) -- 2.40.1 From 5ac6750ffe4c8586cbf490899eca339ececc6fad Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 11 Jan 2024 17:35:57 +0900 Subject: [PATCH 5/5] =?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=ED=8F=AC?= =?UTF-8?q?=EB=A7=B7=20=EC=88=98=EC=A0=95=20(2024-01-01=2017:00)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/admin/content/AdminContentRepository.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 64fb8e7..5b146ec 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 @@ -74,7 +74,7 @@ class AdminAudioContentQueryRepositoryImpl( audioContent.duration, audioContent.content, formattedDateExpression(audioContent.createdAt), - formattedDateExpression(audioContent.releaseDate, "%Y-%m-%d %p %H:%i") + formattedDateExpression(audioContent.releaseDate, "%Y-%m-%d %H:%i") ) ) .from(audioContent) -- 2.40.1