Skip to content

Commit

Permalink
refactor: Optimize Imports & Reformat Code
Browse files Browse the repository at this point in the history
  • Loading branch information
@axhtl
axhtl committed Aug 16, 2024
1 parent bc588fe commit 45cffb9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 169 deletions.
2 changes: 1 addition & 1 deletion src/main/kotlin/org/store/clothstar/product/dto/request/UpdateDisplayStatusRequest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package org.store.clothstar.product.dto.request
import jakarta.validation.constraints.NotNull
import org.store.clothstar.product.domain.type.DisplayStatus

class UpdateDisplayStatusRequest (
class UpdateDisplayStatusRequest(

@NotNull(message = "진열 상태를 설정해주세요.")
val displayStatus: DisplayStatus,
Expand Down
165 changes: 1 addition & 164 deletions src/test/kotlin/org/store/clothstar/order/service/OrderUserServiceTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,14 @@
package org.store.clothstar.order.service

import io.kotest.core.spec.style.BehaviorSpec
import io.kotest.core.spec.style.StringSpec
import io.kotest.matchers.shouldBe
import io.mockk.every
import io.mockk.impl.annotations.InjectMockKs
import io.mockk.impl.annotations.MockK
import io.mockk.junit5.MockKExtension
import io.mockk.justRun
import io.mockk.mockk
import io.mockk.verify
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertNotNull
import org.junit.jupiter.api.DisplayName
import org.junit.jupiter.api.assertThrows
import org.junit.jupiter.api.extension.ExtendWith
import org.springframework.data.repository.findByIdOrNull
import org.store.clothstar.common.error.ErrorCode
import org.store.clothstar.common.error.exception.order.OrderNotFoundException
import org.store.clothstar.member.service.AddressService
import org.store.clothstar.member.service.MemberService
import org.store.clothstar.member.service.SellerService
Expand All @@ -29,11 +20,9 @@ import org.store.clothstar.order.repository.OrderRepository
import org.store.clothstar.order.service.OrderSave.OrderSaveFacade
import org.store.clothstar.product.service.ItemService
import org.store.clothstar.product.service.ProductService
import java.time.LocalDateTime
import kotlin.test.Test

@ExtendWith(MockKExtension::class)
class OrderUserServiceTest: BehaviorSpec({
class OrderUserServiceTest : BehaviorSpec({

val orderRepository: OrderRepository = mockk()
val orderDetailRepository: OrderDetailRepository = mockk()
Expand All @@ -44,7 +33,6 @@ class OrderUserServiceTest: BehaviorSpec({
val productService: ProductService = mockk()
val orderSaveFacade: OrderSaveFacade = mockk()
val order: Order = mockk()
val orderDetail: OrderDetail = mockk()

val orderService = OrderUserService(
orderSaveFacade, orderRepository, orderDetailRepository, memberService, addressService, sellerService,
Expand All @@ -70,155 +58,4 @@ class OrderUserServiceTest: BehaviorSpec({
}
}
}

// When("존재하지 않는 orderId로 잘못된 요청이 오면") {
// Then("주문이 존재하지 않는 오류 응답")
// }
// }

// @InjectMockKs
// lateinit var orderService: OrderUserService

// @MockK
// lateinit var orderRepository: OrderRepository
//
// @MockK
// lateinit var orderDetailRepository: OrderDetailRepository
//
// @MockK
// lateinit var memberService: MemberService
//
// @MockK
// lateinit var sellerService: SellerService
//
// @MockK
// lateinit var addressService: AddressService
//
// @MockK
// lateinit var itemService: ItemService
//
// @MockK
// lateinit var productService: ProductService
//
// @MockK
// lateinit var orderSaveFacade: OrderSaveFacade
//
// @MockK
// lateinit var order: Order
//
// @MockK
// lateinit var orderDetail: OrderDetail


// // 구매자 구매 확정 - completeOrder
// "구매자 구매 확정 - 성공 테스트" {
// //given
// every { order.status } returns Status.DELIVERED
// every { orderRepository.findByIdOrNull(orderId) } returns order
// justRun { order.validateForStatusDELIVEREDAndDeletedAt() }
// every { order.updateStatus(Status.COMPLETED) } answers {
// every { order.status } returns Status.COMPLETED
// }
//
// //when
// orderService.completeOrder(orderId)
//
// //then
// verify(exactly = 1) { orderRepository.findByIdOrNull(orderId) }
// verify(exactly = 1) { order.validateForStatusDELIVEREDAndDeletedAt() }
// verify(exactly = 1) { order.updateStatus(Status.COMPLETED) }
// assertEquals(Status.COMPLETED, order.status)
// }
//
// @Test
// @DisplayName("구매자 구매 확정 - 주문번호가 존재하지 않을 때 예외처리 테스트")
// fun completeOrder_orderNotFound_exception_test() {
// //given
// every { order.status } returns Status.DELIVERED
// every { orderRepository.findByIdOrNull(orderId) } returns null
//
// //when & then
// val exception = assertThrows<OrderNotFoundException> {
// orderService.completeOrder(orderId)
// }
// assertEquals(ErrorCode.NOT_FOUND_ORDER, exception.errorCode)
// }
//
// // 구매자 주문 취소 - cancelOrder
// @Test
// @DisplayName("구매자 주문 취소 - 성공 테스트")
// fun cancelOrder_success_test() {
// //given
// every { order.status } returns Status.CONFIRMED
// every { orderRepository.findByIdOrNull(orderId) } returns order
// justRun { order.validateForStatusCONFIRMEDAndDeletedAt() }
// every { order.updateStatus(Status.CANCELED) } answers {
// every { order.status } returns Status.CANCELED
// }
//
// //when
// orderService.cancelOrder(orderId)
//
// //then
// verify(exactly = 1) { orderRepository.findByIdOrNull(orderId) }
// verify(exactly = 1) { order.validateForStatusCONFIRMEDAndDeletedAt() }
// verify(exactly = 1) { order.updateStatus(Status.CANCELED) }
// order.status shouldBe Status.CANCELED
// }
//
// @Test
// @DisplayName("구매자 주문 취소 - 주문번호가 존재하지 않을 때 예외처리 테스트")
// fun cancelOrder_orderNotFound_exception_test() {
// //given
// every { order.status } returns Status.CONFIRMED
// every { orderRepository.findByIdOrNull(orderId) } returns null
//
// //when & then
// val exception = assertThrows<OrderNotFoundException> {
// orderService.cancelOrder(orderId)
// }
// assertEquals(ErrorCode.NOT_FOUND_ORDER, exception.errorCode)
// }
//
// // 주문 삭제 - updateDeleteAt
// @Test
// @DisplayName("주문 삭제 - 성공 테스트")
// fun updateDeleteAt_success_test() {
// //given
// every { orderRepository.findByIdOrNull(orderId) } returns order
// justRun { order.validateForDeletedAt() }
// every { orderDetailRepository.findOrderDetailListByOrderId(orderId) } returns listOf(orderDetail)
// every { orderDetail.updateDeletedAt() } answers {
// every { orderDetail.deletedAt } returns LocalDateTime.now()
// }
// every { order.updateDeletedAt() } answers {
// every { order.deletedAt } returns LocalDateTime.now()
// }
//
// //when
// orderService.updateDeleteAt(orderId)
//
// //then
// verify(exactly = 1) { orderRepository.findByIdOrNull(orderId) }
// verify(exactly = 1) { order.validateForDeletedAt() }
// verify(exactly = 1) { orderDetailRepository.findOrderDetailListByOrderId(orderId) }
// verify(exactly = 1) { orderDetail.updateDeletedAt() }
// verify(exactly = 1) { order.updateDeletedAt() }
//
// assertNotNull(order.deletedAt)
// assertNotNull(orderDetail.deletedAt)
// }
//
// @Test
// @DisplayName("주문 삭제 - 주문번호가 존재하지 않을 때 예외처리 테스트")
// fun updateDeleteAt_orderNotFound_exception_test() {
// //given
// every { orderRepository.findByIdOrNull(orderId) } returns null
//
// //when & then
// val exception = assertThrows<OrderNotFoundException> {
// orderService.updateDeleteAt(orderId)
// }
// assertEquals(ErrorCode.NOT_FOUND_ORDER, exception.errorCode)
// }
})
6 changes: 2 additions & 4 deletions src/test/kotlin/org/store/clothstar/product/service/ProductApplicationServiceTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@ import org.junit.jupiter.api.extension.ExtendWith
import org.mockito.BDDMockito.given
import org.mockito.InjectMocks
import org.mockito.Mock
import org.mockito.Mockito.*
import org.mockito.Mockito.mock
import org.mockito.Mockito.verify
import org.mockito.junit.jupiter.MockitoExtension
import org.springframework.web.multipart.MultipartFile
import org.store.clothstar.member.service.MemberService
import org.store.clothstar.product.domain.Item
import org.store.clothstar.product.domain.Product
import org.store.clothstar.product.domain.type.DisplayStatus
import org.store.clothstar.product.domain.type.SaleStatus
import org.store.clothstar.product.dto.request.ProductCreateRequest

@ExtendWith(MockitoExtension::class)
class ProductApplicationServiceTest {
Expand Down

0 comments on commit 45cffb9

Please sign in to comment.