src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContent.kt

@@ -32,7 +32,7 @@ data class AudioContent(
     var title: String,
     @Column(columnDefinition = "TEXT", nullable = false)
     var detail: String,
-    var price: Int = 0,
+    val price: Int = 0,
     var releaseDate: LocalDateTime? = null,
     val limited: Int? = null,
     var remaining: Int? = null,

src/main/kotlin/kr/co/vividnext/sodalive/content/ContentPriceChangeLog.kt

@@ -1,29 +0,0 @@
-package kr.co.vividnext.sodalive.content
-
-import java.time.LocalDateTime
-import javax.persistence.Entity
-import javax.persistence.FetchType
-import javax.persistence.GeneratedValue
-import javax.persistence.GenerationType
-import javax.persistence.Id
-import javax.persistence.JoinColumn
-import javax.persistence.ManyToOne
-import javax.persistence.PrePersist
-
-@Entity
-data class ContentPriceChangeLog(
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var id: Long? = null,
-    val prevPrice: Int,
-    var createdAt: LocalDateTime? = null
-) {
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "content_id", nullable = false)
-    var audioContent: AudioContent? = null
-
-    @PrePersist
-    fun prePersist() {
-        createdAt = LocalDateTime.now()
-    }
-}

src/main/kotlin/kr/co/vividnext/sodalive/content/ContentPriceChangeLogRepository.kt

@@ -1,5 +0,0 @@
-package kr.co.vividnext.sodalive.content
-
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface ContentPriceChangeLogRepository : JpaRepository<ContentPriceChangeLog, Long>

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

@@ -5,8 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import kr.co.vividnext.sodalive.aws.cloudfront.AudioContentCloudFront
 import kr.co.vividnext.sodalive.aws.s3.S3Uploader
 import kr.co.vividnext.sodalive.common.SodaException
-import kr.co.vividnext.sodalive.content.ContentPriceChangeLog
-import kr.co.vividnext.sodalive.content.ContentPriceChangeLogRepository
 import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.utils.generateFileName
 import org.springframework.beans.factory.annotation.Value
@@ -18,7 +16,6 @@ import org.springframework.web.multipart.MultipartFile
 @Service
 class CreatorAdminContentService(
     private val repository: CreatorAdminContentRepository,
-    private val contentPriceChangeLogRepository: ContentPriceChangeLogRepository,
     private val audioContentCloudFront: AudioContentCloudFront,
     private val objectMapper: ObjectMapper,
     private val s3Uploader: S3Uploader,
@@ -142,15 +139,5 @@ class CreatorAdminContentService(
         if (request.detail != null) {
             audioContent.detail = request.detail
         }
-
-        if (request.price != null) {
-            if (request.price < 5) throw SodaException("콘텐츠의 최소금액은 5캔 입니다.")
-
-            val contentPriceChangeLog = ContentPriceChangeLog(prevPrice = audioContent.price)
-            contentPriceChangeLog.audioContent = audioContent
-            contentPriceChangeLogRepository.save(contentPriceChangeLog)
-
-            audioContent.price = request.price
-        }
     }
 }

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/content/UpdateCreatorAdminContentRequest.kt

@@ -4,7 +4,6 @@ data class UpdateCreatorAdminContentRequest(
     val id: Long,
     val title: String?,
     val detail: String?,
-    val price: Int?,
     val isAdult: Boolean?,
     val isActive: Boolean?,
     val isCommentAvailable: Boolean?

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/CreatorAdminSignatureController.kt

@@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.creator.admin.signature
 
 import kr.co.vividnext.sodalive.common.ApiResponse
 import kr.co.vividnext.sodalive.common.SodaException
-import kr.co.vividnext.sodalive.live.signature.SignatureCanSortType
 import kr.co.vividnext.sodalive.member.Member
 import org.springframework.data.domain.Pageable
 import org.springframework.security.access.prepost.PreAuthorize
@@ -22,18 +21,11 @@ class CreatorAdminSignatureController(private val service: CreatorAdminSignature
     @GetMapping
     fun getSignatureCanList(
         pageable: Pageable,
-        @RequestParam("sort-type", required = false) sortType: SignatureCanSortType?,
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
     ) = run {
         if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
 
-        ApiResponse.ok(
+        ApiResponse.ok(data = service.getSignatureList(pageable, memberId = member.id!!))
-            data = service.getSignatureList(
-                pageable,
-                sortType ?: SignatureCanSortType.NEWEST,
-                memberId = member.id!!
-            )
-        )
     }
 
     @PostMapping

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/CreatorAdminSignatureRepository.kt

@@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.creator.admin.signature
 import com.querydsl.jpa.impl.JPAQueryFactory
 import kr.co.vividnext.sodalive.live.signature.QSignatureCan.signatureCan
 import kr.co.vividnext.sodalive.live.signature.SignatureCan
-import kr.co.vividnext.sodalive.live.signature.SignatureCanSortType
 import kr.co.vividnext.sodalive.member.QMember.member
 import org.springframework.data.jpa.repository.JpaRepository
 
@@ -12,13 +11,7 @@ interface CreatorAdminSignatureRepository : JpaRepository<SignatureCan, Long>, C
 interface CreatorAdminSignatureQueryRepository {
     fun getSignatureListTotalCount(memberId: Long): Int
 
-    fun getSignatureList(
+    fun getSignatureList(memberId: Long, imageHost: String, offset: Long, limit: Long): List<GetSignatureListItem>
-        memberId: Long,
-        sortType: SignatureCanSortType,
-        imageHost: String,
-        offset: Long,
-        limit: Long
-    ): List<GetSignatureListItem>
 
     fun findSignatureByIdOrNull(id: Long, memberId: Long): SignatureCan?
 }
@@ -39,25 +32,10 @@ class CreatorAdminSignatureQueryRepositoryImpl(
 
     override fun getSignatureList(
         memberId: Long,
-        sortType: SignatureCanSortType,
         imageHost: String,
         offset: Long,
         limit: Long
     ): List<GetSignatureListItem> {
-        val orderBy = when (sortType) {
-            SignatureCanSortType.CAN_HIGH -> {
-                signatureCan.can.desc()
-            }
-
-            SignatureCanSortType.CAN_LOW -> {
-                signatureCan.can.asc()
-            }
-
-            else -> {
-                signatureCan.id.desc()
-            }
-        }
-
         return queryFactory.select(
             QGetSignatureListItem(
                 signatureCan.id,
@@ -76,7 +54,7 @@ class CreatorAdminSignatureQueryRepositoryImpl(
             )
             .offset(offset)
             .limit(limit)
-            .orderBy(orderBy)
+            .orderBy(signatureCan.id.desc())
             .fetch()
     }
 

src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/CreatorAdminSignatureService.kt

@@ -4,7 +4,6 @@ import com.amazonaws.services.s3.model.ObjectMetadata
 import kr.co.vividnext.sodalive.aws.s3.S3Uploader
 import kr.co.vividnext.sodalive.common.SodaException
 import kr.co.vividnext.sodalive.live.signature.SignatureCan
-import kr.co.vividnext.sodalive.live.signature.SignatureCanSortType
 import kr.co.vividnext.sodalive.member.MemberRepository
 import kr.co.vividnext.sodalive.utils.generateFileName
 import org.springframework.beans.factory.annotation.Value
@@ -25,15 +24,10 @@ class CreatorAdminSignatureService(
     @Value("\${cloud.aws.cloud-front.host}")
     private val imageHost: String
 ) {
-    fun getSignatureList(
+    fun getSignatureList(pageable: Pageable, memberId: Long): GetSignatureListResponse {
-        pageable: Pageable,
-        sortType: SignatureCanSortType,
-        memberId: Long
-    ): GetSignatureListResponse {
         val totalCount = repository.getSignatureListTotalCount(memberId = memberId)
         val items = repository.getSignatureList(
             memberId = memberId,
-            sortType = sortType,
             imageHost = imageHost,
             offset = pageable.offset,
             limit = pageable.pageSize.toLong()

src/main/kotlin/kr/co/vividnext/sodalive/live/signature/SignatureCanSortType.kt

@@ -1,5 +0,0 @@
-package kr.co.vividnext.sodalive.live.signature
-
-enum class SignatureCanSortType {
-    NEWEST, CAN_HIGH, CAN_LOW
-}