Compare commits
No commits in common. "c8d3210b57993205b84238c65f0504a5e28001c9" and "2282a49563e9a5fe1fc38174229fffcbfe52547d" have entirely different histories.
c8d3210b57
...
2282a49563
|
@ -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.or(audioContent.releaseDate.isNotNull))
|
||||
.and(audioContent.isActive.isTrue)
|
||||
|
||||
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.or(audioContent.releaseDate.isNotNull))
|
||||
.and(audioContent.isActive.isTrue)
|
||||
|
||||
if (searchWord.trim().length > 1) {
|
||||
where = where.and(
|
||||
|
@ -73,8 +73,7 @@ class AdminAudioContentQueryRepositoryImpl(
|
|||
audioContent.isAdult,
|
||||
audioContent.duration,
|
||||
audioContent.content,
|
||||
formattedDateExpression(audioContent.createdAt),
|
||||
formattedDateExpression(audioContent.releaseDate, "%Y-%m-%d %H:%i")
|
||||
formattedDateExpression(audioContent.createdAt)
|
||||
)
|
||||
)
|
||||
.from(audioContent)
|
||||
|
|
|
@ -94,9 +94,6 @@ class AdminContentService(
|
|||
}
|
||||
|
||||
if (request.isActive != null) {
|
||||
if (!request.isActive) {
|
||||
audioContent.releaseDate = null
|
||||
}
|
||||
audioContent.isActive = request.isActive
|
||||
}
|
||||
|
||||
|
|
|
@ -20,8 +20,7 @@ data class GetAdminContentListItem @QueryProjection constructor(
|
|||
val isAdult: Boolean,
|
||||
val remainingTime: String,
|
||||
var contentUrl: String,
|
||||
val date: String,
|
||||
val releaseDate: String?
|
||||
val date: String
|
||||
) {
|
||||
var tags: String = ""
|
||||
}
|
||||
|
|
|
@ -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.or(audioContent.releaseDate.isNotNull))
|
||||
.and(audioContent.isActive.isTrue)
|
||||
.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.or(audioContent.releaseDate.isNotNull))
|
||||
.and(audioContent.isActive.isTrue)
|
||||
.and(audioContent.member.id.eq(memberId))
|
||||
|
||||
if (searchWord.trim().length > 1) {
|
||||
|
@ -85,8 +85,7 @@ class CreatorAdminAudioContentQueryRepositoryImpl(
|
|||
audioContent.isCommentAvailable,
|
||||
audioContent.duration,
|
||||
audioContent.content,
|
||||
formattedDateExpression(audioContent.createdAt),
|
||||
formattedDateExpression(audioContent.releaseDate, "%Y-%m-%d %H:%i")
|
||||
formattedDateExpression(audioContent.createdAt)
|
||||
)
|
||||
)
|
||||
.from(audioContent)
|
||||
|
|
|
@ -118,9 +118,6 @@ class CreatorAdminContentService(
|
|||
}
|
||||
|
||||
if (request.isActive != null) {
|
||||
if (!request.isActive) {
|
||||
audioContent.releaseDate = null
|
||||
}
|
||||
audioContent.isActive = request.isActive
|
||||
}
|
||||
|
||||
|
|
|
@ -19,8 +19,7 @@ data class GetCreatorAdminContentListItem @QueryProjection constructor(
|
|||
val isCommentAvailable: Boolean,
|
||||
val remainingTime: String,
|
||||
var contentUrl: String,
|
||||
val date: String,
|
||||
val releaseDate: String?
|
||||
val date: String
|
||||
) {
|
||||
var tags: String = ""
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue