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

@@ -25,10 +25,7 @@ import java.time.temporal.TemporalAdjusters
 
 @RestController
 @RequestMapping("/audio-content")
-class AudioContentController(
+class AudioContentController(private val service: AudioContentService) {
-    private val service: AudioContentService,
-    private val repository: AudioContentRepository
-) {
     @PostMapping
     @PreAuthorize("hasRole('CREATOR')")
     fun createAudioContent(
@@ -193,16 +190,4 @@ class AudioContentController(
             )
         )
     }
-
-    @PostMapping("/release")
-    @PreAuthorize("hasRole('BOT')")
-    fun releaseContent() = run {
-        val contentIdList = repository.getNotReleaseContentId()
-
-        contentIdList.forEach {
-            service.releaseContent(it)
-        }
-
-        ApiResponse.ok(null)
-    }
 }

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

@@ -98,8 +98,6 @@ interface AudioContentQueryRepository {
     ): List<GetAudioContentRankingItem>
 
     fun getAudioContentCurationList(isAdult: Boolean, offset: Long, limit: Long): List<AudioContentCuration>
-
-    fun getNotReleaseContentId(): List<Long>
 }
 
 @Repository
@@ -150,11 +148,8 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
             SortType.PRICE_LOW -> audioContent.price.asc()
         }
 
-        var where = audioContent.member.id.eq(creatorId)
+        var where = audioContent.isActive.isTrue
-            .and(
+            .and(audioContent.member.id.eq(creatorId))
-                audioContent.isActive.isTrue
-                    .or(audioContent.releaseDate.isNotNull)
-            )
 
         if (!isAdult) {
             where = where.and(audioContent.isAdult.isFalse)
@@ -173,11 +168,8 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
         creatorId: Long,
         isAdult: Boolean
     ): Int {
-        var where = audioContent.member.id.eq(creatorId)
+        var where = audioContent.isActive.isTrue
-            .and(
+            .and(audioContent.member.id.eq(creatorId))
-                audioContent.isActive.isTrue
-                    .or(audioContent.releaseDate.isNotNull)
-            )
 
         if (!isAdult) {
             where = where.and(audioContent.isAdult.isFalse)
@@ -589,16 +581,4 @@ class AudioContentQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
             .orderBy(audioContentCuration.orders.asc())
             .fetch()
     }
-
-    override fun getNotReleaseContentId(): List<Long> {
-        val where = audioContent.isActive.isFalse
-            .and(audioContent.releaseDate.isNotNull)
-            .and(audioContent.releaseDate.loe(LocalDateTime.now()))
-
-        return queryFactory
-            .select(audioContent.id)
-            .from(audioContent)
-            .where(where)
-            .fetch()
-    }
 }

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

@@ -126,7 +126,6 @@ class AudioContentService(
             ?: throw SodaException("잘못된 콘텐츠 입니다.\n다시 시도해 주세요.")
 
         audioContent.isActive = false
-        audioContent.releaseDate = null
     }
 
     @Transactional
@@ -343,6 +342,7 @@ class AudioContentService(
         val audioContent = repository.findByIdOrNull(contentId)
             ?: throw SodaException("잘못된 요청입니다.")
 
+        audioContent.isActive = true
         audioContent.content = content
         audioContent.duration = duration
 
@@ -358,8 +358,6 @@ class AudioContentService(
         )
 
         if (audioContent.releaseDate == null) {
-            audioContent.isActive = true
-
             applicationEventPublisher.publishEvent(
                 FcmEvent(
                     type = FcmEventType.UPLOAD_CONTENT,
@@ -386,38 +384,6 @@ class AudioContentService(
         }
     }
 
-    @Transactional
-    fun releaseContent(contentId: Long) {
-        val audioContent = repository.findByIdOrNull(contentId)
-            ?: throw SodaException("잘못된 요청입니다.")
-
-        audioContent.isActive = true
-
-        applicationEventPublisher.publishEvent(
-            FcmEvent(
-                type = FcmEventType.UPLOAD_CONTENT,
-                title = audioContent.member!!.nickname,
-                message = "콘텐츠를 업로드 하였습니다. - ${audioContent.title}",
-                isAuth = audioContent.isAdult,
-                contentId = contentId,
-                creatorId = audioContent.member!!.id,
-                container = "ios"
-            )
-        )
-
-        applicationEventPublisher.publishEvent(
-            FcmEvent(
-                type = FcmEventType.UPLOAD_CONTENT,
-                title = audioContent.member!!.nickname,
-                message = "콘텐츠를 업로드 하였습니다. - ${audioContent.title}",
-                isAuth = audioContent.isAdult,
-                contentId = contentId,
-                creatorId = audioContent.member!!.id,
-                container = "aos"
-            )
-        )
-    }
-
     fun getDetail(id: Long, member: Member, timezone: String): GetAudioContentDetailResponse {
         // 묶음 콘텐츠 조회
         val bundleAudioContentList = repository.findBundleByContentId(contentId = id)