klaus
/
sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent 84deaaa970 3c90f065fb
commit 367faac5c3
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/kotlin/kr/co/vividnext/sodalive/admin/content/curation/AdminContentCurationRepository.kt
View File

@ -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()
}

1
src/main/kotlin/kr/co/vividnext/sodalive/content/main/tab/series/AudioContentMainTabSeriesService.kt
View File

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

3
src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt
View File

@ -233,6 +233,8 @@ class ContentSeriesQueryRepositoryImpl(
var where = series.isActive.isTrue
.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) {
@ -247,6 +249,7 @@ class ContentSeriesQueryRepositoryImpl(
.innerJoin(series.member, member)
.leftJoin(blockMember).on(blockMemberCondition)
.where(where)
.orderBy(audioContentCurationItem.orders.asc())
.fetch()
}
}