Merge pull request 'test' (#368) from test into main

Reviewed-on: #368

src/main/kotlin/kr/co/vividnext/sodalive/admin/can/AdminCanChargeRequest.kt

@@ -1,7 +1,7 @@
 package kr.co.vividnext.sodalive.admin.can
 
 data class AdminCanChargeRequest(
-    val memberId: Long,
+    val memberIds: List<Long>,
     val method: String,
     val can: Int
 )

src/main/kotlin/kr/co/vividnext/sodalive/admin/can/AdminCanController.kt

@@ -1,8 +1,10 @@
 package kr.co.vividnext.sodalive.admin.can
 
+import kr.co.vividnext.sodalive.can.CanResponse
 import kr.co.vividnext.sodalive.common.ApiResponse
 import org.springframework.security.access.prepost.PreAuthorize
 import org.springframework.web.bind.annotation.DeleteMapping
+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.RequestBody
@@ -13,6 +15,11 @@ import org.springframework.web.bind.annotation.RestController
 @RequestMapping("/admin/can")
 @PreAuthorize("hasRole('ADMIN')")
 class AdminCanController(private val service: AdminCanService) {
+    @GetMapping
+    fun getCans(): ApiResponse<List<CanResponse>> {
+        return ApiResponse.ok(service.getCans())
+    }
+
     @PostMapping
     fun insertCan(@RequestBody request: AdminCanRequest) = ApiResponse.ok(service.saveCan(request))
 

src/main/kotlin/kr/co/vividnext/sodalive/admin/can/AdminCanRepository.kt

@@ -1,6 +1,38 @@
 package kr.co.vividnext.sodalive.admin.can
 
+import com.querydsl.jpa.impl.JPAQueryFactory
 import kr.co.vividnext.sodalive.can.Can
+import kr.co.vividnext.sodalive.can.CanResponse
+import kr.co.vividnext.sodalive.can.CanStatus
+import kr.co.vividnext.sodalive.can.QCan.can1
+import kr.co.vividnext.sodalive.can.QCanResponse
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.stereotype.Repository
 
-interface AdminCanRepository : JpaRepository<Can, Long>
+interface AdminCanRepository : JpaRepository<Can, Long>, AdminCanQueryRepository
+
+interface AdminCanQueryRepository {
+    fun findAllByStatus(status: CanStatus): List<CanResponse>
+}
+
+@Repository
+class AdminCanQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : AdminCanQueryRepository {
+    override fun findAllByStatus(status: CanStatus): List<CanResponse> {
+        return queryFactory
+            .select(
+                QCanResponse(
+                    can1.id,
+                    can1.title,
+                    can1.can,
+                    can1.rewardCan,
+                    can1.price.intValue(),
+                    can1.currency,
+                    can1.price.stringValue()
+                )
+            )
+            .from(can1)
+            .where(can1.status.eq(status))
+            .orderBy(can1.currency.asc(), can1.price.asc())
+            .fetch()
+    }
+}

src/main/kotlin/kr/co/vividnext/sodalive/admin/can/AdminCanRequest.kt

@@ -3,11 +3,13 @@ package kr.co.vividnext.sodalive.admin.can
 import kr.co.vividnext.sodalive.can.Can
 import kr.co.vividnext.sodalive.can.CanStatus
 import kr.co.vividnext.sodalive.extensions.moneyFormat
+import java.math.BigDecimal
 
 data class AdminCanRequest(
     val can: Int,
     val rewardCan: Int,
-    val price: Int
+    val price: BigDecimal,
+    val currency: String
 ) {
     fun toEntity(): Can {
         var title = "${can.moneyFormat()} 캔"
@@ -20,6 +22,7 @@ data class AdminCanRequest(
             can = can,
             rewardCan = rewardCan,
             price = price,
+            currency = currency,
             status = CanStatus.SALE
         )
     }

src/main/kotlin/kr/co/vividnext/sodalive/admin/can/AdminCanService.kt

@@ -1,6 +1,7 @@
 package kr.co.vividnext.sodalive.admin.can
 
 import kr.co.vividnext.sodalive.admin.member.AdminMemberRepository
+import kr.co.vividnext.sodalive.can.CanResponse
 import kr.co.vividnext.sodalive.can.CanStatus
 import kr.co.vividnext.sodalive.can.charge.Charge
 import kr.co.vividnext.sodalive.can.charge.ChargeRepository
@@ -20,6 +21,10 @@ class AdminCanService(
     private val chargeRepository: ChargeRepository,
     private val memberRepository: AdminMemberRepository
 ) {
+    fun getCans(): List<CanResponse> {
+        return repository.findAllByStatus(status = CanStatus.SALE)
+    }
+
     @Transactional
     fun saveCan(request: AdminCanRequest) {
         repository.save(request.toEntity())
@@ -35,12 +40,16 @@ class AdminCanService(
 
     @Transactional
     fun charge(request: AdminCanChargeRequest) {
-        val member = memberRepository.findByIdOrNull(request.memberId)
-            ?: throw SodaException("잘못된 회원번호 입니다.")
-
         if (request.can <= 0) throw SodaException("1 캔 이상 입력하세요.")
         if (request.method.isBlank()) throw SodaException("기록내용을 입력하세요.")
 
+        val ids = request.memberIds.distinct()
+        if (ids.isEmpty()) throw SodaException("회원번호를 입력하세요.")
+
+        val members = memberRepository.findAllById(ids).toList()
+        if (members.size != ids.size) throw SodaException("잘못된 회원번호 입니다.")
+
+        members.forEach { member ->
             val charge = Charge(0, request.can, status = ChargeStatus.ADMIN)
             charge.title = "${request.can.moneyFormat()} 캔"
             charge.member = member
@@ -53,4 +62,5 @@ class AdminCanService(
 
             member.pgRewardCan += charge.rewardCan
         }
+    }
 }

src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusController.kt

@@ -21,6 +21,7 @@ class AdminChargeStatusController(private val service: AdminChargeStatusService)
     @GetMapping("/detail")
     fun getChargeStatusDetail(
         @RequestParam startDateStr: String,
-        @RequestParam paymentGateway: PaymentGateway
+        @RequestParam paymentGateway: PaymentGateway,
-    ) = ApiResponse.ok(service.getChargeStatusDetail(startDateStr, paymentGateway))
+        @RequestParam(value = "currency", required = false) currency: String? = null
+    ) = ApiResponse.ok(service.getChargeStatusDetail(startDateStr, paymentGateway, currency))
 }

src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusQueryRepository.kt

@@ -1,5 +1,6 @@
 package kr.co.vividnext.sodalive.admin.charge
 
+import com.querydsl.core.BooleanBuilder
 import com.querydsl.core.types.dsl.Expressions
 import com.querydsl.jpa.impl.JPAQueryFactory
 import kr.co.vividnext.sodalive.can.QCan.can1
@@ -14,7 +15,7 @@ import java.time.LocalDateTime
 
 @Repository
 class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory) {
-    fun getChargeStatus(startDate: LocalDateTime, endDate: LocalDateTime): List<GetChargeStatusQueryDto> {
+    fun getChargeStatus(startDate: LocalDateTime, endDate: LocalDateTime): List<GetChargeStatusResponse> {
         val formattedDate = Expressions.stringTemplate(
             "DATE_FORMAT({0}, {1})",
             Expressions.dateTimeTemplate(
@@ -26,15 +27,16 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory
             ),
             "%Y-%m-%d"
         )
+        val currency = Expressions.stringTemplate("substring({0}, length({0}) - 2, 3)", payment.locale)
 
         return queryFactory
             .select(
-                QGetChargeStatusQueryDto(
+                QGetChargeStatusResponse(
                     formattedDate,
                     payment.price.sum(),
-                    can1.price.sum(),
                     payment.id.count(),
-                    payment.paymentGateway
+                    payment.paymentGateway.stringValue(),
+                    currency.coalesce("KRW")
                 )
             )
             .from(payment)
@@ -46,15 +48,46 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory
                     .and(charge.status.eq(ChargeStatus.CHARGE))
                     .and(payment.status.eq(PaymentStatus.COMPLETE))
             )
-            .groupBy(formattedDate, payment.paymentGateway)
+            .groupBy(formattedDate, payment.paymentGateway, currency.coalesce("KRW"))
             .orderBy(formattedDate.desc())
             .fetch()
     }
 
+    fun getChargeStatusSummary(startDate: LocalDateTime, endDate: LocalDateTime): List<GetChargeStatusResponse> {
+        val currency = Expressions.stringTemplate(
+            "substring({0}, length({0}) - 2, 3)",
+            payment.locale
+        ).coalesce("KRW")
+
+        return queryFactory
+            .select(
+                QGetChargeStatusResponse(
+                    Expressions.stringTemplate("'합계'"), // date
+                    payment.price.sum(),
+                    payment.id.count(),
+                    Expressions.stringTemplate("''"),
+                    currency
+                )
+            )
+            .from(payment)
+            .innerJoin(payment.charge, charge)
+            .leftJoin(charge.can, can1)
+            .where(
+                charge.createdAt.goe(startDate)
+                    .and(charge.createdAt.loe(endDate))
+                    .and(charge.status.eq(ChargeStatus.CHARGE))
+                    .and(payment.status.eq(PaymentStatus.COMPLETE))
+            )
+            .groupBy(currency)
+            .orderBy(currency.asc())
+            .fetch()
+    }
+
     fun getChargeStatusDetail(
         startDate: LocalDateTime,
         endDate: LocalDateTime,
-        paymentGateway: PaymentGateway
+        paymentGateway: PaymentGateway,
+        currency: String? = null
     ): List<GetChargeStatusDetailQueryDto> {
         val formattedDate = Expressions.stringTemplate(
             "DATE_FORMAT({0}, {1})",
@@ -67,6 +100,20 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory
             ),
             "%Y-%m-%d %H:%i:%s"
         )
+        val currencyExpr = Expressions.stringTemplate(
+            "substring({0}, length({0}) - 2, 3)",
+            payment.locale
+        ).coalesce("KRW")
+        val whereBuilder = BooleanBuilder()
+        whereBuilder.and(charge.createdAt.goe(startDate))
+            .and(charge.createdAt.loe(endDate))
+            .and(charge.status.eq(ChargeStatus.CHARGE))
+            .and(payment.status.eq(PaymentStatus.COMPLETE))
+            .and(payment.paymentGateway.eq(paymentGateway))
+
+        if (currency != null) {
+            whereBuilder.and(currencyExpr.eq(currency))
+        }
 
         return queryFactory
             .select(
@@ -75,8 +122,7 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory
                     member.nickname,
                     payment.method.coalesce(""),
                     payment.price,
-                    can1.price,
+                    currencyExpr,
-                    payment.locale.coalesce(""),
                     formattedDate
                 )
             )
@@ -84,13 +130,7 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory
             .innerJoin(charge.member, member)
             .innerJoin(charge.payment, payment)
             .leftJoin(charge.can, can1)
-            .where(
+            .where(whereBuilder)
-                charge.createdAt.goe(startDate)
-                    .and(charge.createdAt.loe(endDate))
-                    .and(charge.status.eq(ChargeStatus.CHARGE))
-                    .and(payment.status.eq(PaymentStatus.COMPLETE))
-                    .and(payment.paymentGateway.eq(paymentGateway))
-            )
             .orderBy(formattedDate.desc())
             .fetch()
     }

src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusService.kt

@@ -20,48 +20,17 @@ class AdminChargeStatusService(val repository: AdminChargeStatusQueryRepository)
             .withZoneSameInstant(ZoneId.of("UTC"))
             .toLocalDateTime()
 
-        var totalChargeAmount = 0
+        val summaryRows = repository.getChargeStatusSummary(startDate, endDate)
-        var totalChargeCount = 0L
+        val chargeStatusList = repository.getChargeStatus(startDate, endDate).toMutableList()
-
+        chargeStatusList.addAll(0, summaryRows)
-        val chargeStatusList = repository.getChargeStatus(startDate, endDate)
-            .asSequence()
-            .map {
-                val chargeAmount = if (it.paymentGateWay == PaymentGateway.PG) {
-                    it.pgChargeAmount
-                } else {
-                    it.appleChargeAmount.toInt()
-                }
-
-                val chargeCount = it.chargeCount
-
-                totalChargeAmount += chargeAmount
-                totalChargeCount += chargeCount
-
-                GetChargeStatusResponse(
-                    date = it.date,
-                    chargeAmount = chargeAmount,
-                    chargeCount = chargeCount,
-                    pg = it.paymentGateWay.name
-                )
-            }
-            .toMutableList()
-
-        chargeStatusList.add(
-            0,
-            GetChargeStatusResponse(
-                date = "합계",
-                chargeAmount = totalChargeAmount,
-                chargeCount = totalChargeCount,
-                pg = ""
-            )
-        )
 
         return chargeStatusList.toList()
     }
 
     fun getChargeStatusDetail(
         startDateStr: String,
-        paymentGateway: PaymentGateway
+        paymentGateway: PaymentGateway,
+        currency: String? = null
     ): List<GetChargeStatusDetailResponse> {
         val dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
         val startDate = LocalDate.parse(startDateStr, dateTimeFormatter).atTime(0, 0, 0)
@@ -74,18 +43,16 @@ class AdminChargeStatusService(val repository: AdminChargeStatusQueryRepository)
             .withZoneSameInstant(ZoneId.of("UTC"))
             .toLocalDateTime()
 
-        return repository.getChargeStatusDetail(startDate, endDate, paymentGateway)
+        return repository.getChargeStatusDetail(startDate, endDate, paymentGateway, currency)
-            .asSequence()
             .map {
                 GetChargeStatusDetailResponse(
                     memberId = it.memberId,
                     nickname = it.nickname,
                     method = it.method,
-                    amount = it.appleChargeAmount.toInt(),
+                    amount = it.amount,
                     locale = it.locale,
                     datetime = it.datetime
                 )
             }
-            .toList()
     }
 }

src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt

@@ -1,13 +1,13 @@
 package kr.co.vividnext.sodalive.admin.charge
 
 import com.querydsl.core.annotations.QueryProjection
+import java.math.BigDecimal
 
 data class GetChargeStatusDetailQueryDto @QueryProjection constructor(
     val memberId: Long,
     val nickname: String,
     val method: String,
-    val appleChargeAmount: Double,
+    val amount: BigDecimal,
-    val pgChargeAmount: Int,
     val locale: String,
     val datetime: String
 )

src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailResponse.kt

@@ -1,10 +1,12 @@
 package kr.co.vividnext.sodalive.admin.charge
 
+import java.math.BigDecimal
+
 data class GetChargeStatusDetailResponse(
     val memberId: Long,
     val nickname: String,
     val method: String,
-    val amount: Int,
+    val amount: BigDecimal,
     val locale: String,
     val datetime: String
 )

src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusQueryDto.kt

@@ -1,12 +0,0 @@
-package kr.co.vividnext.sodalive.admin.charge
-
-import com.querydsl.core.annotations.QueryProjection
-import kr.co.vividnext.sodalive.can.payment.PaymentGateway
-
-data class GetChargeStatusQueryDto @QueryProjection constructor(
-    val date: String,
-    val appleChargeAmount: Double,
-    val pgChargeAmount: Int,
-    val chargeCount: Long,
-    val paymentGateWay: PaymentGateway
-)

src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusResponse.kt

@@ -1,8 +1,12 @@
 package kr.co.vividnext.sodalive.admin.charge
 
-data class GetChargeStatusResponse(
+import com.querydsl.core.annotations.QueryProjection
+import java.math.BigDecimal
+
+data class GetChargeStatusResponse @QueryProjection constructor(
     val date: String,
-    val chargeAmount: Int,
+    val chargeAmount: BigDecimal,
     val chargeCount: Long,
-    val pg: String
+    val pg: String,
+    val currency: String
 )

src/main/kotlin/kr/co/vividnext/sodalive/admin/content/series/AdminContentSeriesController.kt

@@ -4,6 +4,8 @@ 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.PutMapping
+import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
@@ -19,4 +21,9 @@ class AdminContentSeriesController(private val service: AdminContentSeriesServic
     fun searchSeriesList(
         @RequestParam(value = "search_word") searchWord: String
     ) = ApiResponse.ok(service.searchSeriesList(searchWord))
+
+    @PutMapping
+    fun modifySeries(
+        @RequestBody request: AdminModifySeriesRequest
+    ) = ApiResponse.ok(service.modifySeries(request), "시리즈가 수정되었습니다.")
 }

src/main/kotlin/kr/co/vividnext/sodalive/admin/content/series/AdminContentSeriesService.kt

@@ -1,10 +1,17 @@
 package kr.co.vividnext.sodalive.admin.content.series
 
+import kr.co.vividnext.sodalive.admin.content.series.genre.AdminContentSeriesGenreRepository
+import kr.co.vividnext.sodalive.common.SodaException
+import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesPublishedDaysOfWeek
 import org.springframework.data.domain.Pageable
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 
 @Service
-class AdminContentSeriesService(private val repository: AdminContentSeriesRepository) {
+class AdminContentSeriesService(
+    private val repository: AdminContentSeriesRepository,
+    private val genreRepository: AdminContentSeriesGenreRepository
+) {
     fun getSeriesList(pageable: Pageable): GetAdminSeriesListResponse {
         val totalCount = repository.getSeriesTotalCount()
         val items = repository.getSeriesList(
@@ -12,10 +19,53 @@ class AdminContentSeriesService(private val repository: AdminContentSeriesReposi
             limit = pageable.pageSize.toLong()
         )
 
+        if (items.isNotEmpty()) {
+            val ids = items.map { it.id }
+            val seriesList = repository.findAllById(ids)
+            val seriesMap = seriesList.associateBy { it.id }
+
+            items.forEach { item ->
+                val s = seriesMap[item.id]
+                if (s != null) {
+                    item.publishedDaysOfWeek = s.publishedDaysOfWeek.toList().sortedBy { it.ordinal }
+                    item.isOriginal = s.isOriginal
+                }
+            }
+        }
+
         return GetAdminSeriesListResponse(totalCount, items)
     }
 
     fun searchSeriesList(searchWord: String): List<GetAdminSearchSeriesListItem> {
         return repository.searchSeriesList(searchWord)
     }
+
+    @Transactional
+    fun modifySeries(request: AdminModifySeriesRequest) {
+        val series = repository.findByIdAndActiveTrue(request.seriesId)
+            ?: throw SodaException("잘못된 요청입니다.")
+
+        if (request.publishedDaysOfWeek != null) {
+            val days = request.publishedDaysOfWeek
+            if (days.contains(SeriesPublishedDaysOfWeek.RANDOM) && days.size > 1) {
+                throw SodaException("랜덤과 연재요일 동시에 선택할 수 없습니다.")
+            }
+            series.publishedDaysOfWeek.clear()
+            series.publishedDaysOfWeek.addAll(days)
+        }
+
+        if (request.genreId != null) {
+            val genre = genreRepository.findActiveSeriesGenreById(request.genreId)
+                ?: throw SodaException("잘못된 요청입니다.")
+            series.genre = genre
+        }
+
+        if (request.isOriginal != null) {
+            series.isOriginal = request.isOriginal
+        }
+
+        if (request.isAdult != null) {
+            series.isAdult = request.isAdult
+        }
+    }
 }

src/main/kotlin/kr/co/vividnext/sodalive/admin/content/series/AdminModifySeriesRequest.kt

@@ -0,0 +1,11 @@
+package kr.co.vividnext.sodalive.admin.content.series
+
+import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesPublishedDaysOfWeek
+
+data class AdminModifySeriesRequest(
+    val seriesId: Long,
+    val publishedDaysOfWeek: Set<SeriesPublishedDaysOfWeek>?,
+    val genreId: Long?,
+    val isOriginal: Boolean?,
+    val isAdult: Boolean?
+)

src/main/kotlin/kr/co/vividnext/sodalive/admin/content/series/GetAdminSeriesListResponse.kt

@@ -1,6 +1,7 @@
 package kr.co.vividnext.sodalive.admin.content.series
 
 import com.querydsl.core.annotations.QueryProjection
+import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesPublishedDaysOfWeek
 
 data class GetAdminSeriesListResponse(
     val totalCount: Int,
@@ -17,7 +18,10 @@ data class GetAdminSeriesListItem @QueryProjection constructor(
     val numberOfWorks: Long,
     val state: String,
     val isAdult: Boolean
-)
+) {
+    var publishedDaysOfWeek: List<SeriesPublishedDaysOfWeek> = emptyList()
+    var isOriginal: Boolean = false
+}
 
 data class GetAdminSearchSeriesListItem @QueryProjection constructor(
     val id: Long,

src/main/kotlin/kr/co/vividnext/sodalive/admin/content/series/banner/AdminContentSeriesBannerController.kt

@@ -0,0 +1,145 @@
+package kr.co.vividnext.sodalive.admin.content.series.banner
+
+import com.amazonaws.services.s3.model.ObjectMetadata
+import com.fasterxml.jackson.databind.ObjectMapper
+import kr.co.vividnext.sodalive.admin.content.banner.UpdateBannerOrdersRequest
+import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerListPageResponse
+import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerRegisterRequest
+import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerResponse
+import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerUpdateRequest
+import kr.co.vividnext.sodalive.aws.s3.S3Uploader
+import kr.co.vividnext.sodalive.common.ApiResponse
+import kr.co.vividnext.sodalive.common.SodaException
+import kr.co.vividnext.sodalive.content.series.main.banner.ContentSeriesBannerService
+import kr.co.vividnext.sodalive.utils.generateFileName
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.data.domain.PageRequest
+import org.springframework.security.access.prepost.PreAuthorize
+import org.springframework.web.bind.annotation.DeleteMapping
+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.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
+import org.springframework.web.bind.annotation.RequestPart
+import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.multipart.MultipartFile
+
+@RestController
+@RequestMapping("/admin/audio-content/series/banner")
+@PreAuthorize("hasRole('ADMIN')")
+class AdminContentSeriesBannerController(
+    private val bannerService: ContentSeriesBannerService,
+    private val s3Uploader: S3Uploader,
+
+    @Value("\${cloud.aws.s3.bucket}")
+    private val s3Bucket: String,
+
+    @Value("\${cloud.aws.cloud-front.host}")
+    private val imageHost: String
+) {
+    /**
+     * 활성화된 배너 목록 조회 API
+     */
+    @GetMapping("/list")
+    fun getBannerList(
+        @RequestParam(defaultValue = "0") page: Int,
+        @RequestParam(defaultValue = "20") size: Int
+    ) = run {
+        val pageable = PageRequest.of(page, size)
+        val banners = bannerService.getActiveBanners(pageable)
+        val response = SeriesBannerListPageResponse(
+            totalCount = banners.totalElements,
+            content = banners.content.map { SeriesBannerResponse.from(it, imageHost) }
+        )
+        ApiResponse.ok(response)
+    }
+
+    /**
+     * 배너 상세 조회 API
+     */
+    @GetMapping("/{bannerId}")
+    fun getBannerDetail(@PathVariable bannerId: Long) = run {
+        val banner = bannerService.getBannerById(bannerId)
+        val response = SeriesBannerResponse.from(banner, imageHost)
+        ApiResponse.ok(response)
+    }
+
+    /**
+     * 배너 등록 API
+     */
+    @PostMapping("/register")
+    fun registerBanner(
+        @RequestPart("image") image: MultipartFile,
+        @RequestPart("request") requestString: String
+    ) = run {
+        val objectMapper = ObjectMapper()
+        val request = objectMapper.readValue(requestString, SeriesBannerRegisterRequest::class.java)
+
+        val banner = bannerService.registerBanner(seriesId = request.seriesId, imagePath = "")
+        val imagePath = saveImage(banner.id!!, image)
+        val updatedBanner = bannerService.updateBanner(banner.id!!, imagePath)
+        val response = SeriesBannerResponse.from(updatedBanner, imageHost)
+        ApiResponse.ok(response)
+    }
+
+    /**
+     * 배너 수정 API
+     */
+    @PutMapping("/update")
+    fun updateBanner(
+        @RequestPart("image") image: MultipartFile,
+        @RequestPart("request") requestString: String
+    ) = run {
+        val objectMapper = ObjectMapper()
+        val request = objectMapper.readValue(requestString, SeriesBannerUpdateRequest::class.java)
+        // 배너 존재 확인
+        bannerService.getBannerById(request.bannerId)
+        val imagePath = saveImage(request.bannerId, image)
+        val updated = bannerService.updateBanner(
+            bannerId = request.bannerId,
+            imagePath = imagePath,
+            seriesId = request.seriesId
+        )
+        val response = SeriesBannerResponse.from(updated, imageHost)
+        ApiResponse.ok(response)
+    }
+
+    /**
+     * 배너 삭제 API (소프트 삭제)
+     */
+    @DeleteMapping("/{bannerId}")
+    fun deleteBanner(@PathVariable bannerId: Long) = run {
+        bannerService.deleteBanner(bannerId)
+        ApiResponse.ok("배너가 성공적으로 삭제되었습니다.")
+    }
+
+    /**
+     * 배너 정렬 순서 일괄 변경 API
+     */
+    @PutMapping("/orders")
+    fun updateBannerOrders(
+        @RequestBody request: UpdateBannerOrdersRequest
+    ) = run {
+        bannerService.updateBannerOrders(request.ids)
+        ApiResponse.ok(null, "배너 정렬 순서가 성공적으로 변경되었습니다.")
+    }
+
+    private fun saveImage(bannerId: Long, image: MultipartFile): String {
+        try {
+            val metadata = ObjectMetadata()
+            metadata.contentLength = image.size
+            val fileName = generateFileName("series-banner")
+            return s3Uploader.upload(
+                inputStream = image.inputStream,
+                bucket = s3Bucket,
+                filePath = "series_banner/$bannerId/$fileName",
+                metadata = metadata
+            )
+        } catch (e: Exception) {
+            throw SodaException("이미지 저장에 실패했습니다: ${e.message}")
+        }
+    }
+}

src/main/kotlin/kr/co/vividnext/sodalive/admin/content/series/banner/dto/SeriesBannerDtos.kt

@@ -0,0 +1,40 @@
+package kr.co.vividnext.sodalive.admin.content.series.banner.dto
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import kr.co.vividnext.sodalive.content.series.main.banner.SeriesBanner
+
+// 시리즈 배너 등록 요청 DTO
+data class SeriesBannerRegisterRequest(
+    @JsonProperty("seriesId") val seriesId: Long
+)
+
+// 시리즈 배너 수정 요청 DTO
+data class SeriesBannerUpdateRequest(
+    @JsonProperty("bannerId") val bannerId: Long,
+    @JsonProperty("seriesId") val seriesId: Long? = null
+)
+
+// 시리즈 배너 응답 DTO
+data class SeriesBannerResponse(
+    val id: Long,
+    val imagePath: String,
+    val seriesId: Long,
+    val seriesTitle: String
+) {
+    companion object {
+        fun from(banner: SeriesBanner, imageHost: String): SeriesBannerResponse {
+            return SeriesBannerResponse(
+                id = banner.id!!,
+                imagePath = "$imageHost/${banner.imagePath}",
+                seriesId = banner.series.id!!,
+                seriesTitle = banner.series.title
+            )
+        }
+    }
+}
+
+// 시리즈 배너 목록 페이지 응답 DTO
+data class SeriesBannerListPageResponse(
+    val totalCount: Long,
+    val content: List<SeriesBannerResponse>
+)

src/main/kotlin/kr/co/vividnext/sodalive/admin/content/series/genre/AdminContentSeriesGenreRepository.kt

@@ -8,6 +8,7 @@ interface AdminContentSeriesGenreRepository : JpaRepository<SeriesGenre, Long>,
 
 interface AdminContentSeriesGenreQueryRepository {
     fun getSeriesGenreList(): List<GetSeriesGenreListResponse>
+    fun findActiveSeriesGenreById(id: Long): SeriesGenre?
 }
 
 class AdminContentSeriesGenreQueryRepositoryImpl(
@@ -21,4 +22,14 @@ class AdminContentSeriesGenreQueryRepositoryImpl(
             .orderBy(seriesGenre.orders.asc())
             .fetch()
     }
+
+    override fun findActiveSeriesGenreById(id: Long): SeriesGenre? {
+        return queryFactory
+            .selectFrom(seriesGenre)
+            .where(
+                seriesGenre.id.eq(id)
+                    .and(seriesGenre.isActive.isTrue)
+            )
+            .fetchFirst()
+    }
 }

src/main/kotlin/kr/co/vividnext/sodalive/admin/member/AdminMemberController.kt

@@ -36,6 +36,12 @@ class AdminMemberController(private val service: AdminMemberService) {
         pageable: Pageable
     ) = ApiResponse.ok(service.searchMember(searchWord, pageable))
 
+    @GetMapping("/search-by-nickname")
+    fun searchMemberByNickname(
+        @RequestParam(value = "search_word") searchWord: String,
+        @RequestParam(value = "size", required = false) size: Int?
+    ) = ApiResponse.ok(service.searchMemberByNickname(searchWord = searchWord, size = size ?: 20))
+
     @GetMapping("/creator/all/list")
     fun getCreatorAllList() = ApiResponse.ok(service.getCreatorAllList())
 

src/main/kotlin/kr/co/vividnext/sodalive/admin/member/AdminMemberRepository.kt

@@ -16,6 +16,7 @@ interface AdminMemberQueryRepository {
     fun searchMemberTotalCount(searchWord: String, role: MemberRole? = null): Int
     fun getCreatorAllList(): List<GetAdminCreatorAllListResponse>
     fun findByIdAndActive(memberId: Long): Member?
+    fun searchMemberByNickname(searchWord: String, limit: Long = 20): List<AdminSimpleMemberResponse>
 }
 
 class AdminMemberQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : AdminMemberQueryRepository {
@@ -121,4 +122,22 @@ class AdminMemberQueryRepositoryImpl(private val queryFactory: JPAQueryFactory)
             .orderBy(member.id.desc())
             .fetchFirst()
     }
+
+    override fun searchMemberByNickname(searchWord: String, limit: Long): List<AdminSimpleMemberResponse> {
+        return queryFactory
+            .select(
+                QAdminSimpleMemberResponse(
+                    member.id,
+                    member.nickname
+                )
+            )
+            .from(member)
+            .where(
+                member.nickname.contains(searchWord)
+                    .and(member.isActive.isTrue)
+            )
+            .orderBy(member.id.desc())
+            .limit(limit)
+            .fetch()
+    }
 }

src/main/kotlin/kr/co/vividnext/sodalive/admin/member/AdminMemberService.kt

@@ -145,6 +145,12 @@ class AdminMemberService(
         return repository.getCreatorAllList()
     }
 
+    fun searchMemberByNickname(searchWord: String, size: Int = 20): List<AdminSimpleMemberResponse> {
+        if (searchWord.length < 2) throw SodaException("2글자 이상 입력하세요.")
+        val limit = if (size <= 0) 20 else size
+        return repository.searchMemberByNickname(searchWord = searchWord, limit = limit.toLong())
+    }
+
     @Transactional
     fun resetPassword(request: ResetPasswordRequest) {
         val member = repository.findByIdAndActive(memberId = request.memberId)

src/main/kotlin/kr/co/vividnext/sodalive/admin/member/AdminSimpleMemberResponse.kt

@@ -0,0 +1,12 @@
+package kr.co.vividnext.sodalive.admin.member
+
+import com.querydsl.core.annotations.QueryProjection
+
+/**
+ * 관리자용 간단 회원 응답 DTO
+ * 닉네임 검색 결과로 사용되며 charge 등에서 memberId 선택에 활용된다.
+ */
+data class AdminSimpleMemberResponse @QueryProjection constructor(
+    val id: Long,
+    val nickname: String
+)

src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/ad/AdminAdStatisticsRepository.kt

@@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.admin.statistics.ad
 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.NumberExpression
 import com.querydsl.core.types.dsl.StringTemplate
 import com.querydsl.jpa.impl.JPAQueryFactory
 import kr.co.vividnext.sodalive.marketing.AdTrackingHistoryType
@@ -67,7 +66,7 @@ class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
         val firstPaymentTotalAmount = CaseBuilder()
             .`when`(adTrackingHistory.type.eq(AdTrackingHistoryType.FIRST_PAYMENT))
             .then(adTrackingHistory.price)
-            .otherwise(Expressions.constant(0.0))
+            .otherwise(0.toBigDecimal())
             .sum()
 
         val repeatPaymentCount = CaseBuilder()
@@ -79,7 +78,7 @@ class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
         val repeatPaymentTotalAmount = CaseBuilder()
             .`when`(adTrackingHistory.type.eq(AdTrackingHistoryType.REPEAT_PAYMENT))
             .then(adTrackingHistory.price)
-            .otherwise(Expressions.constant(0.0))
+            .otherwise(0.toBigDecimal())
             .sum()
 
         val allPaymentCount = CaseBuilder()
@@ -97,7 +96,7 @@ class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
                     .or(adTrackingHistory.type.eq(AdTrackingHistoryType.REPEAT_PAYMENT))
             )
             .then(adTrackingHistory.price)
-            .otherwise(Expressions.constant(0.0))
+            .otherwise(0.toBigDecimal())
             .sum()
 
         return queryFactory
@@ -111,11 +110,11 @@ class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
                     loginCount,
                     signUpCount,
                     firstPaymentCount,
-                    roundedValueDecimalPlaces2(firstPaymentTotalAmount),
+                    firstPaymentTotalAmount,
                     repeatPaymentCount,
-                    roundedValueDecimalPlaces2(repeatPaymentTotalAmount),
+                    repeatPaymentTotalAmount,
                     allPaymentCount,
-                    roundedValueDecimalPlaces2(allPaymentTotalAmount)
+                    allPaymentTotalAmount
                 )
             )
             .from(adTrackingHistory)
@@ -148,13 +147,4 @@ class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
             "%Y-%m-%d"
         )
     }
-
-    private fun roundedValueDecimalPlaces2(valueExpression: NumberExpression<Double>): NumberExpression<Double> {
-        return Expressions.numberTemplate(
-            Double::class.java,
-            "ROUND({0}, {1})",
-            valueExpression,
-            2
-        )
-    }
 }

src/main/kotlin/kr/co/vividnext/sodalive/admin/statistics/ad/GetAdminAdStatisticsResponse.kt

@@ -1,6 +1,7 @@
 package kr.co.vividnext.sodalive.admin.statistics.ad
 
 import com.querydsl.core.annotations.QueryProjection
+import java.math.BigDecimal
 
 data class GetAdminAdStatisticsResponse(
     val totalCount: Int,
@@ -16,9 +17,9 @@ data class GetAdminAdStatisticsItem @QueryProjection constructor(
     val loginCount: Int,
     val signUpCount: Int,
     val firstPaymentCount: Int,
-    val firstPaymentTotalAmount: Double,
+    val firstPaymentTotalAmount: BigDecimal,
     val repeatPaymentCount: Int,
-    val repeatPaymentTotalAmount: Double,
+    val repeatPaymentTotalAmount: BigDecimal,
     val allPaymentCount: Int,
-    val allPaymentTotalAmount: Double
+    val allPaymentTotalAmount: BigDecimal
 )

src/main/kotlin/kr/co/vividnext/sodalive/api/home/GetHomeResponse.kt

@@ -1,6 +1,7 @@
 package kr.co.vividnext.sodalive.api.home
 
 import kr.co.vividnext.sodalive.audition.GetAuditionListItem
+import kr.co.vividnext.sodalive.chat.character.dto.Character
 import kr.co.vividnext.sodalive.content.AudioContentMainItem
 import kr.co.vividnext.sodalive.content.main.GetAudioContentRankingItem
 import kr.co.vividnext.sodalive.content.main.banner.GetAudioContentBannerResponse
@@ -21,8 +22,11 @@ data class GetHomeResponse(
     val originalAudioDramaList: List<GetSeriesListResponse.SeriesListItem>,
     val auditionList: List<GetAuditionListItem>,
     val dayOfWeekSeriesList: List<GetSeriesListResponse.SeriesListItem>,
+    val popularCharacters: List<Character>,
     val contentRanking: List<GetAudioContentRankingItem>,
     val recommendChannelList: List<RecommendChannelResponse>,
     val freeContentList: List<AudioContentMainItem>,
+    val pointAvailableContentList: List<AudioContentMainItem>,
+    val recommendContentList: List<AudioContentMainItem>,
     val curationList: List<GetContentCurationResponse>
 )

src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeController.kt

@@ -4,6 +4,7 @@ import kr.co.vividnext.sodalive.common.ApiResponse
 import kr.co.vividnext.sodalive.content.ContentType
 import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesPublishedDaysOfWeek
 import kr.co.vividnext.sodalive.member.Member
+import kr.co.vividnext.sodalive.rank.ContentRankingSortType
 import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
@@ -63,4 +64,44 @@ class HomeController(private val service: HomeService) {
             )
         )
     }
+
+    // 추천 콘텐츠만 새로고침하기 위한 엔드포인트
+    @GetMapping("/recommend-contents")
+    fun getRecommendContents(
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        ApiResponse.ok(
+            service.getRecommendContentList(
+                isAdultContentVisible = isAdultContentVisible ?: true,
+                contentType = contentType ?: ContentType.ALL,
+                member = member
+            )
+        )
+    }
+
+    // 콘텐츠 랭킹 엔드포인트
+    @GetMapping("/content-ranking")
+    fun getContentRanking(
+        @RequestParam("sort", required = false) sort: ContentRankingSortType? = null,
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
+        @RequestParam("offset", required = false) offset: Long? = null,
+        @RequestParam("limit", required = false) limit: Long? = null,
+        @RequestParam("theme", required = false) theme: String? = null,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        ApiResponse.ok(
+            service.getContentRankingBySort(
+                sort = sort ?: ContentRankingSortType.REVENUE,
+                isAdultContentVisible = isAdultContentVisible ?: true,
+                contentType = contentType ?: ContentType.ALL,
+                offset = offset,
+                limit = limit,
+                theme = theme,
+                member = member
+            )
+        )
+    }
 }

src/main/kotlin/kr/co/vividnext/sodalive/api/home/HomeService.kt

@@ -1,9 +1,11 @@
 package kr.co.vividnext.sodalive.api.home
 
 import kr.co.vividnext.sodalive.audition.AuditionService
+import kr.co.vividnext.sodalive.chat.character.service.ChatCharacterService
 import kr.co.vividnext.sodalive.content.AudioContentMainItem
 import kr.co.vividnext.sodalive.content.AudioContentService
 import kr.co.vividnext.sodalive.content.ContentType
+import kr.co.vividnext.sodalive.content.main.GetAudioContentRankingItem
 import kr.co.vividnext.sodalive.content.main.banner.AudioContentBannerService
 import kr.co.vividnext.sodalive.content.main.curation.AudioContentCurationService
 import kr.co.vividnext.sodalive.content.series.ContentSeriesService
@@ -17,6 +19,7 @@ import kr.co.vividnext.sodalive.live.room.LiveRoomStatus
 import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.member.MemberService
 import kr.co.vividnext.sodalive.query.recommend.RecommendChannelQueryService
+import kr.co.vividnext.sodalive.rank.ContentRankingSortType
 import kr.co.vividnext.sodalive.rank.RankingRepository
 import kr.co.vividnext.sodalive.rank.RankingService
 import org.springframework.beans.factory.annotation.Value
@@ -39,6 +42,7 @@ class HomeService(
     private val contentThemeService: AudioContentThemeService,
     private val recommendChannelService: RecommendChannelQueryService,
 
+    private val characterService: ChatCharacterService,
     private val rankingService: RankingService,
     private val rankingRepository: RankingRepository,
     private val explorerQueryRepository: ExplorerQueryRepository,
@@ -46,6 +50,11 @@ class HomeService(
     @Value("\${cloud.aws.cloud-front.host}")
     private val imageHost: String
 ) {
+    companion object {
+        private const val RECOMMEND_TARGET_SIZE = 30
+        private const val RECOMMEND_MAX_ATTEMPTS = 3
+    }
+
     fun fetchData(
         timezone: String,
         isAdultContentVisible: Boolean,
@@ -115,7 +124,8 @@ class HomeService(
 
         val originalAudioDramaList = seriesService.getOriginalAudioDramaList(
             isAdult = isAdult,
-            contentType = contentType
+            contentType = contentType,
+            orderByRandom = true
         )
 
         val auditionList = auditionService.getInProgressAuditionList(isAdult = isAdult)
@@ -127,6 +137,9 @@ class HomeService(
             dayOfWeek = getDayOfWeekByTimezone(timezone)
         )
 
+        // 인기 캐릭터 조회
+        val popularCharacters = characterService.getPopularCharacters()
+
         val currentDateTime = LocalDateTime.now()
         val startDate = currentDateTime
             .withHour(15)
@@ -143,11 +156,9 @@ class HomeService(
             contentType = contentType,
             startDate = startDate.minusDays(1),
             endDate = endDate,
-            sortType = "매출"
+            sort = ContentRankingSortType.REVENUE
         )
 
-        // TODO 오디오 북
-
         val recommendChannelList = recommendChannelService.getRecommendChannel(
             memberId = memberId,
             isAdult = isAdult,
@@ -162,7 +173,24 @@ class HomeService(
             ),
             contentType = contentType,
             isFree = true,
-            isAdult = isAdult
+            isAdult = isAdult,
+            orderByRandom = true
+        ).filter {
+            if (memberId != null) {
+                !memberService.isBlocked(blockedMemberId = memberId, memberId = it.creatorId)
+            } else {
+                true
+            }
+        }
+
+        // 포인트 사용가능 콘텐츠 리스트 - 랜덤으로 가져오기 (DB에서 isPointAvailable 조건 적용)
+        val pointAvailableContentList = contentService.getLatestContentByTheme(
+            theme = emptyList(),
+            contentType = contentType,
+            isFree = false,
+            isAdult = isAdult,
+            orderByRandom = true,
+            isPointAvailableOnly = true
         ).filter {
             if (memberId != null) {
                 !memberService.isBlocked(blockedMemberId = memberId, memberId = it.creatorId)
@@ -188,9 +216,16 @@ class HomeService(
             originalAudioDramaList = originalAudioDramaList,
             auditionList = auditionList,
             dayOfWeekSeriesList = dayOfWeekSeriesList,
+            popularCharacters = popularCharacters,
             contentRanking = contentRanking,
             recommendChannelList = recommendChannelList,
             freeContentList = freeContentList,
+            pointAvailableContentList = pointAvailableContentList,
+            recommendContentList = getRecommendContentList(
+                isAdultContentVisible = isAdultContentVisible,
+                contentType = contentType,
+                member = member
+            ),
             curationList = curationList
         )
     }
@@ -245,6 +280,40 @@ class HomeService(
         )
     }
 
+    fun getContentRankingBySort(
+        sort: ContentRankingSortType,
+        isAdultContentVisible: Boolean,
+        contentType: ContentType,
+        offset: Long?,
+        limit: Long?,
+        theme: String?,
+        member: Member?
+    ): List<GetAudioContentRankingItem> {
+        val memberId = member?.id
+        val isAdult = member?.auth != null && isAdultContentVisible
+
+        val currentDateTime = LocalDateTime.now()
+        val startDate = currentDateTime
+            .withHour(15)
+            .withMinute(0)
+            .withSecond(0)
+            .minusWeeks(1)
+            .with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY))
+        val endDate = startDate.plusDays(6)
+
+        return rankingService.getContentRanking(
+            memberId = memberId,
+            isAdult = isAdult,
+            contentType = contentType,
+            startDate = startDate.minusDays(1),
+            endDate = endDate,
+            offset = offset ?: 0,
+            limit = limit ?: 12,
+            sort = sort,
+            theme = theme ?: ""
+        )
+    }
+
     private fun getDayOfWeekByTimezone(timezone: String): SeriesPublishedDaysOfWeek {
         val systemTime = LocalDateTime.now()
         val zoneId = ZoneId.of(timezone)
@@ -262,4 +331,46 @@ class HomeService(
 
         return dayToSeriesPublishedDaysOfWeek[zonedDateTime.dayOfWeek] ?: SeriesPublishedDaysOfWeek.RANDOM
     }
+
+    // 추천 콘텐츠 조회 로직은 변경 가능성을 고려하여 별도 메서드로 추출한다.
+    fun getRecommendContentList(
+        isAdultContentVisible: Boolean,
+        contentType: ContentType,
+        member: Member?
+    ): List<AudioContentMainItem> {
+        val memberId = member?.id
+        val isAdult = member?.auth != null && isAdultContentVisible
+
+        // Set + List 조합으로 중복 제거 및 순서 보존, 각 시도마다 limit=60으로 조회
+        val seen = HashSet<Long>(RECOMMEND_TARGET_SIZE * 2)
+        val result = ArrayList<AudioContentMainItem>(RECOMMEND_TARGET_SIZE)
+        var attempt = 0
+        while (attempt < RECOMMEND_MAX_ATTEMPTS && result.size < RECOMMEND_TARGET_SIZE) {
+            attempt += 1
+            val batch = contentService.getLatestContentByTheme(
+                theme = emptyList(), // 특정 테마에 종속되지 않도록 전체에서 랜덤 조회
+                contentType = contentType,
+                offset = 0,
+                limit = (RECOMMEND_TARGET_SIZE * RECOMMEND_MAX_ATTEMPTS).toLong(), // 60개 조회
+                isFree = false,
+                isAdult = isAdult,
+                orderByRandom = true
+            ).filter {
+                if (memberId != null) {
+                    !memberService.isBlocked(blockedMemberId = memberId, memberId = it.creatorId)
+                } else {
+                    true
+                }
+            }
+
+            for (item in batch) {
+                if (result.size >= RECOMMEND_TARGET_SIZE) break
+                if (seen.add(item.contentId)) {
+                    result.add(item)
+                }
+            }
+        }
+
+        return result
+    }
 }

src/main/kotlin/kr/co/vividnext/sodalive/can/Can.kt

@@ -1,6 +1,8 @@
 package kr.co.vividnext.sodalive.can
 
 import kr.co.vividnext.sodalive.common.BaseEntity
+import java.math.BigDecimal
+import javax.persistence.Column
 import javax.persistence.Entity
 import javax.persistence.EnumType
 import javax.persistence.Enumerated
@@ -10,7 +12,10 @@ data class Can(
     var title: String,
     var can: Int,
     var rewardCan: Int,
-    var price: Int,
+    @Column(precision = 10, scale = 4, nullable = false)
+    var price: BigDecimal,
+    @Column(length = 3, nullable = false, columnDefinition = "CHAR(3)")
+    var currency: String,
     @Enumerated(value = EnumType.STRING)
     var status: CanStatus
 ) : BaseEntity()

src/main/kotlin/kr/co/vividnext/sodalive/can/CanController.kt

@@ -1,6 +1,7 @@
 package kr.co.vividnext.sodalive.can
 
 import kr.co.vividnext.sodalive.common.ApiResponse
+import kr.co.vividnext.sodalive.common.GeoCountry
 import kr.co.vividnext.sodalive.common.SodaException
 import kr.co.vividnext.sodalive.member.Member
 import org.springframework.data.domain.Pageable
@@ -9,13 +10,15 @@ import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
+import javax.servlet.http.HttpServletRequest
 
 @RestController
 @RequestMapping("/can")
 class CanController(private val service: CanService) {
     @GetMapping
-    fun getCans(): ApiResponse<List<CanResponse>> {
+    fun getCans(request: HttpServletRequest): ApiResponse<List<CanResponse>> {
-        return ApiResponse.ok(service.getCans())
+        val geoCountry = request.getAttribute("geoCountry") as? GeoCountry ?: GeoCountry.OTHER
+        return ApiResponse.ok(service.getCans(geoCountry))
     }
 
     @GetMapping("/status")

src/main/kotlin/kr/co/vividnext/sodalive/can/CanRepository.kt

@@ -23,7 +23,7 @@ import org.springframework.stereotype.Repository
 interface CanRepository : JpaRepository<Can, Long>, CanQueryRepository
 
 interface CanQueryRepository {
-    fun findAllByStatus(status: CanStatus): List<CanResponse>
+    fun findAllByStatusAndCurrency(status: CanStatus, currency: String): List<CanResponse>
     fun getCanUseStatus(member: Member, pageable: Pageable): List<UseCan>
     fun getCanChargeStatus(member: Member, pageable: Pageable, container: String): List<Charge>
     fun isExistPaidLiveRoom(memberId: Long, roomId: Long): UseCan?
@@ -32,7 +32,7 @@ interface CanQueryRepository {
 
 @Repository
 class CanQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : CanQueryRepository {
-    override fun findAllByStatus(status: CanStatus): List<CanResponse> {
+    override fun findAllByStatusAndCurrency(status: CanStatus, currency: String): List<CanResponse> {
         return queryFactory
             .select(
                 QCanResponse(
@@ -40,11 +40,16 @@ class CanQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : CanQue
                     can1.title,
                     can1.can,
                     can1.rewardCan,
-                    can1.price
+                    can1.price.intValue(),
+                    can1.currency,
+                    can1.price.stringValue()
                 )
             )
             .from(can1)
-            .where(can1.status.eq(status))
+            .where(
+                can1.status.eq(status),
+                can1.currency.eq(currency)
+            )
             .orderBy(can1.can.asc())
             .fetch()
     }

src/main/kotlin/kr/co/vividnext/sodalive/can/CanResponse.kt

@@ -7,5 +7,7 @@ data class CanResponse @QueryProjection constructor(
     val title: String,
     val can: Int,
     val rewardCan: Int,
-    val price: Int
+    val price: Int,
+    val currency: String,
+    val priceStr: String
 )

src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt

@@ -3,6 +3,7 @@ package kr.co.vividnext.sodalive.can
 import kr.co.vividnext.sodalive.can.charge.ChargeStatus
 import kr.co.vividnext.sodalive.can.payment.PaymentGateway
 import kr.co.vividnext.sodalive.can.use.CanUsage
+import kr.co.vividnext.sodalive.common.GeoCountry
 import kr.co.vividnext.sodalive.member.Member
 import org.springframework.data.domain.Pageable
 import org.springframework.stereotype.Service
@@ -11,8 +12,12 @@ import java.time.format.DateTimeFormatter
 
 @Service
 class CanService(private val repository: CanRepository) {
-    fun getCans(): List<CanResponse> {
+    fun getCans(geoCountry: GeoCountry): List<CanResponse> {
-        return repository.findAllByStatus(status = CanStatus.SALE)
+        val currency = when (geoCountry) {
+            GeoCountry.KR -> "KRW"
+            else -> "USD"
+        }
+        return repository.findAllByStatusAndCurrency(status = CanStatus.SALE, currency = currency)
     }
 
     fun getCanStatus(member: Member, container: String): GetCanStatusResponse {
@@ -35,6 +40,7 @@ class CanService(private val repository: CanRepository) {
                     "aos" -> {
                         it.useCanCalculates.any { useCanCalculate ->
                             useCanCalculate.paymentGateway == PaymentGateway.PG ||
+                                useCanCalculate.paymentGateway == PaymentGateway.PAYVERSE ||
                                 useCanCalculate.paymentGateway == PaymentGateway.GOOGLE_IAP
                         }
                     }
@@ -42,12 +48,14 @@ class CanService(private val repository: CanRepository) {
                     "ios" -> {
                         it.useCanCalculates.any { useCanCalculate ->
                             useCanCalculate.paymentGateway == PaymentGateway.PG ||
+                                useCanCalculate.paymentGateway == PaymentGateway.PAYVERSE ||
                                 useCanCalculate.paymentGateway == PaymentGateway.APPLE_IAP
                         }
                     }
 
                     else -> it.useCanCalculates.any { useCanCalculate ->
-                        useCanCalculate.paymentGateway == PaymentGateway.PG
+                        useCanCalculate.paymentGateway == PaymentGateway.PG ||
+                            useCanCalculate.paymentGateway == PaymentGateway.PAYVERSE
                     }
                 }
             }

src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeCompleteResponse.kt

@@ -1,7 +1,9 @@
 package kr.co.vividnext.sodalive.can.charge
 
+import java.math.BigDecimal
+
 data class ChargeCompleteResponse(
-    val price: Double,
+    val price: BigDecimal,
     val currencyCode: String,
     val isFirstCharged: Boolean
 )

src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeController.kt

@@ -59,10 +59,12 @@ class ChargeController(
         @RequestBody request: PayverseWebhookRequest,
         servletRequest: HttpServletRequest
     ): PayverseWebhookResponse {
-        val remoteIp = servletRequest.remoteAddr ?: ""
+        val header = servletRequest.getHeader("X-Forwarded-For")
-
+        val remoteIp = if (header.isNullOrEmpty()) {
-        print("Payverse Webhook Request: $remoteIp")
+            servletRequest.remoteAddr
-        print("Payverse Webhook Request: $payverseInboundIp")
+        } else {
+            header.split(",")[0].trim() // 첫 번째 값이 클라이언트 IP
+        }
 
         if (remoteIp != payverseInboundIp) {
             throw ResponseStatusException(HttpStatus.NOT_FOUND)
@@ -166,8 +168,7 @@ class ChargeController(
                 memberId = member.id!!,
                 chargeId = chargeId,
                 productId = request.productId,
-                purchaseToken = request.purchaseToken,
+                purchaseToken = request.purchaseToken
-                paymentGateway = request.paymentGateway
             )
 
             trackingCharge(member, response)

src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeData.kt

@@ -21,14 +21,14 @@ data class VerifyResult(
     val method: String,
     val pg: String,
     val status: Int,
-    val price: Int
+    val price: BigDecimal
 )
 
 data class AppleChargeRequest(
     val title: String,
     val chargeCan: Int,
     val paymentGateway: PaymentGateway,
-    var price: Double? = null,
+    var price: BigDecimal? = null,
     var locale: String? = null
 )
 
@@ -39,7 +39,7 @@ data class AppleVerifyResponse(val status: Int)
 data class GoogleChargeRequest(
     val title: String,
     val chargeCan: Int,
-    val price: Double,
+    val price: BigDecimal,
     val currencyCode: String,
     val productId: String,
     val purchaseToken: String,
@@ -70,8 +70,8 @@ data class PayverseVerifyResponse(
     val transactionMessage: String,
     val orderId: String,
     val customerId: String,
-    val processingCurrency: String,
+    val requestCurrency: String,
-    val processingAmount: BigDecimal
+    val requestAmount: BigDecimal
 )
 
 data class PayverseWebhookRequest(
@@ -81,7 +81,6 @@ data class PayverseWebhookRequest(
     val schemeGroup: String,
     val schemeCode: String,
     val orderId: String,
-    val productName: String,
     val requestCurrency: String,
     val requestAmount: BigDecimal,
     val resultStatus: String,

src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeRepository.kt

@@ -113,15 +113,18 @@ class ChargeQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : Cha
         val paymentGatewayCondition = when (container) {
             "aos" -> {
                 payment.paymentGateway.eq(PaymentGateway.PG)
+                    .or(payment.paymentGateway.eq(PaymentGateway.PAYVERSE))
                     .or(payment.paymentGateway.eq(PaymentGateway.GOOGLE_IAP))
             }
 
             "ios" -> {
                 payment.paymentGateway.eq(PaymentGateway.PG)
+                    .or(payment.paymentGateway.eq(PaymentGateway.PAYVERSE))
                     .or(payment.paymentGateway.eq(PaymentGateway.APPLE_IAP))
             }
 
             else -> payment.paymentGateway.eq(PaymentGateway.PG)
+                .or(payment.paymentGateway.eq(PaymentGateway.PAYVERSE))
         }
 
         return paymentGatewayCondition.or(payment.paymentGateway.eq(PaymentGateway.POINT_CLICK_AD))

src/main/kotlin/kr/co/vividnext/sodalive/can/charge/ChargeService.kt

@@ -73,6 +73,14 @@ class ChargeService(
     private val payverseClientKey: String,
     @Value("\${payverse.secret-key}")
     private val payverseSecretKey: String,
+
+    @Value("\${payverse.usd-mid}")
+    private val payverseUsdMid: String,
+    @Value("\${payverse.usd-client-key}")
+    private val payverseUsdClientKey: String,
+    @Value("\${payverse.usd-secret-key}")
+    private val payverseUsdSecretKey: String,
+
     @Value("\${payverse.host}")
     private val payverseHost: String,
 
@@ -94,11 +102,20 @@ class ChargeService(
         return when (charge.payment?.status) {
             PaymentStatus.REQUEST -> {
                 // 성공 조건 검증
+                val mid = if (request.requestCurrency == "KRW") {
+                    payverseMid
+                } else {
+                    payverseUsdMid
+                }
                 val expectedSign = DigestUtils.sha512Hex(
                     String.format(
                         "||%s||%s||%s||%s||%s||",
-                        payverseSecretKey,
+                        if (request.requestCurrency == "KRW") {
-                        payverseMid,
+                            payverseSecretKey
+                        } else {
+                            payverseUsdSecretKey
+                        },
+                        mid,
                         request.orderId,
                         request.requestAmount,
                         request.approvalDay
@@ -106,12 +123,12 @@ class ChargeService(
                 )
 
                 val isAmountMatch = request.requestAmount.compareTo(
-                    BigDecimal.valueOf(charge.payment!!.price)
+                    charge.payment!!.price
                 ) == 0
 
                 val isSuccess = request.resultStatus == "SUCCESS" &&
-                    request.mid == payverseMid &&
+                    request.mid == mid &&
-                    charge.title == request.productName &&
+                    request.orderId.toLongOrNull() == charge.id &&
                     isAmountMatch &&
                     request.sign == expectedSign
 
@@ -219,29 +236,58 @@ class ChargeService(
         val can = canRepository.findByIdOrNull(request.canId)
             ?: throw SodaException("잘못된 요청입니다\n앱 종료 후 다시 시도해 주세요.")
 
+        val requestCurrency = can.currency
+        val isKrw = requestCurrency == "KRW"
+        val mid = if (isKrw) {
+            payverseMid
+        } else {
+            payverseUsdMid
+        }
+        val clientKey = if (isKrw) {
+            payverseClientKey
+        } else {
+            payverseUsdClientKey
+        }
+        val secretKey = if (isKrw) {
+            payverseSecretKey
+        } else {
+            payverseUsdSecretKey
+        }
+
         val charge = Charge(can.can, can.rewardCan)
         charge.title = can.title
         charge.member = member
         charge.can = can
 
         val payment = Payment(paymentGateway = PaymentGateway.PAYVERSE)
-        payment.price = can.price.toDouble()
+        payment.price = can.price
         charge.payment = payment
 
         val savedCharge = chargeRepository.save(charge)
 
         val chargeId = savedCharge.id!!
-        val amount = BigDecimal(savedCharge.payment!!.price)
+        val amount = BigDecimal(
+            savedCharge.payment!!.price
+                .setScale(4, RoundingMode.HALF_UP)
+                .stripTrailingZeros()
+                .toPlainString()
+        )
         val reqDate = savedCharge.createdAt!!.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))
         val sign = DigestUtils.sha512Hex(
-            String.format("||%s||%s||%s||%s||%s||", payverseSecretKey, payverseMid, chargeId, amount, reqDate)
+            String.format(
+                "||%s||%s||%s||%s||%s||",
+                secretKey,
+                mid,
+                chargeId,
+                amount,
+                reqDate
+            )
         )
         val customerId = "${serverEnv}_user_${member.id!!}"
-        val requestCurrency = "KRW"
 
         val payload = linkedMapOf(
-            "mid" to payverseMid,
+            "mid" to mid,
-            "clientKey" to payverseClientKey,
+            "clientKey" to clientKey,
             "orderId" to chargeId.toString(),
             "customerId" to customerId,
             "productName" to can.title,
@@ -262,6 +308,18 @@ class ChargeService(
         val member = memberRepository.findByIdOrNull(memberId)
             ?: throw SodaException("로그인 정보를 확인해주세요.")
 
+        val isKrw = charge.can?.currency == "KRW"
+        val mid = if (isKrw) {
+            payverseMid
+        } else {
+            payverseUsdMid
+        }
+        val clientKey = if (isKrw) {
+            payverseClientKey
+        } else {
+            payverseUsdClientKey
+        }
+
         // 결제수단 확인
         if (charge.payment?.paymentGateway != PaymentGateway.PAYVERSE) {
             throw SodaException("결제정보에 오류가 있습니다.")
@@ -274,8 +332,8 @@ class ChargeService(
                     val url = "$payverseHost/payment/search/transaction/${verifyRequest.transactionId}"
                     val request = Request.Builder()
                         .url(url)
-                        .addHeader("mid", payverseMid)
+                        .addHeader("mid", mid)
-                        .addHeader("clientKey", payverseClientKey)
+                        .addHeader("clientKey", clientKey)
                         .get()
                         .build()
 
@@ -287,10 +345,12 @@ class ChargeService(
                     val body = response.body?.string() ?: throw SodaException("결제정보에 오류가 있습니다.")
                     val verifyResponse = objectMapper.readValue(body, PayverseVerifyResponse::class.java)
 
+                    val customerId = "${serverEnv}_user_${member.id!!}"
                     val isSuccess = verifyResponse.resultStatus == "SUCCESS" &&
                         verifyResponse.transactionStatus == "SUCCESS" &&
                         verifyResponse.orderId.toLongOrNull() == charge.id &&
-                        verifyResponse.processingAmount.compareTo(BigDecimal.valueOf(charge.can!!.price.toLong())) == 0
+                        verifyResponse.customerId == customerId &&
+                        verifyResponse.requestAmount.compareTo(charge.can!!.price) == 0
 
                     if (isSuccess) {
                         // verify 함수의 232~248 라인과 동일 처리
@@ -303,7 +363,7 @@ class ChargeService(
                         charge.payment?.method = mappedMethod ?: verifyResponse.schemeCode
                         charge.payment?.status = PaymentStatus.COMPLETE
                         // 통화코드 설정
-                        charge.payment?.locale = verifyResponse.processingCurrency
+                        charge.payment?.locale = verifyResponse.requestCurrency
 
                         member.charge(charge.chargeCan, charge.rewardCan, "pg")
 
@@ -315,7 +375,7 @@ class ChargeService(
                         )
 
                         return ChargeCompleteResponse(
-                            price = BigDecimal(charge.payment!!.price).setScale(2, RoundingMode.HALF_UP).toDouble(),
+                            price = charge.payment!!.price,
                             currencyCode = charge.payment!!.locale?.takeLast(3) ?: "KRW",
                             isFirstCharged = chargeRepository.isFirstCharged(memberId)
                         )
@@ -330,7 +390,7 @@ class ChargeService(
             PaymentStatus.COMPLETE -> {
                 // 이미 결제가 완료된 경우, 동일한 데이터로 즉시 반환
                 return ChargeCompleteResponse(
-                    price = BigDecimal(charge.payment!!.price).setScale(2, RoundingMode.HALF_UP).toDouble(),
+                    price = charge.payment!!.price,
                     currencyCode = charge.payment!!.locale?.takeLast(3) ?: "KRW",
                     isFirstCharged = chargeRepository.isFirstCharged(memberId)
                 )
@@ -353,7 +413,7 @@ class ChargeService(
         charge.can = can
 
         val payment = Payment(paymentGateway = request.paymentGateway)
-        payment.price = can.price.toDouble()
+        payment.price = can.price
         charge.payment = payment
 
         chargeRepository.save(charge)
@@ -392,7 +452,7 @@ class ChargeService(
                     )
 
                     return ChargeCompleteResponse(
-                        price = BigDecimal(charge.payment!!.price).setScale(2, RoundingMode.HALF_UP).toDouble(),
+                        price = charge.payment!!.price,
                         currencyCode = charge.payment!!.locale?.takeLast(3) ?: "KRW",
                         isFirstCharged = chargeRepository.isFirstCharged(memberId)
                     )
@@ -424,7 +484,7 @@ class ChargeService(
                     VerifyResult::class.java
                 )
 
-                if (verifyResult.status == 1 && verifyResult.price == charge.can?.price) {
+                if (verifyResult.status == 1) {
                     charge.payment?.receiptId = verifyResult.receiptId
                     charge.payment?.method = if (verifyResult.pg.contains("카카오")) {
                         "${verifyResult.pg}-${verifyResult.method}"
@@ -442,7 +502,7 @@ class ChargeService(
                     )
 
                     return ChargeCompleteResponse(
-                        price = BigDecimal(charge.payment!!.price).setScale(2, RoundingMode.HALF_UP).toDouble(),
+                        price = charge.payment!!.price,
                         currencyCode = charge.payment!!.locale?.takeLast(3) ?: "KRW",
                         isFirstCharged = chargeRepository.isFirstCharged(memberId)
                     )
@@ -467,7 +527,7 @@ class ChargeService(
         payment.price = if (request.price != null) {
             request.price!!
         } else {
-            0.toDouble()
+            0.toBigDecimal()
         }
 
         payment.locale = request.locale
@@ -502,7 +562,7 @@ class ChargeService(
                 )
 
                 return ChargeCompleteResponse(
-                    price = BigDecimal(charge.payment!!.price).setScale(2, RoundingMode.HALF_UP).toDouble(),
+                    price = charge.payment!!.price,
                     currencyCode = charge.payment!!.locale?.takeLast(3) ?: "KRW",
                     isFirstCharged = chargeRepository.isFirstCharged(memberId)
                 )
@@ -519,7 +579,7 @@ class ChargeService(
         member: Member,
         title: String,
         chargeCan: Int,
-        price: Double,
+        price: BigDecimal,
         currencyCode: String,
         productId: String,
         purchaseToken: String,
@@ -547,8 +607,7 @@ class ChargeService(
         memberId: Long,
         chargeId: Long,
         productId: String,
-        purchaseToken: String,
+        purchaseToken: String
-        paymentGateway: PaymentGateway
     ): ChargeCompleteResponse {
         val charge = chargeRepository.findByIdOrNull(id = chargeId)
             ?: throw SodaException("결제정보에 오류가 있습니다.")
@@ -570,7 +629,7 @@ class ChargeService(
                 )
 
                 return ChargeCompleteResponse(
-                    price = BigDecimal(charge.payment!!.price).setScale(2, RoundingMode.HALF_UP).toDouble(),
+                    price = charge.payment!!.price,
                     currencyCode = charge.payment!!.locale?.takeLast(3) ?: "KRW",
                     isFirstCharged = chargeRepository.isFirstCharged(memberId)
                 )

src/main/kotlin/kr/co/vividnext/sodalive/can/charge/temp/ChargeTempRequest.kt

@@ -1,9 +1,10 @@
 package kr.co.vividnext.sodalive.can.charge.temp
 
 import kr.co.vividnext.sodalive.can.payment.PaymentGateway
+import java.math.BigDecimal
 
 data class ChargeTempRequest(
     val can: Int,
-    val price: Int,
+    val price: BigDecimal,
     val paymentGateway: PaymentGateway
 )

src/main/kotlin/kr/co/vividnext/sodalive/can/charge/temp/ChargeTempService.kt

@@ -41,7 +41,7 @@ class ChargeTempService(
         charge.member = member
 
         val payment = Payment(paymentGateway = request.paymentGateway)
-        payment.price = request.price.toDouble()
+        payment.price = request.price
         charge.payment = payment
 
         chargeRepository.save(charge)
@@ -66,7 +66,7 @@ class ChargeTempService(
                     VerifyResult::class.java
                 )
 
-                if (verifyResult.status == 1 && verifyResult.price == charge.payment!!.price.toInt()) {
+                if (verifyResult.status == 1 && verifyResult.price == charge.payment!!.price) {
                     charge.payment?.receiptId = verifyResult.receiptId
                     charge.payment?.method = verifyResult.method
                     charge.payment?.status = PaymentStatus.COMPLETE
@@ -74,7 +74,7 @@ class ChargeTempService(
                 } else {
                     throw SodaException("결제정보에 오류가 있습니다.")
                 }
-            } catch (e: Exception) {
+            } catch (_: Exception) {
                 throw SodaException("결제정보에 오류가 있습니다.")
             }
         } else {

src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt

@@ -127,6 +127,7 @@ class CanPaymentService(
         useCanRepository.save(useCan)
 
         setUseCanCalculate(recipientId, useRewardCan, useChargeCan, useCan, paymentGateway = PaymentGateway.PG)
+        setUseCanCalculate(recipientId, useRewardCan, useChargeCan, useCan, paymentGateway = PaymentGateway.PAYVERSE)
         setUseCanCalculate(
             recipientId,
             useRewardCan,
@@ -379,6 +380,7 @@ class CanPaymentService(
         useCanRepository.save(useCan)
 
         setUseCanCalculate(null, useRewardCan, useChargeCan, useCan, paymentGateway = PaymentGateway.PG)
+        setUseCanCalculate(null, useRewardCan, useChargeCan, useCan, paymentGateway = PaymentGateway.PAYVERSE)
         setUseCanCalculate(null, useRewardCan, useChargeCan, useCan, paymentGateway = PaymentGateway.POINT_CLICK_AD)
         setUseCanCalculate(null, useRewardCan, useChargeCan, useCan, paymentGateway = PaymentGateway.GOOGLE_IAP)
         setUseCanCalculate(null, useRewardCan, useChargeCan, useCan, paymentGateway = PaymentGateway.APPLE_IAP)
@@ -428,6 +430,7 @@ class CanPaymentService(
         useCanRepository.save(useCan)
 
         setUseCanCalculate(null, useRewardCan, useChargeCan, useCan, paymentGateway = PaymentGateway.PG)
+        setUseCanCalculate(null, useRewardCan, useChargeCan, useCan, paymentGateway = PaymentGateway.PAYVERSE)
         setUseCanCalculate(null, useRewardCan, useChargeCan, useCan, paymentGateway = PaymentGateway.POINT_CLICK_AD)
         setUseCanCalculate(null, useRewardCan, useChargeCan, useCan, paymentGateway = PaymentGateway.GOOGLE_IAP)
         setUseCanCalculate(null, useRewardCan, useChargeCan, useCan, paymentGateway = PaymentGateway.APPLE_IAP)

src/main/kotlin/kr/co/vividnext/sodalive/can/payment/Payment.kt

@@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.can.payment
 
 import kr.co.vividnext.sodalive.can.charge.Charge
 import kr.co.vividnext.sodalive.common.BaseEntity
+import java.math.BigDecimal
 import javax.persistence.Column
 import javax.persistence.Entity
 import javax.persistence.EnumType
@@ -25,7 +26,8 @@ data class Payment(
     var receiptId: String? = null
     var method: String? = null
 
-    var price: Double = 0.toDouble()
+    @Column(precision = 10, scale = 4, nullable = false)
+    var price: BigDecimal = 0.toBigDecimal()
     var locale: String? = null
     var orderId: String? = null
 }

src/main/kotlin/kr/co/vividnext/sodalive/chat/character/controller/ChatCharacterController.kt

@@ -74,6 +74,13 @@ class ChatCharacterController(
             size = 50
         ).content
 
+        // 추천 캐릭터 조회
+        // 최근 대화한 캐릭터를 제외한 랜덤 30개 조회
+        // Controller에서는 호출만
+        // 세부로직은 추후에 변경될 수 있으므로 Service에 별도로 생성
+        val excludeIds = recentCharacters.map { it.characterId }
+        val recommendCharacters = service.getRecommendCharacters(excludeIds, 30)
+
         // 큐레이션 섹션 (활성화된 큐레이션 + 캐릭터)
         val curationSections = curationQueryService.getActiveCurationsWithCharacters()
             .map { agg ->
@@ -85,7 +92,8 @@ class ChatCharacterController(
                             characterId = it.id!!,
                             name = it.name,
                             description = it.description,
-                            imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}"
+                            imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}",
+                            new = false
                         )
                     }
                 )
@@ -98,6 +106,7 @@ class ChatCharacterController(
                 recentCharacters = recentCharacters,
                 popularCharacters = popularCharacters,
                 newCharacters = newCharacters,
+                recommendCharacters = recommendCharacters,
                 curationSections = curationSections
             )
         )
@@ -193,4 +202,23 @@ class ChatCharacterController(
             )
         )
     }
+
+    /**
+     * 추천 캐릭터 새로고침 API
+     * - 최근 대화한 캐릭터를 제외하고 랜덤 20개 반환
+     * - 비회원 또는 본인인증되지 않은 경우: 최근 대화 목록 없음 → 전체 활성 캐릭터 중 랜덤 20개
+     */
+    @GetMapping("/recommend")
+    fun getRecommendCharacters(
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        val recent = if (member == null || member.auth == null) {
+            emptyList()
+        } else {
+            chatRoomService
+                .listMyChatRooms(member, 0, 50) // 최근 기록은 최대 50개까지만 제외 대상으로 고려
+                .map { it.characterId }
+        }
+        ApiResponse.ok(service.getRecommendCharacters(recent, 20))
+    }
 }

src/main/kotlin/kr/co/vividnext/sodalive/chat/character/dto/CharacterHomeResponse.kt

@@ -7,6 +7,7 @@ data class CharacterMainResponse(
     val recentCharacters: List<RecentCharacter>,
     val popularCharacters: List<Character>,
     val newCharacters: List<Character>,
+    val recommendCharacters: List<Character>,
     val curationSections: List<CurationSection>
 )
 
@@ -20,7 +21,8 @@ data class Character(
     @JsonProperty("characterId") val characterId: Long,
     @JsonProperty("name") val name: String,
     @JsonProperty("description") val description: String,
-    @JsonProperty("imageUrl") val imageUrl: String
+    @JsonProperty("imageUrl") val imageUrl: String,
+    @JsonProperty("isNew") val new: Boolean
 )
 
 data class RecentCharacter(

src/main/kotlin/kr/co/vividnext/sodalive/chat/character/image/CharacterImageRepository.kt

@@ -8,7 +8,9 @@ import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
 import org.springframework.stereotype.Repository
+import java.time.LocalDateTime
 
 @Repository
 interface CharacterImageRepository : JpaRepository<CharacterImage, Long>, CharacterImageQueryRepository {
@@ -26,6 +28,21 @@ interface CharacterImageRepository : JpaRepository<CharacterImage, Long>, Charac
             "WHERE ci.chatCharacter.id = :characterId AND ci.isActive = true"
     )
     fun findMaxSortOrderByCharacterId(characterId: Long): Int
+
+    @Query(
+        """
+    select distinct c.id
+    from CharacterImage ci
+    join ci.chatCharacter c
+    where ci.isActive = true
+      and ci.createdAt >= :since
+      and c.id in :characterIds
+    """
+    )
+    fun findCharacterIdsWithRecentImages(
+        @Param("characterIds") characterIds: List<Long>,
+        @Param("since") since: LocalDateTime
+    ): List<Long>
 }
 
 interface CharacterImageQueryRepository {

src/main/kotlin/kr/co/vividnext/sodalive/chat/character/repository/ChatCharacterRepository.kt

@@ -74,5 +74,29 @@ interface ChatCharacterRepository : JpaRepository<ChatCharacter, Long> {
         pageable: Pageable
     ): List<ChatCharacter>
 
+    /**
+     * 활성 캐릭터 무작위 조회
+     */
+    @Query(
+        """
+        SELECT c FROM ChatCharacter c
+        WHERE c.isActive = true
+        ORDER BY function('RAND')
+        """
+    )
+    fun findRandomActive(pageable: Pageable): List<ChatCharacter>
+
+    /**
+     * 제외할 캐릭터를 뺀 활성 캐릭터 무작위 조회
+     */
+    @Query(
+        """
+        SELECT c FROM ChatCharacter c
+        WHERE c.isActive = true AND c.id NOT IN :excludeIds
+        ORDER BY function('RAND')
+        """
+    )
+    fun findRandomActiveExcluding(@Param("excludeIds") excludeIds: List<Long>, pageable: Pageable): List<ChatCharacter>
+
     fun findByIdInAndIsActiveTrue(ids: List<Long>): List<ChatCharacter>
 }

src/main/kotlin/kr/co/vividnext/sodalive/chat/character/service/ChatCharacterService.kt

@@ -13,6 +13,7 @@ import kr.co.vividnext.sodalive.chat.character.ChatCharacterTag
 import kr.co.vividnext.sodalive.chat.character.ChatCharacterValue
 import kr.co.vividnext.sodalive.chat.character.dto.Character
 import kr.co.vividnext.sodalive.chat.character.dto.RecentCharactersResponse
+import kr.co.vividnext.sodalive.chat.character.image.CharacterImageRepository
 import kr.co.vividnext.sodalive.chat.character.repository.ChatCharacterGoalRepository
 import kr.co.vividnext.sodalive.chat.character.repository.ChatCharacterHobbyRepository
 import kr.co.vividnext.sodalive.chat.character.repository.ChatCharacterRepository
@@ -34,10 +35,42 @@ class ChatCharacterService(
     private val hobbyRepository: ChatCharacterHobbyRepository,
     private val goalRepository: ChatCharacterGoalRepository,
     private val popularCharacterQuery: PopularCharacterQuery,
+    private val imageRepository: CharacterImageRepository,
 
     @Value("\${cloud.aws.cloud-front.host}")
     private val imageHost: String
 ) {
+    @Transactional(readOnly = true)
+    fun getRecommendCharacters(excludeCharacterIds: List<Long> = emptyList(), limit: Int = 20): List<Character> {
+        val safeLimit = if (limit <= 0) 20 else if (limit > 50) 50 else limit
+        val chars = if (excludeCharacterIds.isNotEmpty()) {
+            chatCharacterRepository.findRandomActiveExcluding(excludeCharacterIds, PageRequest.of(0, safeLimit))
+        } else {
+            chatCharacterRepository.findRandomActive(PageRequest.of(0, safeLimit))
+        }
+
+        val recentSet = if (chars.isNotEmpty()) {
+            imageRepository
+                .findCharacterIdsWithRecentImages(
+                    chars.map { it.id!! },
+                    LocalDateTime.now().minusDays(3)
+                )
+                .toSet()
+        } else {
+            emptySet()
+        }
+
+        return chars.map {
+            Character(
+                characterId = it.id!!,
+                name = it.name,
+                description = it.description,
+                imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}",
+                new = recentSet.contains(it.id)
+            )
+        }
+    }
+
     /**
      * UTC 20:00 경계 기준 지난 윈도우의 메시지 수 상위 캐릭터 조회
      * Spring Cache(@Cacheable) + 동적 키 + 고정 TTL(24h) 사용
@@ -51,12 +84,25 @@ class ChatCharacterService(
         val window = RankingWindowCalculator.now("popular-character")
         val topIds = popularCharacterQuery.findPopularCharacterIds(window.windowStart, window.nextBoundary, limit)
         val list = loadCharactersInOrder(topIds)
+
+        val recentSet = if (list.isNotEmpty()) {
+            imageRepository
+                .findCharacterIdsWithRecentImages(
+                    list.map { it.id!! },
+                    LocalDateTime.now().minusDays(3)
+                )
+                .toSet()
+        } else {
+            emptySet()
+        }
+
         return list.map {
             Character(
                 characterId = it.id!!,
                 name = it.name,
                 description = it.description,
-                imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}"
+                imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}",
+                new = recentSet.contains(it.id)
             )
         }
     }
@@ -91,15 +137,28 @@ class ChatCharacterService(
                     content = emptyList()
                 )
             }
-            val fallback = chatCharacterRepository.findByIsActiveTrue(
+            val chars = chatCharacterRepository.findByIsActiveTrue(
                 PageRequest.of(0, 20, Sort.by("createdAt").descending())
+            ).content
+
+            val recentSet = if (chars.isNotEmpty()) {
+                imageRepository
+                    .findCharacterIdsWithRecentImages(
+                        chars.map { it.id!! },
+                        LocalDateTime.now().minusDays(3)
                     )
-            val content = fallback.content.map {
+                    .toSet()
+            } else {
+                emptySet()
+            }
+
+            val content = chars.map {
                 Character(
                     characterId = it.id!!,
                     name = it.name,
                     description = it.description,
-                    imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}"
+                    imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}",
+                    new = recentSet.contains(it.id)
                 )
             }
             return RecentCharactersResponse(
@@ -108,16 +167,29 @@ class ChatCharacterService(
             )
         }
 
-        val pageResult = chatCharacterRepository.findRecentSince(
+        val chars = chatCharacterRepository.findRecentSince(
             since,
             PageRequest.of(safePage, safeSize)
+        ).content
+
+        val recentSet = if (chars.isNotEmpty()) {
+            imageRepository
+                .findCharacterIdsWithRecentImages(
+                    chars.map { it.id!! },
+                    LocalDateTime.now().minusDays(3)
                 )
-        val content = pageResult.content.map {
+                .toSet()
+        } else {
+            emptySet()
+        }
+
+        val content = chars.map {
             Character(
                 characterId = it.id!!,
                 name = it.name,
                 description = it.description,
-                imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}"
+                imageUrl = "$imageHost/${it.imagePath ?: "profile/default-profile.png"}",
+                new = recentSet.contains(it.id)
             )
         }
 

src/main/kotlin/kr/co/vividnext/sodalive/chat/original/controller/OriginalWorkController.kt

@@ -1,6 +1,8 @@
 package kr.co.vividnext.sodalive.chat.original.controller
 
+import kr.co.vividnext.sodalive.chat.character.ChatCharacter
 import kr.co.vividnext.sodalive.chat.character.dto.Character
+import kr.co.vividnext.sodalive.chat.character.image.CharacterImageRepository
 import kr.co.vividnext.sodalive.chat.original.dto.OriginalWorkDetailResponse
 import kr.co.vividnext.sodalive.chat.original.dto.OriginalWorkListItemResponse
 import kr.co.vividnext.sodalive.chat.original.dto.OriginalWorkListResponse
@@ -15,6 +17,7 @@ import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
+import java.time.LocalDateTime
 
 /**
  * 앱용 원작(오리지널 작품) 공개 API
@@ -25,6 +28,8 @@ import org.springframework.web.bind.annotation.RestController
 @RequestMapping("/api/chat/original")
 class OriginalWorkController(
     private val queryService: OriginalWorkQueryService,
+    private val characterImageRepository: CharacterImageRepository,
+
     @Value("\${cloud.aws.cloud-front.host}")
     private val imageHost: String
 ) {
@@ -65,17 +70,34 @@ class OriginalWorkController(
         if (member.auth == null) throw SodaException("본인인증을 하셔야 합니다.")
 
         val ow = queryService.getOriginalWork(id)
-        val pageRes = queryService.getActiveCharactersPage(id, page = 0, size = 20)
+        val chars = queryService.getActiveCharactersPage(id, page = 0, size = 20).content
-        val characters = pageRes.content.map {
+
+        val recentSet = if (chars.isNotEmpty()) {
+            characterImageRepository
+                .findCharacterIdsWithRecentImages(
+                    chars.map { it.id!! },
+                    LocalDateTime.now().minusDays(3)
+                )
+                .toSet()
+        } else {
+            emptySet()
+        }
+
+        ApiResponse.ok(
+            OriginalWorkDetailResponse.from(
+                ow,
+                imageHost,
+                chars.map<ChatCharacter, Character> {
                     val path = it.imagePath ?: "profile/default-profile.png"
                     Character(
                         characterId = it.id!!,
                         name = it.name,
                         description = it.description,
-                imageUrl = "$imageHost/$path"
+                        imageUrl = "$imageHost/$path",
+                        new = recentSet.contains(it.id)
                     )
                 }
-        val response = OriginalWorkDetailResponse.from(ow, imageHost, characters)
+            )
-        ApiResponse.ok(response)
+        )
     }
 }

src/main/kotlin/kr/co/vividnext/sodalive/chat/original/service/OriginalWorkQueryService.kt

@@ -59,7 +59,7 @@ class OriginalWorkQueryService(
         val safePage = if (page < 0) 0 else page
         val safeSize = when {
             size <= 0 -> 20
-            size > 50 -> 50
+            size > 20 -> 20
             else -> size
         }
         val pageable = PageRequest.of(safePage, safeSize, Sort.by("createdAt").descending())

src/main/kotlin/kr/co/vividnext/sodalive/chat/quota/room/ChatRoomQuotaController.kt

@@ -54,7 +54,7 @@ class ChatRoomQuotaController(
     ): ApiResponse<PurchaseRoomQuotaResponse> = run {
         if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
         if (member.auth == null) throw SodaException("본인인증을 하셔야 합니다.")
-        if (req.container.isBlank()) throw SodaException("container를 확인해주세요.")
+        if (req.container.isBlank()) throw SodaException("잘못된 접근입니다")
 
         val room = chatRoomRepository.findByIdAndIsActiveTrue(chatRoomId)
             ?: throw SodaException("채팅방을 찾을 수 없습니다.")
@@ -79,7 +79,7 @@ class ChatRoomQuotaController(
             memberId = member.id!!,
             chatRoomId = chatRoomId,
             characterId = characterId,
-            addPaid = 40,
+            addPaid = 12,
             container = req.container
         )
 

src/main/kotlin/kr/co/vividnext/sodalive/chat/quota/room/ChatRoomQuotaService.kt

@@ -126,13 +126,13 @@ class ChatRoomQuotaService(
         memberId: Long,
         chatRoomId: Long,
         characterId: Long,
-        addPaid: Int = 40,
+        addPaid: Int = 12,
         container: String
     ): RoomQuotaStatus {
-        // 요구사항: 30캔 결제 및 UseCan에 방/캐릭터 기록
+        // 요구사항: 10캔 결제 및 UseCan에 방/캐릭터 기록
         canPaymentService.spendCan(
             memberId = memberId,
-            needCan = 30,
+            needCan = 10,
             canUsage = CanUsage.CHAT_QUOTA_PURCHASE,
             chatRoomId = chatRoomId,
             characterId = characterId,

src/main/kotlin/kr/co/vividnext/sodalive/common/GeoCountry.kt

@@ -0,0 +1,8 @@
+package kr.co.vividnext.sodalive.common
+
+const val WAF_GEO_HEADER = "x-amzn-waf-geo-country"
+
+enum class GeoCountry { KR, OTHER }
+
+fun parseGeo(headerValue: String?): GeoCountry =
+    if (headerValue?.trim()?.uppercase() == "KR") GeoCountry.KR else GeoCountry.OTHER

src/main/kotlin/kr/co/vividnext/sodalive/common/GeoCountryFilter.kt

@@ -0,0 +1,20 @@
+package kr.co.vividnext.sodalive.common
+
+import org.springframework.stereotype.Component
+import org.springframework.web.filter.OncePerRequestFilter
+import javax.servlet.FilterChain
+import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.HttpServletResponse
+
+@Component
+class GeoCountryFilter : OncePerRequestFilter() {
+    override fun doFilterInternal(
+        request: HttpServletRequest,
+        response: HttpServletResponse,
+        filterChain: FilterChain
+    ) {
+        val country = parseGeo(request.getHeader(WAF_GEO_HEADER))
+        request.setAttribute("geoCountry", country)
+        filterChain.doFilter(request, response)
+    }
+}

src/main/kotlin/kr/co/vividnext/sodalive/common/SodaExceptionHandler.kt

@@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.common
 import org.slf4j.LoggerFactory
 import org.springframework.dao.DataIntegrityViolationException
 import org.springframework.http.HttpStatus
-import org.springframework.http.ResponseEntity
 import org.springframework.security.access.AccessDeniedException
 import org.springframework.security.authentication.BadCredentialsException
 import org.springframework.security.authentication.InternalAuthenticationServiceException
@@ -26,13 +25,6 @@ class SodaExceptionHandler {
         )
     }
 
-    // ResponseStatusException은 ApiResponse로 래핑하지 않고 그대로 전달
-    @ExceptionHandler(ResponseStatusException::class)
-    fun handleResponseStatusException(e: ResponseStatusException): ResponseEntity<Void> {
-        // 별도 바디 없이 상태코드만 반환하여 기본 예외 형태를 유지
-        return ResponseEntity.status(e.status).build()
-    }
-
     @ExceptionHandler(MaxUploadSizeExceededException::class)
     fun handleMaxUploadSizeExceededException(e: MaxUploadSizeExceededException) = run {
         logger.error("API error", e)
@@ -72,6 +64,7 @@ class SodaExceptionHandler {
 
     @ExceptionHandler(Exception::class)
     fun handleException(e: Exception) = run {
+        if (e is ResponseStatusException) throw e
         logger.error("API error", e)
         ApiResponse.error("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
     }

src/main/kotlin/kr/co/vividnext/sodalive/configs/SecurityConfig.kt

@@ -83,6 +83,7 @@ class SecurityConfig(
             .antMatchers("/api/home").permitAll()
             .antMatchers("/api/home/latest-content").permitAll()
             .antMatchers("/api/home/day-of-week-series").permitAll()
+            .antMatchers("/api/home/content-ranking").permitAll()
             .antMatchers(HttpMethod.GET, "/api/live").permitAll()
             .antMatchers(HttpMethod.GET, "/faq").permitAll()
             .antMatchers(HttpMethod.GET, "/faq/category").permitAll()

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

@@ -23,7 +23,7 @@ enum class PurchaseOption {
 }
 
 enum class SortType {
-    NEWEST, PRICE_HIGH, PRICE_LOW
+    NEWEST, PRICE_HIGH, PRICE_LOW, POPULARITY
 }
 
 @Entity

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

@@ -237,6 +237,33 @@ class AudioContentController(private val service: AudioContentService) {
         ApiResponse.ok(service.unpinAtTheTop(contentId = id, member = member))
     }
 
+    @GetMapping("/all")
+    fun getAllContents(
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
+        @RequestParam("isFree", required = false) isFree: Boolean? = null,
+        @RequestParam("isPointAvailableOnly", required = false) isPointAvailableOnly: Boolean? = null,
+        @RequestParam("sort-type", required = false) sortType: SortType? = SortType.NEWEST,
+        @RequestParam("theme", required = false) theme: String? = null,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
+        pageable: Pageable
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+
+        ApiResponse.ok(
+            service.getLatestContentByTheme(
+                theme = if (theme == null) listOf() else listOf(theme),
+                contentType = contentType ?: ContentType.ALL,
+                offset = pageable.offset,
+                limit = pageable.pageSize.toLong(),
+                sortType = sortType ?: SortType.NEWEST,
+                isFree = isFree ?: false,
+                isAdult = (isAdultContentVisible ?: true) && member.auth != null,
+                isPointAvailableOnly = isPointAvailableOnly ?: false
+            )
+        )
+    }
+
     @GetMapping("/replay-live")
     fun replayLive(
         @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,

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

@@ -109,7 +109,6 @@ interface AudioContentQueryRepository {
     ): Int
 
     fun findByThemeFor2Weeks(
-        isFree: Boolean = false,
         cloudfrontHost: String,
         memberId: Long,
         theme: List<String> = emptyList(),
@@ -120,7 +119,6 @@ interface AudioContentQueryRepository {
     ): List<GetAudioContentMainItem>
 
     fun totalCountNewContentFor2Weeks(
-        isFree: Boolean = false,
         theme: List<String> = emptyList(),
         memberId: Long,
         isAdult: Boolean,
@@ -182,8 +180,11 @@ interface AudioContentQueryRepository {
         contentType: ContentType,
         offset: Long,
         limit: Long,
+        sortType: SortType,
         isFree: Boolean,
-        isAdult: Boolean
+        isAdult: Boolean,
+        orderByRandom: Boolean = false,
+        isPointAvailableOnly: Boolean = false
     ): List<AudioContentMainItem>
 
     fun findContentByCurationId(
@@ -193,6 +194,11 @@ interface AudioContentQueryRepository {
         offset: Long = 0,
         limit: Long = 20
     ): List<GetAudioContentMainItem>
+
+    fun findLatestContentByCreatorId(
+        creatorId: Long,
+        isAdult: Boolean = false
+    ): AudioContent?
 }
 
 @Repository
@@ -236,6 +242,7 @@ class AudioContentQueryRepositoryImpl(
             SortType.NEWEST -> audioContent.releaseDate.desc()
             SortType.PRICE_HIGH -> audioContent.price.desc()
             SortType.PRICE_LOW -> audioContent.price.asc()
+            SortType.POPULARITY -> audioContent.playCount.desc()
         }
 
         var where = audioContent.member.id.eq(creatorId)
@@ -457,6 +464,12 @@ class AudioContentQueryRepositoryImpl(
                 audioContent.releaseDate.asc(),
                 audioContent.id.asc()
             )
+
+            SortType.POPULARITY -> listOf(
+                audioContent.playCount.desc(),
+                audioContent.releaseDate.asc(),
+                audioContent.id.asc()
+            )
         }
 
         var where = audioContent.isActive.isTrue
@@ -688,7 +701,6 @@ class AudioContentQueryRepositoryImpl(
     }
 
     override fun totalCountNewContentFor2Weeks(
-        isFree: Boolean,
         theme: List<String>,
         memberId: Long,
         isAdult: Boolean,
@@ -725,10 +737,6 @@ class AudioContentQueryRepositoryImpl(
             where = where.and(audioContentTheme.theme.`in`(theme))
         }
 
-        if (isFree) {
-            where = where.and(audioContent.price.loe(0))
-        }
-
         return queryFactory
             .select(audioContent.id)
             .from(audioContent)
@@ -740,7 +748,6 @@ class AudioContentQueryRepositoryImpl(
     }
 
     override fun findByThemeFor2Weeks(
-        isFree: Boolean,
         cloudfrontHost: String,
         memberId: Long,
         theme: List<String>,
@@ -780,10 +787,6 @@ class AudioContentQueryRepositoryImpl(
             where = where.and(audioContentTheme.theme.`in`(theme))
         }
 
-        if (isFree) {
-            where = where.and(audioContent.price.loe(0))
-        }
-
         return queryFactory
             .select(
                 QGetAudioContentMainItem(
@@ -1302,8 +1305,11 @@ class AudioContentQueryRepositoryImpl(
         contentType: ContentType,
         offset: Long,
         limit: Long,
+        sortType: SortType,
         isFree: Boolean,
-        isAdult: Boolean
+        isAdult: Boolean,
+        orderByRandom: Boolean,
+        isPointAvailableOnly: Boolean
     ): List<AudioContentMainItem> {
         var where = audioContent.isActive.isTrue
             .and(audioContent.duration.isNotNull)
@@ -1338,6 +1344,31 @@ class AudioContentQueryRepositoryImpl(
             where = where.and(audioContent.price.loe(0))
         }
 
+        if (isPointAvailableOnly) {
+            where = where.and(audioContent.isPointAvailable.isTrue)
+        }
+
+        val orderBy = if (orderByRandom) {
+            Expressions.numberTemplate(Double::class.java, "function('rand')").asc()
+        } else {
+            when (sortType) {
+                SortType.NEWEST -> audioContent.releaseDate.desc()
+                SortType.PRICE_HIGH -> if (isFree) {
+                    audioContent.releaseDate.desc()
+                } else {
+                    audioContent.price.desc()
+                }
+
+                SortType.PRICE_LOW -> if (isFree) {
+                    audioContent.releaseDate.asc()
+                } else {
+                    audioContent.price.desc()
+                }
+
+                SortType.POPULARITY -> audioContent.playCount.desc()
+            }
+        }
+
         return queryFactory
             .select(
                 QAudioContentMainItem(
@@ -1355,7 +1386,7 @@ class AudioContentQueryRepositoryImpl(
             .where(where)
             .offset(offset)
             .limit(limit)
-            .orderBy(audioContent.id.desc())
+            .orderBy(orderBy)
             .fetch()
     }
 
@@ -1416,4 +1447,26 @@ class AudioContentQueryRepositoryImpl(
             .limit(limit)
             .fetch()
     }
+
+    override fun findLatestContentByCreatorId(
+        creatorId: Long,
+        isAdult: Boolean
+    ): AudioContent? {
+        var where = audioContent.member.id.eq(creatorId)
+            .and(audioContent.isActive.isTrue)
+            .and(audioContent.duration.isNotNull)
+            .and(audioContent.releaseDate.isNotNull)
+            .and(audioContent.releaseDate.loe(LocalDateTime.now()))
+
+        if (!isAdult) {
+            where = where.and(audioContent.isAdult.isFalse)
+        }
+
+        return queryFactory
+            .selectFrom(audioContent)
+            .where(where)
+            .orderBy(audioContent.releaseDate.desc())
+            .limit(1)
+            .fetchFirst()
+    }
 }

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

@@ -386,7 +386,7 @@ class AudioContentService(
 
             // Check if the time difference is greater than 30 seconds (30000 milliseconds)
             return date2.time - date1.time
-        } catch (e: Exception) {
+        } catch (_: Exception) {
             // Handle invalid time formats or parsing errors
             return 0
         }
@@ -749,6 +749,49 @@ class AudioContentService(
         )
     }
 
+    fun getLatestCreatorAudioContent(
+        creatorId: Long,
+        member: Member,
+        isAdultContentVisible: Boolean
+    ): GetAudioContentListItem? {
+        val isAdult = member.auth != null && isAdultContentVisible
+
+        val audioContent = repository.findLatestContentByCreatorId(creatorId, isAdult) ?: return null
+
+        val commentCount = commentRepository
+            .totalCountCommentByContentId(
+                audioContent.id!!,
+                memberId = member.id!!,
+                isContentCreator = creatorId == member.id!!
+            )
+
+        val likeCount = audioContentLikeRepository
+            .totalCountAudioContentLike(audioContent.id!!)
+
+        val (isExistsAudioContent, orderType) = orderRepository.isExistOrderedAndOrderType(
+            memberId = member.id!!,
+            contentId = audioContent.id!!
+        )
+
+        return GetAudioContentListItem(
+            contentId = audioContent.id!!,
+            coverImageUrl = "$coverImageHost/${audioContent.coverImage}",
+            title = audioContent.title,
+            price = audioContent.price,
+            themeStr = audioContent.theme!!.theme,
+            duration = audioContent.duration,
+            likeCount = likeCount,
+            commentCount = commentCount,
+            isPin = false,
+            isAdult = audioContent.isAdult,
+            isScheduledToOpen = audioContent.releaseDate != null && audioContent.releaseDate!! >= LocalDateTime.now(),
+            isRented = isExistsAudioContent && orderType == OrderType.RENTAL,
+            isOwned = isExistsAudioContent && orderType == OrderType.KEEP,
+            isSoldOut = audioContent.remaining != null && audioContent.remaining!! <= 0,
+            isPointAvailable = audioContent.isPointAvailable
+        )
+    }
+
     fun getAudioContentList(
         creatorId: Long,
         sortType: SortType,
@@ -945,16 +988,22 @@ class AudioContentService(
         contentType: ContentType,
         offset: Long = 0,
         limit: Long = 20,
+        sortType: SortType = SortType.NEWEST,
         isFree: Boolean = false,
-        isAdult: Boolean = false
+        isAdult: Boolean = false,
+        orderByRandom: Boolean = false,
+        isPointAvailableOnly: Boolean = false
     ): List<AudioContentMainItem> {
         return repository.getLatestContentByTheme(
             theme = theme,
             contentType = contentType,
             offset = offset,
             limit = limit,
+            sortType = sortType,
             isFree = isFree,
-            isAdult = isAdult
+            isAdult = isAdult,
+            orderByRandom = orderByRandom,
+            isPointAvailableOnly = isPointAvailableOnly
         )
     }
 }

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

@@ -99,7 +99,6 @@ class AudioContentMainController(
 
     @GetMapping("/new/all")
     fun getNewContentAllByTheme(
-        @RequestParam("isFree", required = false) isFree: Boolean? = null,
         @RequestParam("theme") theme: String,
         @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
         @RequestParam("contentType", required = false) contentType: ContentType? = null,
@@ -110,7 +109,6 @@ class AudioContentMainController(
 
         ApiResponse.ok(
             service.getNewContentFor2WeeksByTheme(
-                isFree = isFree ?: false,
                 theme = theme,
                 isAdultContentVisible = isAdultContentVisible ?: true,
                 contentType = contentType ?: ContentType.ALL,

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

@@ -28,16 +28,6 @@ class AudioContentMainService(
     @Cacheable(cacheNames = ["default"], key = "'themeList:' + ':' + #isAdult")
     fun getThemeList(isAdult: Boolean, contentType: ContentType): List<String> {
         return audioContentThemeRepository.getActiveThemeOfContent(isAdult = isAdult, contentType = contentType)
-            .filter {
-                it != "모닝콜" &&
-                    it != "알람" &&
-                    it != "슬립콜" &&
-                    it != "다시듣기" &&
-                    it != "ASMR" &&
-                    it != "릴레이" &&
-                    it != "챌린지" &&
-                    it != "자기소개"
-            }
     }
 
     @Transactional(readOnly = true)
@@ -64,7 +54,6 @@ class AudioContentMainService(
 
     @Transactional(readOnly = true)
     fun getNewContentFor2WeeksByTheme(
-        isFree: Boolean,
         theme: String,
         isAdultContentVisible: Boolean,
         contentType: ContentType,
@@ -75,31 +64,19 @@ class AudioContentMainService(
         val themeList = if (theme.isBlank()) {
             audioContentThemeRepository.getActiveThemeOfContent(
                 isAdult = isAdult,
-                isFree = isFree,
                 contentType = contentType
-            ).filter {
+            )
-                it != "모닝콜" &&
-                    it != "알람" &&
-                    it != "슬립콜" &&
-                    it != "다시듣기" &&
-                    it != "ASMR" &&
-                    it != "릴레이" &&
-                    it != "챌린지" &&
-                    it != "자기소개"
-            }
         } else {
             listOf(theme)
         }
 
         val totalCount = repository.totalCountNewContentFor2Weeks(
-            isFree,
             themeList,
             memberId = member.id!!,
             isAdult = isAdult,
             contentType = contentType
         )
         val items = repository.findByThemeFor2Weeks(
-            isFree,
             cloudfrontHost = imageHost,
             memberId = member.id!!,
             theme = themeList,

src/main/kotlin/kr/co/vividnext/sodalive/content/main/curation/AudioContentCurationQueryRepository.kt

@@ -58,6 +58,7 @@ class AudioContentCurationQueryRepository(private val queryFactory: JPAQueryFact
             SortType.NEWEST -> audioContent.createdAt.desc()
             SortType.PRICE_HIGH -> audioContent.price.desc()
             SortType.PRICE_LOW -> audioContent.price.asc()
+            SortType.POPULARITY -> audioContent.playCount.desc()
         }
 
         var where = audioContent.isActive.isTrue

src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderRepository.kt

@@ -187,6 +187,7 @@ class OrderQueryRepositoryImpl(
         return queryFactory.select(order.id)
             .from(order)
             .where(where)
+            .distinct()
             .fetch()
             .size
     }

src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesController.kt

@@ -18,7 +18,9 @@ import org.springframework.web.bind.annotation.RestController
 class ContentSeriesController(private val service: ContentSeriesService) {
     @GetMapping
     fun getSeriesList(
-        @RequestParam creatorId: Long,
+        @RequestParam(required = false) creatorId: Long?,
+        @RequestParam(name = "isOriginal", required = false) isOriginal: Boolean? = null,
+        @RequestParam(name = "isCompleted", required = false) isCompleted: Boolean? = null,
         @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
         @RequestParam("contentType", required = false) contentType: ContentType? = null,
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
@@ -29,6 +31,8 @@ class ContentSeriesController(private val service: ContentSeriesService) {
         ApiResponse.ok(
             service.getSeriesList(
                 creatorId = creatorId,
+                isOriginal = isOriginal ?: false,
+                isCompleted = isCompleted ?: false,
                 isAdultContentVisible = isAdultContentVisible ?: true,
                 contentType = contentType ?: ContentType.ALL,
                 member = member,

src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesRepository.kt

@@ -14,6 +14,7 @@ import kr.co.vividnext.sodalive.creator.admin.content.series.QSeries.series
 import kr.co.vividnext.sodalive.creator.admin.content.series.QSeriesContent.seriesContent
 import kr.co.vividnext.sodalive.creator.admin.content.series.Series
 import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesPublishedDaysOfWeek
+import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesState
 import kr.co.vividnext.sodalive.creator.admin.content.series.keyword.QSeriesKeyword.seriesKeyword
 import kr.co.vividnext.sodalive.member.MemberRole
 import kr.co.vividnext.sodalive.member.QMember.member
@@ -23,10 +24,35 @@ import org.springframework.data.jpa.repository.JpaRepository
 interface ContentSeriesRepository : JpaRepository<Series, Long>, ContentSeriesQueryRepository
 
 interface ContentSeriesQueryRepository {
-    fun getSeriesTotalCount(creatorId: Long, isAuth: Boolean, contentType: ContentType): Int
+    fun getSeriesTotalCount(
+        creatorId: Long?,
+        isAuth: Boolean,
+        contentType: ContentType,
+        isOriginal: Boolean,
+        isCompleted: Boolean
+    ): Int
+
     fun getSeriesList(
         imageHost: String,
-        creatorId: Long,
+        creatorId: Long?,
+        isAuth: Boolean,
+        contentType: ContentType,
+        isOriginal: Boolean,
+        isCompleted: Boolean,
+        orderByRandom: Boolean,
+        offset: Long,
+        limit: Long
+    ): List<Series>
+
+    fun getSeriesByGenreTotalCount(
+        genreId: Long,
+        isAuth: Boolean,
+        contentType: ContentType
+    ): Int
+
+    fun getSeriesByGenreList(
+        imageHost: String,
+        genreId: Long,
         isAuth: Boolean,
         contentType: ContentType,
         offset: Long,
@@ -40,6 +66,7 @@ interface ContentSeriesQueryRepository {
     fun getOriginalAudioDramaList(
         isAdult: Boolean,
         contentType: ContentType,
+        orderByRandom: Boolean = false,
         offset: Long = 0,
         limit: Long = 20
     ): List<Series>
@@ -59,9 +86,26 @@ interface ContentSeriesQueryRepository {
 class ContentSeriesQueryRepositoryImpl(
     private val queryFactory: JPAQueryFactory
 ) : ContentSeriesQueryRepository {
-    override fun getSeriesTotalCount(creatorId: Long, isAuth: Boolean, contentType: ContentType): Int {
+    override fun getSeriesTotalCount(
-        var where = series.member.id.eq(creatorId)
+        creatorId: Long?,
-            .and(series.isActive.isTrue)
+        isAuth: Boolean,
+        contentType: ContentType,
+        isOriginal: Boolean,
+        isCompleted: Boolean
+    ): Int {
+        var where = series.isActive.isTrue
+
+        if (creatorId != null) {
+            where = where.and(series.member.id.eq(creatorId))
+        }
+
+        if (isOriginal) {
+            where = where.and(series.isOriginal.isTrue)
+        }
+
+        if (isCompleted) {
+            where = where.and(series.state.eq(SeriesState.COMPLETE))
+        }
 
         if (!isAuth) {
             where = where.and(series.isAdult.isFalse)
@@ -92,14 +136,74 @@ class ContentSeriesQueryRepositoryImpl(
 
     override fun getSeriesList(
         imageHost: String,
-        creatorId: Long,
+        creatorId: Long?,
         isAuth: Boolean,
         contentType: ContentType,
+        isOriginal: Boolean,
+        isCompleted: Boolean,
+        orderByRandom: Boolean,
         offset: Long,
         limit: Long
     ): List<Series> {
-        var where = series.member.id.eq(creatorId)
+        var where = series.isActive.isTrue
-            .and(series.isActive.isTrue)
+
+        if (creatorId != null) {
+            where = where.and(series.member.id.eq(creatorId))
+        }
+        if (isOriginal) {
+            where = where.and(series.isOriginal.isTrue)
+        }
+
+        if (isCompleted) {
+            where = where.and(series.state.eq(SeriesState.COMPLETE))
+        }
+
+        if (!isAuth) {
+            where = where.and(series.isAdult.isFalse)
+        } else {
+            if (contentType != ContentType.ALL) {
+                where = where.and(
+                    series.member.isNull.or(
+                        series.member.auth.gender.eq(
+                            if (contentType == ContentType.MALE) {
+                                0
+                            } else {
+                                1
+                            }
+                        )
+                    )
+                )
+            }
+        }
+
+        val orderBy = if (orderByRandom) {
+            listOf(Expressions.numberTemplate(Double::class.java, "function('rand')").asc())
+        } else if (creatorId != null) {
+            listOf(series.orders.asc(), series.createdAt.asc())
+        } else {
+            listOf(audioContent.releaseDate.max().desc(), series.createdAt.asc())
+        }
+
+        return queryFactory
+            .selectFrom(series)
+            .innerJoin(series.member, member)
+            .innerJoin(seriesContent).on(series.id.eq(seriesContent.series.id))
+            .innerJoin(seriesContent.content, audioContent)
+            .where(where)
+            .groupBy(series.id)
+            .orderBy(*orderBy.toTypedArray())
+            .offset(offset)
+            .limit(limit)
+            .fetch()
+    }
+
+    override fun getSeriesByGenreTotalCount(
+        genreId: Long,
+        isAuth: Boolean,
+        contentType: ContentType
+    ): Int {
+        var where = series.isActive.isTrue
+            .and(series.genre.id.eq(genreId))
 
         if (!isAuth) {
             where = where.and(series.isAdult.isFalse)
@@ -120,10 +224,57 @@ class ContentSeriesQueryRepositoryImpl(
         }
 
         return queryFactory
-            .selectFrom(series)
+            .select(series.id)
+            .from(seriesContent)
+            .innerJoin(seriesContent.series, series)
+            .innerJoin(seriesContent.content, audioContent)
             .innerJoin(series.member, member)
+            .innerJoin(series.genre, seriesGenre)
             .where(where)
-            .orderBy(series.orders.asc(), series.createdAt.asc())
+            .groupBy(series.id)
+            .fetch()
+            .size
+    }
+
+    override fun getSeriesByGenreList(
+        imageHost: String,
+        genreId: Long,
+        isAuth: Boolean,
+        contentType: ContentType,
+        offset: Long,
+        limit: Long
+    ): List<Series> {
+        var where = series.isActive.isTrue
+            .and(series.genre.id.eq(genreId))
+
+        if (!isAuth) {
+            where = where.and(series.isAdult.isFalse)
+        } else {
+            if (contentType != ContentType.ALL) {
+                where = where.and(
+                    series.member.isNull.or(
+                        series.member.auth.gender.eq(
+                            if (contentType == ContentType.MALE) {
+                                0
+                            } else {
+                                1
+                            }
+                        )
+                    )
+                )
+            }
+        }
+
+        return queryFactory
+            .select(series)
+            .from(seriesContent)
+            .innerJoin(seriesContent.series, series)
+            .innerJoin(seriesContent.content, audioContent)
+            .innerJoin(series.member, member)
+            .innerJoin(series.genre, seriesGenre)
+            .where(where)
+            .groupBy(series.id)
+            .orderBy(audioContent.releaseDate.max().desc(), series.createdAt.asc())
             .offset(offset)
             .limit(limit)
             .fetch()
@@ -216,6 +367,7 @@ class ContentSeriesQueryRepositoryImpl(
     override fun getOriginalAudioDramaList(
         isAdult: Boolean,
         contentType: ContentType,
+        orderByRandom: Boolean,
         offset: Long,
         limit: Long
     ): List<Series> {
@@ -244,7 +396,13 @@ class ContentSeriesQueryRepositoryImpl(
             .selectFrom(series)
             .innerJoin(series.member, member)
             .where(where)
-            .orderBy(series.id.desc())
+            .orderBy(
+                if (orderByRandom) {
+                    Expressions.numberTemplate(Double::class.java, "function('rand')").asc()
+                } else {
+                    series.id.desc()
+                }
+            )
             .offset(offset)
             .limit(limit)
             .fetch()

src/main/kotlin/kr/co/vividnext/sodalive/content/series/ContentSeriesService.kt

@@ -37,10 +37,11 @@ class ContentSeriesService(
     fun getOriginalAudioDramaList(
         isAdult: Boolean,
         contentType: ContentType,
+        orderByRandom: Boolean = false,
         offset: Long = 0,
         limit: Long = 20
     ): List<GetSeriesListResponse.SeriesListItem> {
-        val originalAudioDramaList = repository.getOriginalAudioDramaList(isAdult, contentType, offset, limit)
+        val originalAudioDramaList = repository.getOriginalAudioDramaList(isAdult, contentType, orderByRandom, offset, limit)
         return seriesToSeriesListItem(originalAudioDramaList, isAdult, contentType)
     }
 
@@ -49,25 +50,63 @@ class ContentSeriesService(
     }
 
     fun getSeriesList(
-        creatorId: Long,
+        creatorId: Long?,
+        isOriginal: Boolean = false,
+        isCompleted: Boolean = false,
+        orderByRandom: Boolean = false,
         isAdultContentVisible: Boolean,
         contentType: ContentType,
         member: Member,
         offset: Long = 0,
-        limit: Long = 10
+        limit: Long = 20
     ): GetSeriesListResponse {
         val isAuth = member.auth != null && isAdultContentVisible
 
         val totalCount = repository.getSeriesTotalCount(
             creatorId = creatorId,
             isAuth = isAuth,
-            contentType = contentType
+            contentType = contentType,
+            isOriginal = isOriginal,
+            isCompleted = isCompleted
         )
+
         val rawItems = repository.getSeriesList(
             imageHost = coverImageHost,
             creatorId = creatorId,
             isAuth = isAuth,
             contentType = contentType,
+            isOriginal = isOriginal,
+            isCompleted = isCompleted,
+            orderByRandom = orderByRandom,
+            offset = offset,
+            limit = limit
+        ).filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.member!!.id!!) }
+
+        val items = seriesToSeriesListItem(seriesList = rawItems, isAdult = isAuth, contentType = contentType)
+        return GetSeriesListResponse(totalCount, items)
+    }
+
+    fun getSeriesListByGenre(
+        genreId: Long,
+        isAdultContentVisible: Boolean,
+        contentType: ContentType,
+        member: Member,
+        offset: Long = 0,
+        limit: Long = 20
+    ): GetSeriesListResponse {
+        val isAuth = member.auth != null && isAdultContentVisible
+
+        val totalCount = repository.getSeriesByGenreTotalCount(
+            genreId = genreId,
+            isAuth = isAuth,
+            contentType = contentType
+        )
+
+        val rawItems = repository.getSeriesByGenreList(
+            imageHost = coverImageHost,
+            genreId = genreId,
+            isAuth = isAuth,
+            contentType = contentType,
             offset = offset,
             limit = limit
         ).filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.member!!.id!!) }
@@ -201,7 +240,7 @@ class ContentSeriesService(
         val seriesList = repository.getRecommendSeriesList(
             isAuth = isAuth,
             contentType = contentType,
-            limit = 10
+            limit = 20
         ).filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.member!!.id!!) }
 
         return seriesToSeriesListItem(seriesList = seriesList, isAdult = isAuth, contentType = contentType)

src/main/kotlin/kr/co/vividnext/sodalive/content/series/main/SeriesHomeResponse.kt

@@ -0,0 +1,10 @@
+package kr.co.vividnext.sodalive.content.series.main
+
+import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerResponse
+import kr.co.vividnext.sodalive.content.series.GetSeriesListResponse
+
+data class SeriesHomeResponse(
+    val banners: List<SeriesBannerResponse>,
+    val completedSeriesList: List<GetSeriesListResponse.SeriesListItem>,
+    val recommendSeriesList: List<GetSeriesListResponse.SeriesListItem>
+)

src/main/kotlin/kr/co/vividnext/sodalive/content/series/main/SeriesMainController.kt

@@ -0,0 +1,151 @@
+package kr.co.vividnext.sodalive.content.series.main
+
+import kr.co.vividnext.sodalive.admin.content.series.banner.dto.SeriesBannerResponse
+import kr.co.vividnext.sodalive.common.ApiResponse
+import kr.co.vividnext.sodalive.common.SodaException
+import kr.co.vividnext.sodalive.content.ContentType
+import kr.co.vividnext.sodalive.content.series.ContentSeriesService
+import kr.co.vividnext.sodalive.content.series.main.banner.ContentSeriesBannerService
+import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesPublishedDaysOfWeek
+import kr.co.vividnext.sodalive.member.Member
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.data.domain.PageRequest
+import org.springframework.security.core.annotation.AuthenticationPrincipal
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+@RequestMapping("/audio-content/series/main")
+class SeriesMainController(
+    private val contentSeriesService: ContentSeriesService,
+    private val bannerService: ContentSeriesBannerService,
+
+    @Value("\${cloud.aws.cloud-front.host}")
+    private val imageHost: String
+) {
+    @GetMapping
+    fun fetchData(
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+
+        val banners = bannerService.getActiveBanners(PageRequest.of(0, 10))
+            .content
+            .map {
+                SeriesBannerResponse.from(it, imageHost)
+            }
+
+        val completedSeriesList = contentSeriesService.getSeriesList(
+            creatorId = null,
+            isCompleted = true,
+            orderByRandom = true,
+            isAdultContentVisible = isAdultContentVisible ?: true,
+            contentType = contentType ?: ContentType.ALL,
+            member = member
+        ).items
+
+        val recommendSeriesList = contentSeriesService.getRecommendSeriesList(
+            isAdultContentVisible = isAdultContentVisible ?: true,
+            contentType = contentType ?: ContentType.ALL,
+            member = member
+        )
+
+        ApiResponse.ok(
+            SeriesHomeResponse(
+                banners = banners,
+                completedSeriesList = completedSeriesList,
+                recommendSeriesList = recommendSeriesList
+
+            )
+        )
+    }
+
+    @GetMapping("/recommend")
+    fun getRecommendSeriesList(
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+
+        ApiResponse.ok(
+            contentSeriesService.getRecommendSeriesList(
+                isAdultContentVisible = isAdultContentVisible ?: true,
+                contentType = contentType ?: ContentType.ALL,
+                member = member
+            )
+        )
+    }
+
+    @GetMapping("/day-of-week")
+    fun getDayOfWeekSeriesList(
+        @RequestParam("dayOfWeek") dayOfWeek: SeriesPublishedDaysOfWeek,
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
+        @RequestParam(defaultValue = "0") page: Int,
+        @RequestParam(defaultValue = "20") size: Int,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+        val pageable = PageRequest.of(page, size)
+
+        ApiResponse.ok(
+            contentSeriesService.getDayOfWeekSeriesList(
+                memberId = member.id,
+                isAdult = member.auth != null && (isAdultContentVisible ?: true),
+                contentType = contentType ?: ContentType.ALL,
+                dayOfWeek = dayOfWeek,
+                offset = pageable.offset,
+                limit = pageable.pageSize.toLong()
+            )
+        )
+    }
+
+    @GetMapping("/genre-list")
+    fun getGenreList(
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+
+        val memberId = member.id!!
+        val isAdult = member.auth != null && (isAdultContentVisible ?: true)
+
+        ApiResponse.ok(
+            contentSeriesService.getGenreList(
+                memberId = memberId,
+                isAdult = isAdult,
+                contentType = contentType ?: ContentType.ALL
+            )
+        )
+    }
+
+    @GetMapping("/list-by-genre")
+    fun getSeriesListByGenre(
+        @RequestParam("genreId") genreId: Long,
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
+        @RequestParam(defaultValue = "0") page: Int,
+        @RequestParam(defaultValue = "20") size: Int,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+        val pageable = PageRequest.of(page, size)
+
+        ApiResponse.ok(
+            contentSeriesService.getSeriesListByGenre(
+                genreId = genreId,
+                isAdultContentVisible = isAdultContentVisible ?: true,
+                contentType = contentType ?: ContentType.ALL,
+                member = member,
+                offset = pageable.offset,
+                limit = pageable.pageSize.toLong()
+            )
+        )
+    }
+}

src/main/kotlin/kr/co/vividnext/sodalive/content/series/main/banner/ContentSeriesBannerService.kt

@@ -0,0 +1,80 @@
+package kr.co.vividnext.sodalive.content.series.main.banner
+
+import kr.co.vividnext.sodalive.admin.content.series.AdminContentSeriesRepository
+import kr.co.vividnext.sodalive.common.SodaException
+import org.springframework.data.domain.Page
+import org.springframework.data.domain.Pageable
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+
+@Service
+class ContentSeriesBannerService(
+    private val bannerRepository: SeriesBannerRepository,
+    private val seriesRepository: AdminContentSeriesRepository
+) {
+    fun getActiveBanners(pageable: Pageable): Page<SeriesBanner> {
+        return bannerRepository.findByIsActiveTrueOrderBySortOrderAsc(pageable)
+    }
+
+    fun getBannerById(bannerId: Long): SeriesBanner {
+        return bannerRepository.findById(bannerId)
+            .orElseThrow { SodaException("배너를 찾을 수 없습니다: $bannerId") }
+    }
+
+    @Transactional
+    fun registerBanner(seriesId: Long, imagePath: String): SeriesBanner {
+        val series = seriesRepository.findByIdAndActiveTrue(seriesId)
+            ?: throw SodaException("시리즈를 찾을 수 없습니다: $seriesId")
+
+        val finalSortOrder = (bannerRepository.findMaxSortOrder() ?: 0) + 1
+
+        val banner = SeriesBanner(
+            imagePath = imagePath,
+            series = series,
+            sortOrder = finalSortOrder
+        )
+        return bannerRepository.save(banner)
+    }
+
+    @Transactional
+    fun updateBanner(
+        bannerId: Long,
+        imagePath: String? = null,
+        seriesId: Long? = null
+    ): SeriesBanner {
+        val banner = bannerRepository.findById(bannerId)
+            .orElseThrow { SodaException("배너를 찾을 수 없습니다: $bannerId") }
+        if (!banner.isActive) throw SodaException("비활성화된 배너는 수정할 수 없습니다: $bannerId")
+
+        if (imagePath != null) banner.imagePath = imagePath
+
+        if (seriesId != null) {
+            val series = seriesRepository.findByIdAndActiveTrue(seriesId)
+                ?: throw SodaException("시리즈를 찾을 수 없습니다: $seriesId")
+            banner.series = series
+        }
+
+        return bannerRepository.save(banner)
+    }
+
+    @Transactional
+    fun deleteBanner(bannerId: Long) {
+        val banner = bannerRepository.findById(bannerId)
+            .orElseThrow { SodaException("배너를 찾을 수 없습니다: $bannerId") }
+        banner.isActive = false
+        bannerRepository.save(banner)
+    }
+
+    @Transactional
+    fun updateBannerOrders(ids: List<Long>): List<SeriesBanner> {
+        val updated = mutableListOf<SeriesBanner>()
+        for (index in ids.indices) {
+            val banner = bannerRepository.findById(ids[index])
+                .orElseThrow { SodaException("배너를 찾을 수 없습니다: ${ids[index]}") }
+            if (!banner.isActive) throw SodaException("비활성화된 배너는 수정할 수 없습니다: ${ids[index]}")
+            banner.sortOrder = index + 1
+            updated.add(bannerRepository.save(banner))
+        }
+        return updated
+    }
+}

src/main/kotlin/kr/co/vividnext/sodalive/content/series/main/banner/SeriesBanner.kt

@@ -0,0 +1,30 @@
+package kr.co.vividnext.sodalive.content.series.main.banner
+
+import kr.co.vividnext.sodalive.common.BaseEntity
+import kr.co.vividnext.sodalive.creator.admin.content.series.Series
+import javax.persistence.Entity
+import javax.persistence.FetchType
+import javax.persistence.JoinColumn
+import javax.persistence.ManyToOne
+
+/**
+ * 시리즈 배너 엔티티
+ * 이미지와 시리즈 ID를 가지며, 소프트 삭제(isActive = false)를 지원합니다.
+ * 정렬 순서(sortOrder)를 통해 배너의 표시 순서를 결정합니다.
+ */
+@Entity
+class SeriesBanner(
+    // 배너 이미지 경로
+    var imagePath: String? = null,
+
+    // 연관된 캐릭터
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "series_id")
+    var series: Series,
+
+    // 정렬 순서 (낮을수록 먼저 표시)
+    var sortOrder: Int = 0,
+
+    // 활성화 여부 (소프트 삭제용)
+    var isActive: Boolean = true
+) : BaseEntity()

src/main/kotlin/kr/co/vividnext/sodalive/content/series/main/banner/SeriesBannerRepository.kt

@@ -0,0 +1,15 @@
+package kr.co.vividnext.sodalive.content.series.main.banner
+
+import org.springframework.data.domain.Page
+import org.springframework.data.domain.Pageable
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
+import org.springframework.stereotype.Repository
+
+@Repository
+interface SeriesBannerRepository : JpaRepository<SeriesBanner, Long> {
+    fun findByIsActiveTrueOrderBySortOrderAsc(pageable: Pageable): Page<SeriesBanner>
+
+    @Query("SELECT MAX(b.sortOrder) FROM SeriesBanner b WHERE b.isActive = true")
+    fun findMaxSortOrder(): Int?
+}

src/main/kotlin/kr/co/vividnext/sodalive/content/theme/AudioContentThemeController.kt

@@ -27,6 +27,26 @@ class AudioContentThemeController(private val service: AudioContentThemeService)
         ApiResponse.ok(service.getThemes())
     }
 
+    @GetMapping("/active")
+    fun getActiveThemes(
+        @RequestParam("isFree", required = false) isFree: Boolean? = null,
+        @RequestParam("isPointAvailableOnly", required = false) isPointAvailableOnly: Boolean? = null,
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
+        @RequestParam("contentType", required = false) contentType: ContentType? = null,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+
+        ApiResponse.ok(
+            service.getActiveThemeOfContent(
+                isAdult = member.auth != null && (isAdultContentVisible ?: true),
+                isFree = isFree ?: false,
+                isPointAvailableOnly = isPointAvailableOnly ?: false,
+                contentType = contentType ?: ContentType.ALL
+            )
+        )
+    }
+
     @GetMapping("/{id}/content")
     fun getContentByTheme(
         @PathVariable id: Long,

src/main/kotlin/kr/co/vividnext/sodalive/content/theme/AudioContentThemeQueryRepository.kt

@@ -1,5 +1,6 @@
 package kr.co.vividnext.sodalive.content.theme
 
+import com.querydsl.core.types.dsl.CaseBuilder
 import com.querydsl.jpa.impl.JPAQueryFactory
 import kr.co.vividnext.sodalive.content.ContentType
 import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
@@ -32,6 +33,7 @@ class AudioContentThemeQueryRepository(
     fun getActiveThemeOfContent(
         isAdult: Boolean = false,
         isFree: Boolean = false,
+        isPointAvailableOnly: Boolean = false,
         contentType: ContentType
     ): List<String> {
         var where = audioContent.isActive.isTrue
@@ -59,15 +61,31 @@ class AudioContentThemeQueryRepository(
             where = where.and(audioContent.price.loe(0))
         }
 
-        return queryFactory
+        if (isPointAvailableOnly) {
+            where = where.and(audioContent.isPointAvailable.isTrue)
+        }
+
+        val query = queryFactory
             .select(audioContentTheme.theme)
             .from(audioContent)
             .innerJoin(audioContent.member, member)
             .innerJoin(audioContent.theme, audioContentTheme)
             .where(where)
             .groupBy(audioContentTheme.id)
-            .orderBy(audioContentTheme.orders.asc())
+
-            .fetch()
+        if (isFree) {
+            query.orderBy(
+                CaseBuilder()
+                    .`when`(audioContentTheme.theme.eq("자기소개")).then(0)
+                    .otherwise(1)
+                    .asc(),
+                audioContentTheme.orders.asc()
+            )
+        } else {
+            query.orderBy(audioContentTheme.orders.asc())
+        }
+
+        return query.fetch()
     }
 
     fun findThemeByIdAndActive(id: Long): AudioContentTheme? {

src/main/kotlin/kr/co/vividnext/sodalive/content/theme/AudioContentThemeService.kt

@@ -23,11 +23,13 @@ class AudioContentThemeService(
     fun getActiveThemeOfContent(
         isAdult: Boolean = false,
         isFree: Boolean = false,
+        isPointAvailableOnly: Boolean = false,
         contentType: ContentType
     ): List<String> {
         return queryRepository.getActiveThemeOfContent(
             isAdult = isAdult,
             isFree = isFree,
+            isPointAvailableOnly = isPointAvailableOnly,
             contentType = contentType
         )
     }

src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt

@@ -10,6 +10,7 @@ import kr.co.vividnext.sodalive.can.use.QUseCanCalculate.useCanCalculate
 import kr.co.vividnext.sodalive.can.use.UseCanCalculateStatus
 import kr.co.vividnext.sodalive.common.SodaException
 import kr.co.vividnext.sodalive.content.QAudioContent.audioContent
+import kr.co.vividnext.sodalive.content.order.QOrder.order
 import kr.co.vividnext.sodalive.explorer.QCreatorRanking.creatorRanking
 import kr.co.vividnext.sodalive.explorer.follower.GetFollowerListDto
 import kr.co.vividnext.sodalive.explorer.follower.QGetFollowerListDto
@@ -39,6 +40,7 @@ import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
+import java.util.Locale
 
 @Repository
 class ExplorerQueryRepository(
@@ -353,7 +355,6 @@ class ExplorerQueryRepository(
         creatorId: Long,
         userMember: Member,
         timezone: String,
-        limit: Int,
         offset: Long = 0
     ): List<LiveRoomResponse> {
         var where = liveRoom.member.id.eq(creatorId)
@@ -392,6 +393,14 @@ class ExplorerQueryRepository(
                 val beginDateTime = it.beginDateTime
                     .atZone(ZoneId.of("UTC"))
                     .withZoneSameInstant(ZoneId.of(timezone))
+                    .format(
+                        DateTimeFormatter
+                            .ofPattern("yyyy년 MM월 dd일 (E) a hh시 mm분")
+                            .withLocale(Locale.KOREAN)
+                    )
+
+                val beginDateTimeUtc = it.beginDateTime
+                    .format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
 
                 val isPaid = if (it.channelName != null) {
                     val useCan = queryFactory
@@ -415,9 +424,8 @@ class ExplorerQueryRepository(
                     title = it.title,
                     content = it.notice,
                     isPaid = isPaid,
-                    beginDateTime = beginDateTime.format(
+                    beginDateTime = beginDateTime,
-                        DateTimeFormatter.ofPattern("yyyy.MM.dd E hh:mm a")
+                    beginDateTimeUtc = beginDateTimeUtc,
-                    ),
                     isAdult = it.isAdult,
                     price = it.price,
                     channelName = it.channelName,
@@ -653,6 +661,28 @@ class ExplorerQueryRepository(
             .fetchFirst()
     }
 
+    fun getOwnedContentCount(creatorId: Long, memberId: Long): Long {
+        // 활성 주문 + 대여의 경우 유효기간 내 주문만 포함, 동일 콘텐츠 중복 구매는 1개로 카운트
+        return queryFactory
+            .select(audioContent.id)
+            .from(order)
+            .innerJoin(order.audioContent, audioContent)
+            .where(
+                order.isActive.isTrue,
+                order.member.id.eq(memberId),
+                audioContent.member.id.eq(creatorId),
+                order.type.eq(kr.co.vividnext.sodalive.content.order.OrderType.KEEP)
+                    .or(
+                        order.type.eq(kr.co.vividnext.sodalive.content.order.OrderType.RENTAL)
+                            .and(order.endDate.after(LocalDateTime.now()))
+                    )
+            )
+            .distinct()
+            .fetch()
+            .size
+            .toLong()
+    }
+
     fun getVisibleDonationRank(creatorId: Long): Boolean {
         return queryFactory
             .select(member.isVisibleDonationRank)

src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerService.kt

@@ -76,7 +76,7 @@ class ExplorerService(
         )
     }
 
-    fun getExplorer(member: Member, growthRankingCreatorsLimit: Long = 20): GetExplorerResponse {
+    fun getExplorer(member: Member): GetExplorerResponse {
         val sections = mutableListOf<GetExplorerSectionResponse>()
 
         // 인기 크리에이터
@@ -209,8 +209,7 @@ class ExplorerService(
             queryRepository.getLiveRoomList(
                 creatorId,
                 userMember = member,
-                timezone = timezone,
+                timezone = timezone
-                limit = 3
             )
         } else {
             listOf()
@@ -231,6 +230,27 @@ class ExplorerService(
             listOf()
         }
 
+        // 크리에이터의 최신 오디오 콘텐츠 1개
+        val latestContent = if (isCreator) {
+            audioContentService.getLatestCreatorAudioContent(creatorId, member, isAdultContentVisible)
+        } else {
+            null
+        }
+
+        // 크리에이터의 전체 콘텐츠 개수
+        val totalContentCount = if (isCreator) {
+            queryRepository.getContentCount(creatorId) ?: 0
+        } else {
+            0
+        }
+
+        // 조회하는 유저가 소장 중인 크리에이터의 콘텐츠 개수
+        val ownedContentCount = if (isCreator) {
+            queryRepository.getOwnedContentCount(creatorId, member.id!!)
+        } else {
+            0
+        }
+
         // 공지사항
         val notice = if (isCreator) {
             queryRepository.getNoticeString(creatorId)
@@ -311,6 +331,9 @@ class ExplorerService(
             similarCreatorList = similarCreatorList,
             liveRoomList = liveRoomList,
             contentList = contentList,
+            latestContent = latestContent,
+            totalContentCount = totalContentCount,
+            ownedContentCount = ownedContentCount,
             notice = notice,
             communityPostList = communityPostList,
             cheers = cheers,

src/main/kotlin/kr/co/vividnext/sodalive/explorer/GetCreatorProfileResponse.kt

@@ -10,6 +10,9 @@ data class GetCreatorProfileResponse(
     val similarCreatorList: List<SimilarCreatorResponse>,
     val liveRoomList: List<LiveRoomResponse>,
     val contentList: List<GetAudioContentListItem>,
+    val latestContent: GetAudioContentListItem?,
+    val totalContentCount: Long,
+    val ownedContentCount: Long,
     val notice: String,
     val communityPostList: List<GetCommunityPostListResponse>,
     val cheers: GetCheersResponse,

src/main/kotlin/kr/co/vividnext/sodalive/explorer/LiveRoomResponse.kt

@@ -1,16 +1,12 @@
 package kr.co.vividnext.sodalive.explorer
 
-data class GetLiveRoomAllResponse(
-    val totalCount: Int,
-    val liveRoomList: List<LiveRoomResponse>
-)
-
 data class LiveRoomResponse(
     val roomId: Long,
     val title: String,
     val content: String,
     val isPaid: Boolean,
     val beginDateTime: String,
+    val beginDateTimeUtc: String,
     val coverImageUrl: String,
     val isAdult: Boolean,
     val price: Int,

src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt

@@ -1083,7 +1083,7 @@ class LiveRoomService(
         val host = room.member ?: throw SodaException("잘못된 요청입니다.")
 
         if (host.role != MemberRole.CREATOR) {
-            throw SodaException("비비드넥스트와 계약한\n크리에이터에게만 후원을 하실 수 있습니다.")
+            throw SodaException("주식회사 소다라이브와 계약한\n크리에이터에게만 후원을 하실 수 있습니다.")
         }
 
         canPaymentService.spendCan(
@@ -1129,7 +1129,7 @@ class LiveRoomService(
         val host = room.member ?: throw SodaException("잘못된 요청입니다.")
 
         if (host.role != MemberRole.CREATOR) {
-            throw SodaException("비비드넥스트와 계약한\n크리에이터에게만 후원을 하실 수 있습니다.")
+            throw SodaException("주식회사 소다라이브와 계약한\n크리에이터에게만 후원을 하실 수 있습니다.")
         }
 
         canPaymentService.spendCan(
@@ -1272,12 +1272,12 @@ class LiveRoomService(
         val host = room.member ?: throw SodaException("잘못된 요청입니다.")
 
         if (host.role != MemberRole.CREATOR) {
-            throw SodaException("비비드넥스트와 계약한\n크리에이터에게만 후원을 하실 수 있습니다.")
+            throw SodaException("주식회사 소다라이브와 계약한\n크리에이터에게만 후원을 하실 수 있습니다.")
         }
 
         canPaymentService.spendCan(
             memberId = member.id!!,
-            needCan = 1,
+            needCan = request.heartCount ?: 1,
             canUsage = CanUsage.HEART,
             isSecret = false,
             liveRoom = room,

src/main/kotlin/kr/co/vividnext/sodalive/live/room/like/LiveRoomLikeHeartRequest.kt

@@ -2,5 +2,6 @@ package kr.co.vividnext.sodalive.live.room.like
 
 data class LiveRoomLikeHeartRequest(
     val roomId: Long,
-    val container: String
+    val container: String,
+    val heartCount: Int? = null
 )

src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteService.kt

@@ -135,7 +135,7 @@ class NewRouletteService(
         val host = room.member ?: throw SodaException("잘못된 요청입니다.")
 
         if (host.role != MemberRole.CREATOR) {
-            throw SodaException("비비드넥스트와 계약한\n크리에이터의 룰렛만 사용하실 수 있습니다.")
+            throw SodaException("주식회사 소다라이브와 계약한\n크리에이터의 룰렛만 사용하실 수 있습니다.")
         }
 
         // STEP 2 - 룰렛 데이터 가져오기

src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt

@@ -134,7 +134,7 @@ class RouletteService(
         val host = room.member ?: throw SodaException("잘못된 요청입니다.")
 
         if (host.role != MemberRole.CREATOR) {
-            throw SodaException("비비드넥스트와 계약한\n크리에이터의 룰렛만 사용하실 수 있습니다.")
+            throw SodaException("주식회사 소다라이브와 계약한\n크리에이터의 룰렛만 사용하실 수 있습니다.")
         }
 
         // STEP 2 - 룰렛 데이터 가져오기

src/main/kotlin/kr/co/vividnext/sodalive/marketing/AdTrackingHistory.kt

@@ -1,6 +1,8 @@
 package kr.co.vividnext.sodalive.marketing
 
+import java.math.BigDecimal
 import java.time.LocalDateTime
+import javax.persistence.Column
 import javax.persistence.Entity
 import javax.persistence.EnumType
 import javax.persistence.Enumerated
@@ -19,7 +21,8 @@ data class AdTrackingHistory(
     val pidName: String,
     @Enumerated(value = EnumType.STRING)
     val type: AdTrackingHistoryType,
-    val price: Double = 0.toDouble(),
+    @Column(precision = 10, scale = 4, nullable = false)
+    val price: BigDecimal = 0.toBigDecimal(),
     val locale: String? = null,
     val memberId: Long,
     val createdAt: LocalDateTime = LocalDateTime.now(),

src/main/kotlin/kr/co/vividnext/sodalive/marketing/AdTrackingService.kt

@@ -4,6 +4,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.springframework.stereotype.Service
+import java.math.BigDecimal
 
 @Service
 class AdTrackingService(
@@ -17,7 +18,7 @@ class AdTrackingService(
         pid: String,
         type: AdTrackingHistoryType,
         memberId: Long,
-        price: Double? = null,
+        price: BigDecimal? = null,
         locale: String? = null
     ) {
         coroutineScope.launch {
@@ -30,7 +31,7 @@ class AdTrackingService(
                         pid = pid,
                         pidName = mediaPartner.pidName,
                         type = type,
-                        price = price ?: 0.toDouble(),
+                        price = price ?: 0.toBigDecimal(),
                         locale = locale,
                         memberId = memberId
                     )

src/main/kotlin/kr/co/vividnext/sodalive/rank/ContentRankingSortType.kt

@@ -0,0 +1,21 @@
+package kr.co.vividnext.sodalive.rank
+
+/**
+ * 콘텐츠 랭킹 정렬 기준
+ */
+enum class ContentRankingSortType {
+    // 매출: order.can.sum.desc
+    REVENUE,
+
+    // 판매량: order.id.count.desc
+    SALES_COUNT,
+
+    // 댓글 수: audioContentComment.id.count.desc
+    COMMENT_COUNT,
+
+    // 좋아요 수: audioContentLike.id.count.desc
+    LIKE_COUNT,
+
+    // 후원: audioContentComment.donationCan.sum.desc
+    DONATION
+}

src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingRepository.kt

@@ -132,6 +132,14 @@ class RankingRepository(
                     .innerJoin(audioContent.theme, audioContentTheme)
             }
 
+            "판매량" -> {
+                select
+                    .from(order)
+                    .innerJoin(order.audioContent, audioContent)
+                    .innerJoin(audioContent.member, member)
+                    .innerJoin(audioContent.theme, audioContentTheme)
+            }
+
             else -> {
                 select
                     .from(order)
@@ -184,6 +192,18 @@ class RankingRepository(
                     .orderBy(audioContentLike.id.count().desc(), audioContent.createdAt.asc())
             }
 
+            "판매량" -> {
+                select
+                    .where(
+                        where
+                            .and(order.isActive.isTrue)
+                            .and(order.createdAt.goe(startDate))
+                            .and(order.createdAt.lt(endDate))
+                    )
+                    .groupBy(audioContent.id)
+                    .orderBy(order.id.count().desc(), audioContent.createdAt.asc())
+            }
+
             else -> {
                 select
                     .where(

src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingService.kt

@@ -76,6 +76,38 @@ class RankingService(
         return contentList
     }
 
+    private fun toSortString(sort: ContentRankingSortType): String = when (sort) {
+        ContentRankingSortType.REVENUE -> "매출"
+        ContentRankingSortType.SALES_COUNT -> "판매량"
+        ContentRankingSortType.COMMENT_COUNT -> "댓글"
+        ContentRankingSortType.LIKE_COUNT -> "좋아요"
+        ContentRankingSortType.DONATION -> "후원"
+    }
+
+    fun getContentRanking(
+        memberId: Long?,
+        isAdult: Boolean,
+        contentType: ContentType,
+        startDate: LocalDateTime,
+        endDate: LocalDateTime,
+        offset: Long = 0,
+        limit: Long = 12,
+        sort: ContentRankingSortType,
+        theme: String = ""
+    ): List<GetAudioContentRankingItem> {
+        return getContentRanking(
+            memberId = memberId,
+            isAdult = isAdult,
+            contentType = contentType,
+            startDate = startDate,
+            endDate = endDate,
+            offset = offset,
+            limit = limit,
+            sortType = toSortString(sort),
+            theme = theme
+        )
+    }
+
     fun getSeriesRanking(
         memberId: Long?,
         isAdult: Boolean,

src/main/resources/application.yml

@@ -1,6 +1,7 @@
 server:
     shutdown: graceful
     env: ${SERVER_ENV}
+    forward-headers-strategy: framework
 
 logging:
     level:
@@ -14,11 +15,14 @@ weraser:
     apiKey: ${WERASER_API_KEY}
 
 payverse:
+    host: ${PAYVERSE_HOST}
+    inboundIp: ${PAYVERSE_INBOUND_IP}
     mid: ${PAYVERSE_MID}
     clientKey: ${PAYVERSE_CLIENT_KEY}
     secretKey: ${PAYVERSE_SECRET_KEY}
-    host: ${PAYVERSE_HOST}
+    usdMid: ${PAYVERSE_USD_MID}
-    inboundIp: ${PAYVERSE_INBOUND_IP}
+    usdClientKey: ${PAYVERSE_USD_CLIENT_KEY}
+    usdSecretKey: ${PAYVERSE_USD_SECRET_KEY}
 
 bootpay:
     applicationId: ${BOOTPAY_APPLICATION_ID}

src/test/kotlin/kr/co/vividnext/sodalive/admin/content/series/AdminContentSeriesServiceTest.kt

@@ -0,0 +1,120 @@
+package kr.co.vividnext.sodalive.admin.content.series
+
+import kr.co.vividnext.sodalive.admin.content.series.genre.AdminContentSeriesGenreRepository
+import kr.co.vividnext.sodalive.admin.content.series.genre.SeriesGenre
+import kr.co.vividnext.sodalive.common.SodaException
+import kr.co.vividnext.sodalive.creator.admin.content.series.Series
+import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesPublishedDaysOfWeek
+import kr.co.vividnext.sodalive.creator.admin.content.series.SeriesState
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertThrows
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.mockito.Mockito
+
+class AdminContentSeriesServiceTest {
+    private lateinit var seriesRepository: AdminContentSeriesRepository
+    private lateinit var genreRepository: AdminContentSeriesGenreRepository
+    private lateinit var service: AdminContentSeriesService
+
+    @BeforeEach
+    fun setup() {
+        seriesRepository = Mockito.mock(AdminContentSeriesRepository::class.java)
+        genreRepository = Mockito.mock(AdminContentSeriesGenreRepository::class.java)
+        service = AdminContentSeriesService(seriesRepository, genreRepository)
+    }
+
+    @Test
+    fun shouldModifySeriesFieldsByAdmin() {
+        // given
+        val series = Series(
+            title = "title",
+            introduction = "intro",
+            state = SeriesState.PROCEEDING
+        )
+        series.id = 1L
+        series.genre = SeriesGenre(genre = "Old", isAdult = false)
+        series.publishedDaysOfWeek.add(SeriesPublishedDaysOfWeek.MON)
+        series.isAdult = false
+        series.isOriginal = false
+
+        Mockito.`when`(seriesRepository.findByIdAndActiveTrue(1L)).thenReturn(series)
+
+        val newGenre = SeriesGenre(genre = "New", isAdult = false)
+        newGenre.id = 10L
+        Mockito.`when`(genreRepository.findActiveSeriesGenreById(10L)).thenReturn(newGenre)
+
+        val request = AdminModifySeriesRequest(
+            seriesId = 1L,
+            publishedDaysOfWeek = setOf(SeriesPublishedDaysOfWeek.WED),
+            genreId = 10L,
+            isOriginal = true,
+            isAdult = true
+        )
+
+        // when
+        service.modifySeries(request)
+
+        // then
+        assertEquals(setOf(SeriesPublishedDaysOfWeek.WED), series.publishedDaysOfWeek)
+        assertEquals(newGenre, series.genre)
+        assertEquals(true, series.isOriginal)
+        assertEquals(true, series.isAdult)
+    }
+
+    @Test
+    fun shouldThrowWhenRandomAndOtherDaysSelectedTogether() {
+        // given
+        val series = Series(
+            title = "title",
+            introduction = "intro",
+            state = SeriesState.PROCEEDING
+        )
+        series.id = 2L
+        series.genre = SeriesGenre(genre = "Old", isAdult = false)
+
+        Mockito.`when`(seriesRepository.findByIdAndActiveTrue(2L)).thenReturn(series)
+
+        val request = AdminModifySeriesRequest(
+            seriesId = 2L,
+            publishedDaysOfWeek = setOf(SeriesPublishedDaysOfWeek.RANDOM, SeriesPublishedDaysOfWeek.MON),
+            genreId = null,
+            isOriginal = null,
+            isAdult = null
+        )
+
+        // expect
+        assertThrows(SodaException::class.java) {
+            service.modifySeries(request)
+        }
+    }
+
+    @Test
+    fun shouldThrowWhenGenreNotFound() {
+        // given
+        val series = Series(
+            title = "title",
+            introduction = "intro",
+            state = SeriesState.PROCEEDING
+        )
+        series.id = 3L
+        series.genre = SeriesGenre(genre = "Old", isAdult = false)
+        Mockito.`when`(seriesRepository.findByIdAndActiveTrue(3L)).thenReturn(series)
+
+        // genre not found
+        Mockito.`when`(genreRepository.findActiveSeriesGenreById(999L)).thenReturn(null)
+
+        val request = AdminModifySeriesRequest(
+            seriesId = 3L,
+            publishedDaysOfWeek = null,
+            genreId = 999L,
+            isOriginal = null,
+            isAdult = null
+        )
+
+        // expect
+        assertThrows(SodaException::class.java) {
+            service.modifySeries(request)
+        }
+    }
+}