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

Compare commits

base: klaus:c8d3210b57993205b84238c65f0504a5e28001c9
Branches Tags
klaus:test
klaus:main
..
compare: klaus:2282a49563e9a5fe1fc38174229fffcbfe52547d
Branches Tags
klaus:main
klaus:test

No commits in common. "c8d3210b57993205b84238c65f0504a5e28001c9" and "2282a49563e9a5fe1fc38174229fffcbfe52547d" have entirely different histories.
c8d3210b57 ... 2282a49563

6 changed files with 8 additions and 18 deletions
Show Stats 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 { override fun getAudioContentTotalCount(searchWord: String): Int {
var where = audioContent.duration.isNotNull var where = audioContent.duration.isNotNull
.and(audioContent.member.isNotNull) .and(audioContent.member.isNotNull)
.and(audioContent.isActive.isTrue.or(audioContent.releaseDate.isNotNull)) .and(audioContent.isActive.isTrue)
if (searchWord.trim().length > 1) { if (searchWord.trim().length > 1) {
where = where.and( where = where.and(
@ -49,7 +49,7 @@ class AdminAudioContentQueryRepositoryImpl(
override fun getAudioContentList(offset: Long, limit: Long, searchWord: String): List<GetAdminContentListItem> { override fun getAudioContentList(offset: Long, limit: Long, searchWord: String): List<GetAdminContentListItem> {
var where = audioContent.duration.isNotNull var where = audioContent.duration.isNotNull
.and(audioContent.member.isNotNull) .and(audioContent.member.isNotNull)
.and(audioContent.isActive.isTrue.or(audioContent.releaseDate.isNotNull)) .and(audioContent.isActive.isTrue)
if (searchWord.trim().length > 1) { if (searchWord.trim().length > 1) {
where = where.and( where = where.and(
@ -73,8 +73,7 @@ class AdminAudioContentQueryRepositoryImpl(
audioContent.isAdult, audioContent.isAdult,
audioContent.duration, audioContent.duration,
audioContent.content, audioContent.content,
formattedDateExpression(audioContent.createdAt), formattedDateExpression(audioContent.createdAt)
formattedDateExpression(audioContent.releaseDate, "%Y-%m-%d %H:%i")
) )
) )
.from(audioContent) .from(audioContent)

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

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

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

@ -20,8 +20,7 @@ data class GetAdminContentListItem @QueryProjection constructor(
val isAdult: Boolean, val isAdult: Boolean,
val remainingTime: String, val remainingTime: String,
var contentUrl: String, var contentUrl: String,
val date: String, val date: String
val releaseDate: String?
) { ) {
var tags: 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 { override fun getAudioContentTotalCount(memberId: Long, searchWord: String): Int {
var where = audioContent.duration.isNotNull var where = audioContent.duration.isNotNull
.and(audioContent.member.isNotNull) .and(audioContent.member.isNotNull)
.and(audioContent.isActive.isTrue.or(audioContent.releaseDate.isNotNull)) .and(audioContent.isActive.isTrue)
.and(audioContent.member.id.eq(memberId)) .and(audioContent.member.id.eq(memberId))
if (searchWord.trim().length > 1) { if (searchWord.trim().length > 1) {
@ -61,7 +61,7 @@ class CreatorAdminAudioContentQueryRepositoryImpl(
): List<GetCreatorAdminContentListItem> { ): List<GetCreatorAdminContentListItem> {
var where = audioContent.duration.isNotNull var where = audioContent.duration.isNotNull
.and(audioContent.member.isNotNull) .and(audioContent.member.isNotNull)
.and(audioContent.isActive.isTrue.or(audioContent.releaseDate.isNotNull)) .and(audioContent.isActive.isTrue)
.and(audioContent.member.id.eq(memberId)) .and(audioContent.member.id.eq(memberId))
if (searchWord.trim().length > 1) { if (searchWord.trim().length > 1) {
@ -85,8 +85,7 @@ class CreatorAdminAudioContentQueryRepositoryImpl(
audioContent.isCommentAvailable, audioContent.isCommentAvailable,
audioContent.duration, audioContent.duration,
audioContent.content, audioContent.content,
formattedDateExpression(audioContent.createdAt), formattedDateExpression(audioContent.createdAt)
formattedDateExpression(audioContent.releaseDate, "%Y-%m-%d %H:%i")
) )
) )
.from(audioContent) .from(audioContent)

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

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

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

@ -19,8 +19,7 @@ data class GetCreatorAdminContentListItem @QueryProjection constructor(
val isCommentAvailable: Boolean, val isCommentAvailable: Boolean,
val remainingTime: String, val remainingTime: String,
var contentUrl: String, var contentUrl: String,
val date: String, val date: String
val releaseDate: String?
) { ) {
var tags: String = "" var tags: String = ""
} }