fix(checkout): cancel not-delivered orders when checkout delivered orders

tingtt · tingtt · commit 828156add82f · 2025-04-30T08:59:07.000+09:00
diff --git a/internal/usecase/cashier/checkout.go b/internal/usecase/cashier/checkout.go
@@ -30,7 +30,7 @@ func (c *cashier) Checkout(
 		orderIDsMap[id] = true
 	}
 
-	for order_, err := range c.order.Latest(order.IgnoreCheckedOut()) {
+	for order_, err := range c.order.Latest(order.FilterCustomerEmail(customerEmail), order.IgnoreCheckedOut()) {
 		if err != nil {
 			return checkout.Checkout{}, err
 		}
@@ -41,6 +41,11 @@ func (c *cashier) Checkout(
 			if err != nil {
 				return checkout.Checkout{}, err
 			}
+		} else {
+			_, err := updateOrderStatus(c.order, order_.ID, order.StatusCanceled, newCheckout.Timestamp)
+			if err != nil {
+				return checkout.Checkout{}, err
+			}
 		}
 	}
 	for notFoundOrderID := range orderIDsMap {

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func (c *cashier) Checkout(`
`30`	`30`	`orderIDsMap[id] = true`
`31`	`31`	`}`
`32`	`32`
`33`		`- for order_, err := range c.order.Latest(order.IgnoreCheckedOut()) {`
	`33`	`+ for order_, err := range c.order.Latest(order.FilterCustomerEmail(customerEmail), order.IgnoreCheckedOut()) {`
`34`	`34`	`if err != nil {`
`35`	`35`	`return checkout.Checkout{}, err`
`36`	`36`	`}`
`@@ -41,6 +41,11 @@ func (c *cashier) Checkout(`
`41`	`41`	`if err != nil {`
`42`	`42`	`return checkout.Checkout{}, err`
`43`	`43`	`}`
	`44`	`+ } else {`
	`45`	`+ _, err := updateOrderStatus(c.order, order_.ID, order.StatusCanceled, newCheckout.Timestamp)`
	`46`	`+ if err != nil {`
	`47`	`+ return checkout.Checkout{}, err`
	`48`	`+ }`
`44`	`49`	`}`
`45`	`50`	`}`
`46`	`51`	`for notFoundOrderID := range orderIDsMap {`