Compare commits
No commits in common. "8b10e0e7703655dff68f3c8594642a13b891af6e" and "86450533cf791a4ff69a15adb7027e489b15ecea" have entirely different histories.
8b10e0e770
...
86450533cf
|
@ -41,13 +41,12 @@ class AdminAuditionQueryRepositoryImpl(
|
|||
.otherwise(""),
|
||||
audition.imagePath.prepend("/").prepend(coverImageHost),
|
||||
audition.isAdult,
|
||||
audition.isActive,
|
||||
audition.information,
|
||||
audition.status,
|
||||
audition.originalWorkUrl.coalesce("")
|
||||
)
|
||||
)
|
||||
.from(audition)
|
||||
.where(audition.isActive.isTrue)
|
||||
.offset(offset)
|
||||
.limit(limit)
|
||||
.orderBy(audition.isActive.desc(), audition.id.desc())
|
||||
|
@ -75,8 +74,7 @@ class AdminAuditionQueryRepositoryImpl(
|
|||
QGetAuditionDetailRole(
|
||||
auditionRole.id,
|
||||
auditionRole.name,
|
||||
auditionRole.imagePath.prepend("/").prepend(coverImageHost),
|
||||
auditionRole.status
|
||||
auditionRole.imagePath.prepend("/").prepend(coverImageHost)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package kr.co.vividnext.sodalive.admin.audition
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper
|
||||
import kr.co.vividnext.sodalive.audition.AuditionStatus
|
||||
import kr.co.vividnext.sodalive.aws.s3.S3Uploader
|
||||
import kr.co.vividnext.sodalive.common.SodaException
|
||||
import kr.co.vividnext.sodalive.utils.generateFileName
|
||||
|
@ -55,17 +54,6 @@ class AdminAuditionService(
|
|||
audition.isAdult = request.isAdult
|
||||
}
|
||||
|
||||
if (request.status != null) {
|
||||
if (
|
||||
(audition.status == AuditionStatus.COMPLETED || audition.status == AuditionStatus.IN_PROGRESS) &&
|
||||
request.status == AuditionStatus.NOT_STARTED
|
||||
) {
|
||||
throw SodaException("모집전 상태로 변경할 수 없습니다.")
|
||||
}
|
||||
|
||||
audition.status = request.status
|
||||
}
|
||||
|
||||
if (request.endDateString != null) {
|
||||
val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
|
||||
val endDate = LocalDateTime.parse(request.endDateString, dateTimeFormatter)
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package kr.co.vividnext.sodalive.admin.audition
|
||||
|
||||
import com.querydsl.core.annotations.QueryProjection
|
||||
import kr.co.vividnext.sodalive.audition.AuditionStatus
|
||||
|
||||
data class GetAuditionDetailResponse @QueryProjection constructor(
|
||||
val id: Long,
|
||||
|
@ -15,6 +14,5 @@ data class GetAuditionDetailResponse @QueryProjection constructor(
|
|||
data class GetAuditionDetailRole @QueryProjection constructor(
|
||||
val id: Long,
|
||||
val name: String,
|
||||
val imageUrl: String,
|
||||
val status: AuditionStatus
|
||||
val imageUrl: String
|
||||
)
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package kr.co.vividnext.sodalive.admin.audition
|
||||
|
||||
import com.querydsl.core.annotations.QueryProjection
|
||||
import kr.co.vividnext.sodalive.audition.AuditionStatus
|
||||
|
||||
data class GetAuditionListResponse(
|
||||
val totalCount: Int,
|
||||
|
@ -14,7 +13,7 @@ data class GetAuditionListItem @QueryProjection constructor(
|
|||
val endDate: String,
|
||||
val imageUrl: String,
|
||||
val isAdult: Boolean,
|
||||
val isActive: Boolean,
|
||||
val information: String,
|
||||
val status: AuditionStatus,
|
||||
val originalWorkUrl: String
|
||||
)
|
||||
|
|
|
@ -1,14 +1,11 @@
|
|||
package kr.co.vividnext.sodalive.admin.audition
|
||||
|
||||
import kr.co.vividnext.sodalive.audition.AuditionStatus
|
||||
|
||||
data class UpdateAuditionRequest(
|
||||
val id: Long,
|
||||
val title: String? = null,
|
||||
val information: String? = null,
|
||||
val isAdult: Boolean? = null,
|
||||
val endDateString: String? = null,
|
||||
val status: AuditionStatus? = null,
|
||||
val originalWorkUrl: String? = null,
|
||||
val isActive: Boolean? = null
|
||||
)
|
||||
|
|
|
@ -4,8 +4,6 @@ import kr.co.vividnext.sodalive.common.BaseEntity
|
|||
import java.time.LocalDateTime
|
||||
import javax.persistence.Column
|
||||
import javax.persistence.Entity
|
||||
import javax.persistence.EnumType
|
||||
import javax.persistence.Enumerated
|
||||
|
||||
@Entity
|
||||
data class Audition(
|
||||
|
@ -15,9 +13,7 @@ data class Audition(
|
|||
var isAdult: Boolean = false,
|
||||
var endDate: LocalDateTime? = null,
|
||||
// 원작 URL
|
||||
var originalWorkUrl: String? = null,
|
||||
@Enumerated(value = EnumType.STRING)
|
||||
var status: AuditionStatus = AuditionStatus.NOT_STARTED
|
||||
var originalWorkUrl: String? = null
|
||||
) : BaseEntity() {
|
||||
var isActive: Boolean = true
|
||||
var imagePath: String? = null
|
||||
|
|
|
@ -10,8 +10,7 @@ import javax.persistence.ManyToOne
|
|||
data class AuditionRole(
|
||||
var name: String,
|
||||
// 오디션 대본 URL
|
||||
var auditionScriptUrl: String? = null,
|
||||
var status: AuditionStatus = AuditionStatus.IN_PROGRESS
|
||||
var auditionScriptUrl: String? = null
|
||||
) : BaseEntity() {
|
||||
var isActive: Boolean = true
|
||||
var imagePath: String? = null
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
package kr.co.vividnext.sodalive.audition
|
||||
|
||||
enum class AuditionStatus {
|
||||
NOT_STARTED,
|
||||
IN_PROGRESS,
|
||||
COMPLETED
|
||||
}
|
Loading…
Reference in New Issue