From 5182d03b1647c6fc28510a9ff245c2d81dd28f77 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 21 Feb 2025 02:56:54 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EC=8B=9C=EB=A6=AC=EC=A6=88=20=ED=83=AD=20-=20?= =?UTF-8?q?=ED=81=90=EB=A0=88=EC=9D=B4=EC=85=98=20-=20=EB=AA=A8=EB=93=A0?= =?UTF-8?q?=20=ED=81=90=EB=A0=88=EC=9D=B4=EC=85=98=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=EA=B0=80=20=EC=8B=9C=EB=A6=AC=EC=A6=88=20=ED=81=90?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=EC=97=90=20=EC=A4=91=EB=B3=B5?= =?UTF-8?q?=EB=90=98=EC=96=B4=20=EB=82=98=EC=98=A4=EB=8A=94=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/content/series/ContentSeriesRepository.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt index 97631d0..e3825b9 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt @@ -231,6 +231,7 @@ class ContentSeriesQueryRepositoryImpl( .and(blockMember.blockedMember.id.eq(memberId)) var where = series.isActive.isTrue + .and(audioContentCuration.id.eq(curationId)) .and(member.isActive.isTrue) .and(member.role.eq(MemberRole.CREATOR)) .and(blockMember.id.isNull) -- 2.40.1 From 8b731999a7910792c9864e38754f950f2f784bbe Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 21 Feb 2025 03:05:08 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EC=8B=9C=EB=A6=AC=EC=A6=88=20=ED=83=AD=20-=20?= =?UTF-8?q?=ED=81=90=EB=A0=88=EC=9D=B4=EC=85=98=20-=20=EC=8B=9C=EB=A6=AC?= =?UTF-8?q?=EC=A6=88=20=EC=A0=95=EB=A0=AC=20=EC=B6=94=EA=B0=80=20-=20?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=EC=9D=B4=20=EC=B6=94=EA=B0=80=EB=90=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EC=9D=80=20=ED=81=90=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=85=98=EC=9D=80=20=EB=B3=B4=EC=9D=B4=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/tab/series/AudioContentMainTabSeriesService.kt | 1 + .../sodalive/content/series/ContentSeriesRepository.kt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/series/AudioContentMainTabSeriesService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/series/AudioContentMainTabSeriesService.kt index 479c015..44d256f 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/series/AudioContentMainTabSeriesService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/series/AudioContentMainTabSeriesService.kt @@ -130,6 +130,7 @@ class AudioContentMainTabSeriesService( ) ) } + .filter { it.items.isNotEmpty() } return GetContentMainTabSeriesResponse( contentBannerList = contentBannerList, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt index e3825b9..0dd3803 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt @@ -231,9 +231,10 @@ class ContentSeriesQueryRepositoryImpl( .and(blockMember.blockedMember.id.eq(memberId)) var where = series.isActive.isTrue - .and(audioContentCuration.id.eq(curationId)) .and(member.isActive.isTrue) .and(member.role.eq(MemberRole.CREATOR)) + .and(audioContentCuration.id.eq(curationId)) + .and(audioContentCurationItem.isActive.isTrue) .and(blockMember.id.isNull) if (!isAdult) { @@ -248,6 +249,7 @@ class ContentSeriesQueryRepositoryImpl( .innerJoin(series.member, member) .leftJoin(blockMember).on(blockMemberCondition) .where(where) + .orderBy(audioContentCurationItem.orders.asc()) .fetch() } } -- 2.40.1 From 3c90f065fb2ed84107268779aa6e9eb33046a3c6 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 21 Feb 2025 03:18:41 +0900 Subject: [PATCH 3/3] =?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=A9=94=EC=9D=B8=20=EC=8B=9C=EB=A6=AC?= =?UTF-8?q?=EC=A6=88=20=ED=83=AD=20-=20=ED=81=90=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20-=20=EC=8B=9C=EB=A6=AC=EC=A6=88=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=EC=8B=9C=20=ED=81=90=EB=A0=88=EC=9D=B4=EC=85=98?= =?UTF-8?q?=EC=97=90=20=EC=B6=94=EA=B0=80=EB=90=98=EC=97=88=EB=8B=A4?= =?UTF-8?q?=EA=B0=80=20=EC=82=AD=EC=A0=9C=EB=90=9C=20=EC=8B=9C=EB=A6=AC?= =?UTF-8?q?=EC=A6=88=EB=8F=84=20=EA=B2=80=EC=83=89=20=EB=90=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/content/curation/AdminContentCurationRepository.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/curation/AdminContentCurationRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/curation/AdminContentCurationRepository.kt index c010b03..610a1c1 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/curation/AdminContentCurationRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/content/curation/AdminContentCurationRepository.kt @@ -112,7 +112,10 @@ class AdminContentCurationQueryRepositoryImpl( series.isActive.isTrue .and(series.member.isNotNull) .and(series.title.contains(searchWord)) - .and(audioContentCurationItem.id.isNull) + .and( + audioContentCurationItem.id.isNull + .or(audioContentCurationItem.isActive.isFalse) + ) ) .fetch() } -- 2.40.1