Merge pull request 'test' (#267) from test into main

Reviewed-on: #267
This commit is contained in:
klaus 2025-02-20 18:24:35 +00:00
commit 367faac5c3
3 changed files with 8 additions and 1 deletions

View File

@ -112,7 +112,10 @@ class AdminContentCurationQueryRepositoryImpl(
series.isActive.isTrue series.isActive.isTrue
.and(series.member.isNotNull) .and(series.member.isNotNull)
.and(series.title.contains(searchWord)) .and(series.title.contains(searchWord))
.and(audioContentCurationItem.id.isNull) .and(
audioContentCurationItem.id.isNull
.or(audioContentCurationItem.isActive.isFalse)
)
) )
.fetch() .fetch()
} }

View File

@ -130,6 +130,7 @@ class AudioContentMainTabSeriesService(
) )
) )
} }
.filter { it.items.isNotEmpty() }
return GetContentMainTabSeriesResponse( return GetContentMainTabSeriesResponse(
contentBannerList = contentBannerList, contentBannerList = contentBannerList,

View File

@ -233,6 +233,8 @@ class ContentSeriesQueryRepositoryImpl(
var where = series.isActive.isTrue var where = series.isActive.isTrue
.and(member.isActive.isTrue) .and(member.isActive.isTrue)
.and(member.role.eq(MemberRole.CREATOR)) .and(member.role.eq(MemberRole.CREATOR))
.and(audioContentCuration.id.eq(curationId))
.and(audioContentCurationItem.isActive.isTrue)
.and(blockMember.id.isNull) .and(blockMember.id.isNull)
if (!isAdult) { if (!isAdult) {
@ -247,6 +249,7 @@ class ContentSeriesQueryRepositoryImpl(
.innerJoin(series.member, member) .innerJoin(series.member, member)
.leftJoin(blockMember).on(blockMemberCondition) .leftJoin(blockMember).on(blockMemberCondition)
.where(where) .where(where)
.orderBy(audioContentCurationItem.orders.asc())
.fetch() .fetch()
} }
} }