Compare commits

..

No commits in common. "99fdf473ae84df6cf348067582fae0d091dcc248" and "0c4dc7e5df49199990a5bba8bb77378d2d669aa2" have entirely different histories.

18 changed files with 0 additions and 670 deletions

View File

@ -1,43 +0,0 @@
package kr.co.vividnext.sodalive.admin.audition
import kr.co.vividnext.sodalive.common.ApiResponse
import org.springframework.data.domain.Pageable
import org.springframework.security.access.prepost.PreAuthorize
import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.PathVariable
import org.springframework.web.bind.annotation.PostMapping
import org.springframework.web.bind.annotation.PutMapping
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RequestPart
import org.springframework.web.bind.annotation.RestController
import org.springframework.web.multipart.MultipartFile
@RestController
@PreAuthorize("hasRole('ADMIN')")
@RequestMapping("/admin/audition")
class AdminAuditionController(private val service: AdminAuditionService) {
@PostMapping
fun createAudition(
@RequestPart("image") image: MultipartFile,
@RequestPart("request") requestString: String
) = ApiResponse.ok(service.createAudition(image, requestString), "등록되었습니다.")
@PutMapping
fun updateAudition(
@RequestPart("image", required = false) image: MultipartFile? = null,
@RequestPart("request") requestString: String
) = ApiResponse.ok(service.updateAudition(image, requestString), "수정되었습니다.")
@GetMapping
fun getAuditionList(pageable: Pageable) = ApiResponse.ok(
service.getAuditionList(
offset = pageable.offset,
limit = pageable.pageSize.toLong()
)
)
@GetMapping("/{id}")
fun getAuditionDetail(@PathVariable id: Long) = ApiResponse.ok(
service.getAuditionDetail(auditionId = id)
)
}

View File

@ -1,97 +0,0 @@
package kr.co.vividnext.sodalive.admin.audition
import com.querydsl.core.group.GroupBy.list
import com.querydsl.core.types.dsl.DateTimePath
import com.querydsl.core.types.dsl.Expressions
import com.querydsl.core.types.dsl.StringTemplate
import com.querydsl.jpa.impl.JPAQueryFactory
import kr.co.vividnext.sodalive.audition.Audition
import kr.co.vividnext.sodalive.audition.QAudition.audition
import kr.co.vividnext.sodalive.audition.QAuditionRole.auditionRole
import org.springframework.beans.factory.annotation.Value
import org.springframework.data.jpa.repository.JpaRepository
import org.springframework.stereotype.Repository
import java.time.LocalDateTime
@Repository
interface AdminAuditionRepository : JpaRepository<Audition, Long>, AdminAuditionQueryRepository
interface AdminAuditionQueryRepository {
fun getAuditionList(offset: Long, limit: Long): List<GetAuditionListItem>
fun getAuditionListCount(): Int
fun getAuditionDetail(auditionId: Long): GetAuditionDetailResponse
}
class AdminAuditionQueryRepositoryImpl(
private val queryFactory: JPAQueryFactory,
@Value("\${cloud.aws.cloud-front.host}")
private val coverImageHost: String
) : AdminAuditionQueryRepository {
override fun getAuditionList(offset: Long, limit: Long): List<GetAuditionListItem> {
return queryFactory
.select(
QGetAuditionListItem(
audition.id,
audition.title,
getFormattedDate(audition.endDate),
audition.imagePath.prepend("/").prepend(coverImageHost),
audition.isAdult,
audition.isActive,
audition.information,
audition.originalWorkUrl
)
)
.from(audition)
.offset(offset)
.limit(limit)
.orderBy(audition.isActive.desc(), audition.id.desc())
.fetch()
}
override fun getAuditionListCount(): Int {
return queryFactory
.select(audition.id)
.from(audition)
.fetch()
.size
}
override fun getAuditionDetail(auditionId: Long): GetAuditionDetailResponse {
return queryFactory
.select(
QGetAuditionDetailResponse(
audition.id,
audition.title,
audition.imagePath.prepend("/").prepend(coverImageHost),
audition.information,
audition.originalWorkUrl,
list(
QGetAuditionDetailRole(
auditionRole.id,
auditionRole.name,
auditionRole.imagePath.prepend("/").prepend(coverImageHost)
)
)
)
)
.from(audition)
.leftJoin(auditionRole).on(auditionRole.audition.id.eq(audition.id))
.where(audition.id.eq(auditionId))
.fetchFirst()
}
private fun getFormattedDate(dateTimePath: DateTimePath<LocalDateTime>): StringTemplate {
return Expressions.stringTemplate(
"DATE_FORMAT({0}, {1})",
Expressions.dateTimeTemplate(
LocalDateTime::class.java,
"CONVERT_TZ({0},{1},{2})",
dateTimePath,
"UTC",
"Asia/Seoul"
),
"%Y-%m-%d %H:%i:%s"
)
}
}

View File

@ -1,94 +0,0 @@
package kr.co.vividnext.sodalive.admin.audition
import com.fasterxml.jackson.databind.ObjectMapper
import kr.co.vividnext.sodalive.aws.s3.S3Uploader
import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.utils.generateFileName
import org.springframework.beans.factory.annotation.Value
import org.springframework.data.repository.findByIdOrNull
import org.springframework.stereotype.Service
import org.springframework.transaction.annotation.Transactional
import org.springframework.web.multipart.MultipartFile
import java.time.LocalDateTime
import java.time.ZoneId
import java.time.format.DateTimeFormatter
@Service
class AdminAuditionService(
private val s3Uploader: S3Uploader,
private val objectMapper: ObjectMapper,
private val repository: AdminAuditionRepository,
@Value("\${cloud.aws.s3.bucket}")
private val bucket: String
) {
@Transactional
fun createAudition(image: MultipartFile, requestString: String) {
val request = objectMapper.readValue(requestString, CreateAuditionRequest::class.java)
val audition = repository.save(request.toAudition())
val fileName = generateFileName("audition")
val imagePath = s3Uploader.upload(
inputStream = image.inputStream,
bucket = bucket,
filePath = "audition/production/${audition.id}/$fileName"
)
audition.imagePath = imagePath
}
@Transactional
fun updateAudition(image: MultipartFile?, requestString: String) {
val request = objectMapper.readValue(requestString, UpdateAuditionRequest::class.java)
val audition = repository.findByIdOrNull(id = request.id)
?: throw SodaException("잘못된 요청입니다.\n다시 시도해 주세요.")
if (request.title != null) {
audition.title = request.title
}
if (request.information != null) {
audition.information = request.information
}
if (request.isAdult != null) {
audition.isAdult = request.isAdult
}
if (request.endDateString != null) {
val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
val endDate = LocalDateTime.parse(request.endDateString, dateTimeFormatter)
.atZone(ZoneId.of("Asia/Seoul"))
.withZoneSameInstant(ZoneId.of("UTC"))
.toLocalDateTime()
audition.endDate = endDate
}
if (request.originalWorkUrl != null) {
audition.originalWorkUrl = request.originalWorkUrl
}
if (image != null) {
val fileName = generateFileName("audition")
val imagePath = s3Uploader.upload(
inputStream = image.inputStream,
bucket = bucket,
filePath = "audition/production/${audition.id}/$fileName"
)
audition.imagePath = imagePath
}
if (request.isActive != null) {
audition.isActive = request.isActive
}
}
fun getAuditionList(offset: Long, limit: Long): GetAuditionListResponse {
val totalCount = repository.getAuditionListCount()
val items = repository.getAuditionList(offset = offset, limit = limit)
return GetAuditionListResponse(totalCount, items)
}
fun getAuditionDetail(auditionId: Long): GetAuditionDetailResponse {
return repository.getAuditionDetail(auditionId = auditionId)
}
}

View File

@ -1,45 +0,0 @@
package kr.co.vividnext.sodalive.admin.audition
import kr.co.vividnext.sodalive.audition.Audition
import kr.co.vividnext.sodalive.common.SodaException
import java.time.LocalDateTime
import java.time.ZoneId
import java.time.format.DateTimeFormatter
data class CreateAuditionRequest(
val title: String,
val information: String,
val isAdult: Boolean = false,
val endDateString: String? = null,
val originalWorkUrl: String? = null
) {
init {
if (title.isBlank()) {
throw SodaException("오디션 제목을 입력하세요")
}
if (information.isBlank() || information.length < 10) {
throw SodaException("오디션 정보는 최소 10글자 입니다")
}
}
fun toAudition(): Audition {
val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
val endDate = if (endDateString != null) {
LocalDateTime.parse(endDateString, dateTimeFormatter)
.atZone(ZoneId.of("Asia/Seoul"))
.withZoneSameInstant(ZoneId.of("UTC"))
.toLocalDateTime()
} else {
null
}
return Audition(
title = title,
information = information,
isAdult = isAdult,
endDate = endDate,
originalWorkUrl = originalWorkUrl
)
}
}

View File

@ -1,18 +0,0 @@
package kr.co.vividnext.sodalive.admin.audition
import com.querydsl.core.annotations.QueryProjection
data class GetAuditionDetailResponse @QueryProjection constructor(
val id: Long,
val title: String,
val imageUrl: String,
val information: String,
val originalWorkUrl: String,
val roleList: List<GetAuditionDetailRole> = listOf()
)
data class GetAuditionDetailRole @QueryProjection constructor(
val id: Long,
val name: String,
val imageUrl: String
)

View File

@ -1,19 +0,0 @@
package kr.co.vividnext.sodalive.admin.audition
import com.querydsl.core.annotations.QueryProjection
data class GetAuditionListResponse(
val totalCount: Int,
val items: List<GetAuditionListItem>
)
data class GetAuditionListItem @QueryProjection constructor(
val id: Long,
val title: String,
val endDate: String,
val imageUrl: String,
val isAdult: Boolean,
val isActive: Boolean,
val information: String,
val originalWorkUrl: String
)

View File

@ -1,11 +0,0 @@
package kr.co.vividnext.sodalive.admin.audition
data class UpdateAuditionRequest(
val id: Long,
val title: String? = null,
val information: String? = null,
val isAdult: Boolean? = null,
val endDateString: String? = null,
val originalWorkUrl: String? = null,
val isActive: Boolean? = null
)

View File

@ -1,45 +0,0 @@
package kr.co.vividnext.sodalive.admin.audition.role
import kr.co.vividnext.sodalive.common.ApiResponse
import org.springframework.data.domain.Pageable
import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.PathVariable
import org.springframework.web.bind.annotation.PostMapping
import org.springframework.web.bind.annotation.PutMapping
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RequestPart
import org.springframework.web.bind.annotation.RestController
import org.springframework.web.multipart.MultipartFile
@RestController
@RequestMapping("/admin/audition/role")
class AdminAuditionRoleController(private val service: AdminAuditionRoleService) {
@PostMapping
fun createAuditionRole(
@RequestPart("image") image: MultipartFile,
@RequestPart("request") requestString: String
) = ApiResponse.ok(service.createAuditionRole(image, requestString), "등록되었습니다.")
@PutMapping
fun updateAuditionRole(
@RequestPart("image", required = false) image: MultipartFile? = null,
@RequestPart("request") requestString: String
) = ApiResponse.ok(service.updateAuditionRole(image, requestString), "수정되었습니다.")
@GetMapping("/{id}")
fun getAuditionRoleDetail(@PathVariable id: Long) = ApiResponse.ok(
service.getAuditionRoleDetail(auditionRoleId = id)
)
@GetMapping("/{id}/applicant")
fun getAuditionApplicantList(
@PathVariable id: Long,
pageable: Pageable
) = ApiResponse.ok(
service.getAuditionApplicantList(
auditionRoleId = id,
offset = pageable.offset,
limit = pageable.pageSize.toLong()
)
)
}

View File

@ -1,73 +0,0 @@
package kr.co.vividnext.sodalive.admin.audition.role
import com.querydsl.jpa.impl.JPAQueryFactory
import kr.co.vividnext.sodalive.audition.AuditionRole
import kr.co.vividnext.sodalive.audition.QAuditionApplicant.auditionApplicant
import kr.co.vividnext.sodalive.audition.QAuditionRole.auditionRole
import kr.co.vividnext.sodalive.audition.QAuditionVote.auditionVote
import kr.co.vividnext.sodalive.member.QMember.member
import org.springframework.beans.factory.annotation.Value
import org.springframework.data.jpa.repository.JpaRepository
interface AdminAuditionRoleRepository : JpaRepository<AuditionRole, Long>, AdminAuditionRoleQueryRepository
interface AdminAuditionRoleQueryRepository {
fun getAuditionRoleDetail(auditionRoleId: Long): GetAuditionRoleDetailResponse
fun getAuditionApplicantList(auditionRoleId: Long, offset: Long, limit: Long): List<GetAuditionRoleApplicantItem>
fun getAuditionApplicantTotalCount(auditionRoleId: Long): Int
}
class AdminAuditionRoleQueryRepositoryImpl(
private val queryFactory: JPAQueryFactory,
@Value("\${cloud.aws.cloud-front.host}")
private val cloudfrontHost: String
) : AdminAuditionRoleQueryRepository {
override fun getAuditionRoleDetail(auditionRoleId: Long): GetAuditionRoleDetailResponse {
return queryFactory
.select(
QGetAuditionRoleDetailResponse(
auditionRole.name,
auditionRole.imagePath.prepend("/").prepend(cloudfrontHost),
auditionRole.auditionScriptUrl
)
)
.from(auditionRole)
.where(auditionRole.id.eq(auditionRoleId))
.fetchFirst()
}
override fun getAuditionApplicantList(
auditionRoleId: Long,
offset: Long,
limit: Long
): List<GetAuditionRoleApplicantItem> {
return queryFactory
.select(
QGetAuditionRoleApplicantItem(
auditionApplicant.id,
member.nickname,
member.profileImage.prepend("/").prepend(cloudfrontHost),
auditionApplicant.voicePath.prepend("/").prepend(cloudfrontHost),
auditionVote.id.count()
)
)
.from(auditionApplicant)
.innerJoin(auditionApplicant.member, member)
.innerJoin(auditionApplicant.role, auditionRole)
.leftJoin(auditionVote).on(auditionApplicant.id.eq(auditionVote.applicant.id))
.where(auditionRole.id.eq(auditionRoleId))
.groupBy(auditionApplicant.id)
.fetch()
}
override fun getAuditionApplicantTotalCount(auditionRoleId: Long): Int {
return queryFactory
.select(auditionApplicant.id)
.from(auditionApplicant)
.innerJoin(auditionApplicant.role, auditionRole)
.where(auditionRole.id.eq(auditionRoleId))
.fetch()
.size
}
}

View File

@ -1,81 +0,0 @@
package kr.co.vividnext.sodalive.admin.audition.role
import com.fasterxml.jackson.databind.ObjectMapper
import kr.co.vividnext.sodalive.admin.audition.AdminAuditionRepository
import kr.co.vividnext.sodalive.audition.AuditionRole
import kr.co.vividnext.sodalive.aws.s3.S3Uploader
import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.utils.generateFileName
import org.springframework.beans.factory.annotation.Value
import org.springframework.data.repository.findByIdOrNull
import org.springframework.stereotype.Service
import org.springframework.transaction.annotation.Transactional
import org.springframework.web.multipart.MultipartFile
@Service
class AdminAuditionRoleService(
private val s3Uploader: S3Uploader,
private val objectMapper: ObjectMapper,
private val repository: AdminAuditionRoleRepository,
private val auditionRepository: AdminAuditionRepository,
@Value("\${cloud.aws.s3.bucket}")
private val bucket: String
) {
@Transactional
fun createAuditionRole(image: MultipartFile, requestString: String) {
val request = objectMapper.readValue(requestString, CreateAuditionRoleRequest::class.java)
val auditionRole = AuditionRole(name = request.name, auditionScriptUrl = request.auditionScriptUrl)
val audition = auditionRepository.findByIdOrNull(id = request.auditionId)
?: throw SodaException("잘못된 요청입니다.\n다시 시도해 주세요.")
auditionRole.audition = audition
repository.save(auditionRole)
val fileName = generateFileName("audition_role")
val imagePath = s3Uploader.upload(
inputStream = image.inputStream,
bucket = bucket,
filePath = "audition/role/${auditionRole.id}/$fileName"
)
auditionRole.imagePath = imagePath
}
@Transactional
fun updateAuditionRole(image: MultipartFile?, requestString: String) {
val request = objectMapper.readValue(requestString, UpdateAuditionRoleRequest::class.java)
val auditionRole = repository.findByIdOrNull(id = request.id)
?: throw SodaException("잘못된 요청입니다.\n다시 시도해 주세요.")
if (!request.name.isNullOrBlank() && request.name.length > 2) {
auditionRole.name = request.name
}
if (!request.auditionScriptUrl.isNullOrBlank()) {
auditionRole.auditionScriptUrl = request.auditionScriptUrl
}
if (request.isActive != null) {
auditionRole.isActive = request.isActive
}
if (image != null) {
val fileName = generateFileName("audition_role")
val imagePath = s3Uploader.upload(
inputStream = image.inputStream,
bucket = bucket,
filePath = "audition/role/${auditionRole.id}/$fileName"
)
auditionRole.imagePath = imagePath
}
}
fun getAuditionRoleDetail(auditionRoleId: Long): GetAuditionRoleDetailResponse {
return repository.getAuditionRoleDetail(auditionRoleId = auditionRoleId)
}
fun getAuditionApplicantList(auditionRoleId: Long, offset: Long, limit: Long): GetAuditionRoleApplicantResponse {
val totalCount = repository.getAuditionApplicantTotalCount(auditionRoleId = auditionRoleId)
val items = repository.getAuditionApplicantList(auditionRoleId = auditionRoleId, offset = offset, limit = limit)
return GetAuditionRoleApplicantResponse(totalCount, items)
}
}

View File

@ -1,23 +0,0 @@
package kr.co.vividnext.sodalive.admin.audition.role
import kr.co.vividnext.sodalive.common.SodaException
data class CreateAuditionRoleRequest(
val auditionId: Long,
val name: String,
val auditionScriptUrl: String
) {
init {
if (auditionId < 0) {
throw SodaException("캐릭터가 등록될 오디션을 선택하세요")
}
if (name.isBlank() || name.length < 2) {
throw SodaException("캐릭터명을 입력하세요")
}
if (auditionScriptUrl.isBlank() || auditionScriptUrl.length < 10) {
throw SodaException("오디션 대본 URL을 입력하세요")
}
}
}

View File

@ -1,16 +0,0 @@
package kr.co.vividnext.sodalive.admin.audition.role
import com.querydsl.core.annotations.QueryProjection
data class GetAuditionRoleApplicantResponse(
val totalCount: Int,
val items: List<GetAuditionRoleApplicantItem>
)
data class GetAuditionRoleApplicantItem @QueryProjection constructor(
val applicantId: Long,
val nickname: String,
val profileImageUrl: String,
val voiceUrl: String,
val voteCount: Long
)

View File

@ -1,9 +0,0 @@
package kr.co.vividnext.sodalive.admin.audition.role
import com.querydsl.core.annotations.QueryProjection
data class GetAuditionRoleDetailResponse @QueryProjection constructor(
val name: String,
val imageUrl: String,
val auditionScriptUrl: String
)

View File

@ -1,16 +0,0 @@
package kr.co.vividnext.sodalive.admin.audition.role
import kr.co.vividnext.sodalive.common.SodaException
data class UpdateAuditionRoleRequest(
val id: Long,
val name: String? = null,
val auditionScriptUrl: String? = null,
val isActive: Boolean? = null
) {
init {
if (id < 0) {
throw SodaException("잘못된 요청입니다.")
}
}
}

View File

@ -1,18 +0,0 @@
package kr.co.vividnext.sodalive.audition
import kr.co.vividnext.sodalive.common.BaseEntity
import java.time.LocalDateTime
import javax.persistence.Entity
@Entity
data class Audition(
var title: String,
var information: String,
var isAdult: Boolean = false,
var endDate: LocalDateTime? = null,
// 원작 URL
var originalWorkUrl: String? = null
) : BaseEntity() {
var isActive: Boolean = true
var imagePath: String? = null
}

View File

@ -1,23 +0,0 @@
package kr.co.vividnext.sodalive.audition
import kr.co.vividnext.sodalive.common.BaseEntity
import kr.co.vividnext.sodalive.member.Member
import javax.persistence.Entity
import javax.persistence.FetchType
import javax.persistence.JoinColumn
import javax.persistence.ManyToOne
@Entity
data class AuditionApplicant(
val voicePath: String,
val phoneNumber: String,
val isActive: Boolean = true
) : BaseEntity() {
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "role_id", nullable = false)
var role: AuditionRole? = null
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "member_id", nullable = false)
var member: Member? = null
}

View File

@ -1,21 +0,0 @@
package kr.co.vividnext.sodalive.audition
import kr.co.vividnext.sodalive.common.BaseEntity
import javax.persistence.Entity
import javax.persistence.FetchType
import javax.persistence.JoinColumn
import javax.persistence.ManyToOne
@Entity
data class AuditionRole(
var name: String,
// 오디션 대본 URL
var auditionScriptUrl: String? = null
) : BaseEntity() {
var isActive: Boolean = true
var imagePath: String? = null
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "audition_id", nullable = false)
var audition: Audition? = null
}

View File

@ -1,18 +0,0 @@
package kr.co.vividnext.sodalive.audition
import kr.co.vividnext.sodalive.common.BaseEntity
import kr.co.vividnext.sodalive.member.Member
import javax.persistence.Entity
import javax.persistence.JoinColumn
import javax.persistence.ManyToOne
@Entity
class AuditionVote : BaseEntity() {
@ManyToOne
@JoinColumn(name = "member_id", nullable = false)
var member: Member? = null
@ManyToOne
@JoinColumn(name = "applicant_id", nullable = false)
var applicant: AuditionApplicant? = null
}