From 824cd2f3ea4f7a43fbe3e161ee74770a88fa7dc2 Mon Sep 17 00:00:00 2001 From: Klaus Date: Sun, 5 Jan 2025 15:27:03 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=A4=EB=94=94=EC=85=98=20-=20endDate=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/audition/AdminAuditionRepository.kt | 23 ------------------- .../admin/audition/AdminAuditionService.kt | 12 ---------- .../admin/audition/CreateAuditionRequest.kt | 15 ------------ .../admin/audition/GetAuditionListResponse.kt | 1 - .../admin/audition/UpdateAuditionRequest.kt | 1 - .../vividnext/sodalive/audition/Audition.kt | 2 -- 6 files changed, 54 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/AdminAuditionRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/AdminAuditionRepository.kt index a457e59..dbdbe16 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/AdminAuditionRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/AdminAuditionRepository.kt @@ -1,16 +1,11 @@ package kr.co.vividnext.sodalive.admin.audition -import com.querydsl.core.types.dsl.CaseBuilder -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 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, AdminAuditionQueryRepository @@ -33,10 +28,6 @@ class AdminAuditionQueryRepositoryImpl( QGetAuditionListItem( audition.id, audition.title, - CaseBuilder() - .`when`(audition.endDate.isNotNull) - .then(getFormattedDate(audition.endDate)) - .otherwise(""), audition.imagePath.prepend("/").prepend(coverImageHost), audition.isAdult, audition.information, @@ -75,18 +66,4 @@ class AdminAuditionQueryRepositoryImpl( .where(audition.id.eq(auditionId)) .fetchFirst() } - - private fun getFormattedDate(dateTimePath: DateTimePath): 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" - ) - } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/AdminAuditionService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/AdminAuditionService.kt index 774b5b8..b0ad818 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/AdminAuditionService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/AdminAuditionService.kt @@ -11,9 +11,6 @@ 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( @@ -68,15 +65,6 @@ class AdminAuditionService( 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) - .atZone(ZoneId.of("Asia/Seoul")) - .withZoneSameInstant(ZoneId.of("UTC")) - .toLocalDateTime() - audition.endDate = endDate - } - if (request.originalWorkUrl != null) { audition.originalWorkUrl = request.originalWorkUrl } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/CreateAuditionRequest.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/CreateAuditionRequest.kt index 647fa34..ccf7a10 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/CreateAuditionRequest.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/CreateAuditionRequest.kt @@ -2,15 +2,11 @@ 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 { @@ -24,21 +20,10 @@ data class CreateAuditionRequest( } 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 ) } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/GetAuditionListResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/GetAuditionListResponse.kt index 4858790..8d63ef2 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/GetAuditionListResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/GetAuditionListResponse.kt @@ -11,7 +11,6 @@ data class GetAuditionListResponse( data class GetAuditionListItem @QueryProjection constructor( val id: Long, val title: String, - val endDate: String, val imageUrl: String, val isAdult: Boolean, val information: String, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/UpdateAuditionRequest.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/UpdateAuditionRequest.kt index 540e446..a90be2d 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/UpdateAuditionRequest.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/audition/UpdateAuditionRequest.kt @@ -7,7 +7,6 @@ data class UpdateAuditionRequest( 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 diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/audition/Audition.kt b/src/main/kotlin/kr/co/vividnext/sodalive/audition/Audition.kt index 24e2727..ce29dd6 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/audition/Audition.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/audition/Audition.kt @@ -1,7 +1,6 @@ package kr.co.vividnext.sodalive.audition import kr.co.vividnext.sodalive.common.BaseEntity -import java.time.LocalDateTime import javax.persistence.Column import javax.persistence.Entity import javax.persistence.EnumType @@ -13,7 +12,6 @@ data class Audition( @Column(columnDefinition = "TEXT") var information: String, var isAdult: Boolean = false, - var endDate: LocalDateTime? = null, // 원작 URL var originalWorkUrl: String? = null, @Enumerated(value = EnumType.STRING)