Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: 테스트 하는 시점에 따라 결과가 달라지는 문제 해결 #74

Merged
merged 1 commit into from
Sep 29, 2023
Merged

fix: 테스트 하는 시점에 따라 결과가 달라지는 문제 해결 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/ray/pominowner/orders/controller/dto/ApproveOrderResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import com.ray.pominowner.orders.domain.Order;

import java.time.LocalTime;
import java.time.LocalDateTime;

public record ApproveOrderResponse(
Long orderId,
LocalTime estimatedCookingTime,
LocalDateTime estimatedCookingTime,
Integer receiptNumber
) {

Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/ray/pominowner/orders/domain/Order.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.Objects;

import static com.ray.pominowner.global.util.ExceptionMessage.INVALID_ORDER;
Expand Down Expand Up @@ -50,7 +49,7 @@ public class Order extends BaseTimeEntity {

private LocalDateTime reservationTime;

private LocalTime estimatedCookingTime;
private LocalDateTime estimatedCookingTime;

private String rejectReason;

Expand All @@ -62,7 +61,7 @@ public class Order extends BaseTimeEntity {
// Payment 와 일대일 매핑
private Long paymentId;

public static Order of(Order order, OrderStatus status, Integer receiptNumber, LocalTime estimatedCookingTime) {
public static Order of(Order order, OrderStatus status, Integer receiptNumber, LocalDateTime estimatedCookingTime) {
return Order.builder()
.id(order.id)
.orderNumber(order.orderNumber)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/ray/pominowner/orders/service/OrderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public Order approve(Long orderId, int cookingMinute) {
Order approvedOrder = Order.of(order,
OrderStatus.COOKING,
generator.incrementAndGet(),
order.getOrderedAt().toLocalTime().plusMinutes(cookingMinute));
order.getOrderedAt().plusMinutes(cookingMinute));

orderRepository.save(approvedOrder);

Expand Down
5 changes: 2 additions & 3 deletions src/test/java/com/ray/pominowner/orders/service/OrderServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.HttpStatus;

import java.time.LocalDateTime;
import java.util.Optional;
Expand Down Expand Up @@ -83,7 +82,7 @@ void successAcceptOrder() {
given(generator.incrementAndGet()).willReturn(1);
doNothing().when(restTemplateServiceProvider).notifyToApprove(any(Integer.class), any(Order.class));

ApproveOrderRequest request = new ApproveOrderRequest(90);
ApproveOrderRequest request = new ApproveOrderRequest(30);

// when
Order approvedOrder = orderService.approve(order.getId(), request.cookingMinute());
Expand All @@ -92,7 +91,7 @@ void successAcceptOrder() {
assertThat(approvedOrder).hasFieldOrPropertyWithValue("status", OrderStatus.COOKING);
assertThat(approvedOrder).hasFieldOrPropertyWithValue("receiptNumber", 1);
assertThat(approvedOrder).hasFieldOrPropertyWithValue("estimatedCookingTime", approvedOrder.getEstimatedCookingTime());
assertThat(approvedOrder.getEstimatedCookingTime().isAfter(approvedOrder.getOrderedAt().toLocalTime())).isTrue();
assertThat(approvedOrder.getEstimatedCookingTime().isAfter(approvedOrder.getOrderedAt())).isTrue();
}

@Test
Expand Down