Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
import com.everyonewaiter.application.receipt.provided.ReceiptCreator;
import com.everyonewaiter.application.receipt.required.ReceiptPrintNoRepository;
import com.everyonewaiter.domain.order.Order;
import com.everyonewaiter.domain.order.OrderUpdateRequests;
import com.everyonewaiter.domain.receipt.Receipt;
import jakarta.annotation.Nullable;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
Expand Down Expand Up @@ -43,29 +41,20 @@ public Receipt create(Long storeId, int tableNo, List<Long> orderIds) {

@Override
@Transactional(readOnly = true)
public @Nullable Receipt createDiff(
Long storeId,
int tableNo,
List<Order> orders,
OrderUpdateRequests updateRequests
) {
if (!Receipt.hasDiff(orders, updateRequests)) {
return null;
}
public Receipt createCancel(Long storeId, int tableNo, Long orderId) {
Order order = orderFinder.findOrThrow(orderId);

receiptRepository.increment(storeId);

return Receipt.diff(tableNo, orders, updateRequests, receiptRepository.get(storeId));
return Receipt.cancel(tableNo, order, receiptRepository.get(storeId));
}

@Override
@Transactional(readOnly = true)
public Receipt createCancel(Long storeId, int tableNo, Long orderId) {
Order order = orderFinder.findOrThrow(orderId);

public Receipt copyWithIncrementPrintNo(Long storeId, Receipt receipt) {
receiptRepository.increment(storeId);

return Receipt.cancel(tableNo, order, receiptRepository.get(storeId));
return receipt.copy(receiptRepository.get(storeId));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,8 @@ public void handle(OrderCreateEvent event) {
public void handle(OrderUpdateEvent event) {
LOGGER.info("[주문 수정 빌지 전송 이벤트] 매장 ID: {}, 테이블 번호: {}", event.storeId(), event.tableNo());

Receipt diff = receiptCreator.createDiff(
event.storeId(),
event.tableNo(),
event.orders(),
event.updateRequests()
);

if (diff != null) {
if (event.diff() != null) {
Receipt diff = receiptCreator.copyWithIncrementPrintNo(event.storeId(), event.diff());
publishSseEvent(event.storeId(), diff);
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
package com.everyonewaiter.application.receipt.provided;

import com.everyonewaiter.domain.order.Order;
import com.everyonewaiter.domain.order.OrderUpdateRequests;
import com.everyonewaiter.domain.receipt.Receipt;
import jakarta.annotation.Nullable;
import jakarta.validation.Valid;
import java.util.List;

public interface ReceiptCreator {
Expand All @@ -13,14 +9,8 @@ public interface ReceiptCreator {

Receipt create(Long storeId, int tableNo, List<Long> orderIds);

@Nullable
Receipt createDiff(
Long storeId,
int tableNo,
List<Order> orders,
@Valid OrderUpdateRequests updateRequests
);

Receipt createCancel(Long storeId, int tableNo, Long orderId);

Receipt copyWithIncrementPrintNo(Long storeId, Receipt receipt);

}
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
package com.everyonewaiter.domain.order;

import java.util.List;
import com.everyonewaiter.domain.receipt.Receipt;
import org.jspecify.annotations.Nullable;

public record OrderUpdateEvent(
Long storeId,
int tableNo,
List<Order> orders,
OrderUpdateRequests updateRequests
) {
public record OrderUpdateEvent(Long storeId, int tableNo, @Nullable Receipt diff) {

}
5 changes: 4 additions & 1 deletion src/main/java/com/everyonewaiter/domain/pos/PosTable.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.everyonewaiter.domain.order.OrderUpdateEvent;
import com.everyonewaiter.domain.order.OrderUpdateRequest;
import com.everyonewaiter.domain.order.OrderUpdateRequests;
import com.everyonewaiter.domain.receipt.Receipt;
import com.everyonewaiter.domain.receipt.ReceiptResendEvent;
import com.everyonewaiter.domain.sse.SseEvent;
import com.everyonewaiter.domain.store.Store;
Expand Down Expand Up @@ -129,11 +130,13 @@ public void cancelOrder(Long orderId) {
public void updateOrder(OrderUpdateRequests updateRequests) {
PosTableActivity posTableActivity = getActiveActivityOrThrow();

Receipt diff = Receipt.diff(getTableNo(), getOrderedOrders(), updateRequests);

for (OrderUpdateRequest updateRequest : updateRequests.orders()) {
posTableActivity.updateOrder(updateRequest);
}

registerEvent(new OrderUpdateEvent(store.getId(), tableNo, getOrderedOrders(), updateRequests));
registerEvent(new OrderUpdateEvent(store.getId(), tableNo, diff));
registerEvent(new SseEvent(store.getId(), ORDER, UPDATE, getTableNo()));
registerEvent(new SseEvent(store.getId(), POS, UPDATE, getTableNo()));
}
Expand Down
36 changes: 6 additions & 30 deletions src/main/java/com/everyonewaiter/domain/receipt/Receipt.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,38 +36,10 @@ public static Receipt of(int tableNo, List<Order> orders, int printNo) {
);
}

public static boolean hasDiff(List<Order> orders, OrderUpdateRequests updateRequests) {
Map<Long, OrderMenu> beforeOrderMenus = orders.stream()
.flatMap(order -> order.getPrintEnabledOrderMenus().stream())
.collect(Collectors.toMap(OrderMenu::getId, orderMenu -> orderMenu));

List<OrderMenuQuantityUpdateRequest> afterOrderMenus = updateRequests.orders()
.stream()
.flatMap(order -> order.orderMenus().stream())
.toList();

for (OrderMenuQuantityUpdateRequest afterOrderMenu : afterOrderMenus) {
if (!beforeOrderMenus.containsKey(afterOrderMenu.orderMenuId())) {
continue;
}

OrderMenu orderMenu = beforeOrderMenus.get(afterOrderMenu.orderMenuId());

int updatedQuantity = afterOrderMenu.quantity() - orderMenu.getQuantity();

if (updatedQuantity != 0) {
return true;
}
}

return false;
}

public static @Nullable Receipt diff(
int tableNo,
List<Order> orders,
OrderUpdateRequests updateRequests,
int printNo
OrderUpdateRequests updateRequests
) {
Map<Long, OrderMenu> beforeOrderMenus = orders.stream()
.flatMap(order -> order.getPrintEnabledOrderMenus().stream())
Expand Down Expand Up @@ -95,7 +67,7 @@ public static boolean hasDiff(List<Order> orders, OrderUpdateRequests updateRequ
}
}

return receiptMenus.isEmpty() ? null : new Receipt(tableNo, "", printNo, receiptMenus);
return receiptMenus.isEmpty() ? null : new Receipt(tableNo, "", 0, receiptMenus);
}

public static Receipt cancel(int tableNo, Order order, int printNo) {
Expand All @@ -110,4 +82,8 @@ public static Receipt cancel(int tableNo, Order order, int printNo) {
);
}

public Receipt copy(int printNo) {
return new Receipt(this.tableNo, this.memo, printNo, this.receiptMenus);
}

}