klaus
/
sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

구매목록 

- orderType 파라미터 제거
This commit is contained in:
Klaus 2024-12-18 03:22:13 +09:00
parent a1f9b676b5
commit 00e4fefc8f
3 changed files with 20 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderController.kt
View File

@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.PostMapping
import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestBody
import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RequestParam
import org.springframework.web.bind.annotation.RestController import org.springframework.web.bind.annotation.RestController
@RestController @RestController
@ -34,7 +33,6 @@ class OrderController(private val service: OrderService) {
@GetMapping("/audio-content") @GetMapping("/audio-content")
fun getAudioContentOrderList( fun getAudioContentOrderList(
@RequestParam(value = "orderType", required = false) orderType: OrderType? = null,
@AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
pageable: Pageable pageable: Pageable
) = run { ) = run {
@ -42,7 +40,6 @@ class OrderController(private val service: OrderService) {
ApiResponse.ok( ApiResponse.ok(
service.getAudioContentOrderList( service.getAudioContentOrderList(
orderType = orderType,
member = member, member = member,
offset = pageable.offset, offset = pageable.offset,
limit = pageable.pageSize.toLong() limit = pageable.pageSize.toLong()

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

@ -20,7 +20,6 @@ interface OrderQueryRepository {
fun isExistOrderedAndOrderType(memberId: Long, contentId: Long): Pair<Boolean, OrderType?> fun isExistOrderedAndOrderType(memberId: Long, contentId: Long): Pair<Boolean, OrderType?>
fun getAudioContentRemainingTime(memberId: Long, contentId: Long, timezone: String): String fun getAudioContentRemainingTime(memberId: Long, contentId: Long, timezone: String): String
fun getAudioContentOrderList( fun getAudioContentOrderList(
orderType: OrderType?,
dateTime: LocalDateTime, dateTime: LocalDateTime,
coverImageHost: String, coverImageHost: String,
memberId: Long, memberId: Long,
@ -28,7 +27,7 @@ interface OrderQueryRepository {
limit: Long = 10 limit: Long = 10
): List<GetAudioContentOrderListItem> ): List<GetAudioContentOrderListItem>
fun totalAudioContentOrderListCount(orderType: OrderType?, memberId: Long, dateTime: LocalDateTime): Int fun totalAudioContentOrderListCount(memberId: Long, dateTime: LocalDateTime): Int
fun getAudioContentMainOrderList( fun getAudioContentMainOrderList(
dateTime: LocalDateTime, dateTime: LocalDateTime,
coverImageHost: String, coverImageHost: String,
@ -118,40 +117,22 @@ class OrderQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : Orde
} }
override fun getAudioContentOrderList( override fun getAudioContentOrderList(
orderType: OrderType?,
dateTime: LocalDateTime, dateTime: LocalDateTime,
coverImageHost: String, coverImageHost: String,
memberId: Long, memberId: Long,
offset: Long, offset: Long,
limit: Long limit: Long
): List<GetAudioContentOrderListItem> { ): List<GetAudioContentOrderListItem> {
var where = order.member.id.eq(memberId) val where = order.member.id.eq(memberId)
.and(order.isActive.isTrue) .and(order.isActive.isTrue)
.and(
when (orderType) { order.type.eq(OrderType.KEEP)
OrderType.RENTAL -> { .or(
where = where.and( order.type.eq(OrderType.RENTAL)
order.type.eq(OrderType.RENTAL) .and(order.startDate.before(dateTime))
.and(order.startDate.before(dateTime)) .and(order.endDate.after(dateTime))
.and(order.endDate.after(dateTime)) )
) )
}
OrderType.KEEP -> {
where = where.and(order.type.eq(OrderType.KEEP))
}
null -> {
where = where.and(
order.type.eq(OrderType.KEEP)
.or(
order.type.eq(OrderType.RENTAL)
.and(order.startDate.before(dateTime))
.and(order.endDate.after(dateTime))
)
)
}
}
return queryFactory return queryFactory
.select( .select(
@ -178,34 +159,17 @@ class OrderQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : Orde
.fetch() .fetch()
} }
override fun totalAudioContentOrderListCount(orderType: OrderType?, memberId: Long, dateTime: LocalDateTime): Int { override fun totalAudioContentOrderListCount(memberId: Long, dateTime: LocalDateTime): Int {
var where = order.member.id.eq(memberId) val where = order.member.id.eq(memberId)
.and(order.isActive.isTrue) .and(order.isActive.isTrue)
.and(
when (orderType) { order.type.eq(OrderType.KEEP)
OrderType.RENTAL -> { .or(
where = where.and( order.type.eq(OrderType.RENTAL)
order.type.eq(OrderType.RENTAL) .and(order.startDate.before(dateTime))
.and(order.startDate.before(dateTime)) .and(order.endDate.after(dateTime))
.and(order.endDate.after(dateTime)) )
) )
}
OrderType.KEEP -> {
where = where.and(order.type.eq(OrderType.KEEP))
}
null -> {
where = where.and(
order.type.eq(OrderType.KEEP)
.or(
order.type.eq(OrderType.RENTAL)
.and(order.startDate.before(dateTime))
.and(order.endDate.after(dateTime))
)
)
}
}
return queryFactory.select(order.id) return queryFactory.select(order.id)
.from(order) .from(order)

3
src/main/kotlin/kr/co/vividnext/sodalive/content/order/OrderService.kt
View File

@ -90,18 +90,15 @@ class OrderService(
} }
fun getAudioContentOrderList( fun getAudioContentOrderList(
orderType: OrderType? = null,
member: Member, member: Member,
offset: Long, offset: Long,
limit: Long limit: Long
): GetAudioContentOrderListResponse { ): GetAudioContentOrderListResponse {
val totalCount = repository.totalAudioContentOrderListCount( val totalCount = repository.totalAudioContentOrderListCount(
orderType = orderType,
memberId = member.id!!, memberId = member.id!!,
dateTime = LocalDateTime.now() dateTime = LocalDateTime.now()
) )
val orderItems = repository.getAudioContentOrderList( val orderItems = repository.getAudioContentOrderList(
orderType = orderType,
dateTime = LocalDateTime.now(), dateTime = LocalDateTime.now(),
coverImageHost = audioContentCoverImageHost, coverImageHost = audioContentCoverImageHost,
memberId = member.id!!, memberId = member.id!!,