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

test #115

Merged
klaus merged 5 commits from test into main 2024-01-11 09:05:45 +00:00
Conversation 0 Commits 5 Files Changed 6 +18 -8
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentRepository.kt
View File

@ -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<GetAdminContentListItem> {
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 %H:%i")
)
)
.from(audioContent)

3
src/main/kotlin/kr/co/vividnext/sodalive/admin/content/AdminContentService.kt
View File

@ -94,6 +94,9 @@ class AdminContentService(
}
if (request.isActive != null) {
if (!request.isActive) {
audioContent.releaseDate = null
}
audioContent.isActive = request.isActive
}

3
src/main/kotlin/kr/co/vividnext/sodalive/admin/content/GetAdminContentListResponse.kt
View File

@ -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 = ""
}

7
src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentRepository.kt
View File

@ -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<GetCreatorAdminContentListItem> {
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 %H:%i")
)
)
.from(audioContent)

3
src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/CreatorAdminContentService.kt
View File

@ -118,6 +118,9 @@ class CreatorAdminContentService(
}
if (request.isActive != null) {
if (!request.isActive) {
audioContent.releaseDate = null
}
audioContent.isActive = request.isActive
}

3
src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/GetCreatorAdminContentListResponse.kt
View File

@ -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 = ""
}