feat: 일반 유저용 캔 리스트 조회 API 추가, GeoCountryFilter(GeoCountry.OTHER, GeoCountry.KR 구분용) 추가

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,37 @@
 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,
+                    can1.currency
+                )
+            )
+            .from(can1)
+            .where(can1.status.eq(status))
+            .orderBy(can1.currency.asc(), can1.price.asc())
+            .fetch()
+    }
+}

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())

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,16 @@ 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
+        println("geoCountry: $geoCountry")
+        return ApiResponse.ok(service.getCans(geoCountry))
     }
 
     @GetMapping("/status")

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

@@ -24,6 +24,7 @@ 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?
@@ -50,6 +51,27 @@ class CanQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : CanQue
             .fetch()
     }
 
+    override fun findAllByStatusAndCurrency(status: CanStatus, currency: String): List<CanResponse> {
+        return queryFactory
+            .select(
+                QCanResponse(
+                    can1.id,
+                    can1.title,
+                    can1.can,
+                    can1.rewardCan,
+                    can1.price,
+                    can1.currency
+                )
+            )
+            .from(can1)
+            .where(
+                can1.status.eq(status),
+                can1.currency.eq(currency)
+            )
+            .orderBy(can1.can.asc())
+            .fetch()
+    }
+
     override fun getCanUseStatus(member: Member, pageable: Pageable): List<UseCan> {
         return queryFactory
             .selectFrom(useCan)

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 {

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)
+    }
+}