Remove POSCartCouponItem

Author: staskus

WooCommerce/Classes/POS/Controllers/PointOfSaleOrderController.swift

@@ -7,7 +7,7 @@ import struct Yosemite.Order
 import struct Yosemite.PaymentGateway
 import struct Yosemite.POSCart
 import struct Yosemite.POSCartItem
-import struct Yosemite.POSCartCouponItem
+import struct Yosemite.POSCoupon
 import enum Yosemite.OrderAction
 import enum Yosemite.OrderUpdateField
 import class WooFoundation.CurrencyFormatter
@@ -255,7 +255,7 @@ extension PointOfSaleOrderController {
 private extension POSCart {
     init(cart: Cart) {
         let items = cart.items.map { POSCartItem(item: $0.item, quantity: Decimal($0.quantity)) }
-        let coupons = cart.coupons.map { POSCartCouponItem(code: $0.code) }
+        let coupons = cart.coupons.map { POSCoupon(id: $0.id, code: $0.code) }
         self.init(items: items, coupons: coupons)
     }
 }

Yosemite/Yosemite/Tools/POS/POSCart.swift

@@ -5,9 +5,9 @@ import Foundation
 
 public struct POSCart {
     public let items: [POSCartItem]
-    public let coupons: [POSCartCouponItem]
+    public let coupons: [POSCoupon]
 
-    public init(items: [POSCartItem] = [], coupons: [POSCartCouponItem] = []) {
+    public init(items: [POSCartItem] = [], coupons: [POSCoupon] = []) {
         self.items = items
         self.coupons = coupons
     }
@@ -23,14 +23,6 @@ public struct POSCartItem {
     }
 }
 
-public struct POSCartCouponItem {
-    public let code: String
-
-    public init(code: String) {
-        self.code = code
-    }
-}
-
 public extension POSCart {
     func matches(order: Order?) -> Bool {
         return items.matches(order: order) && coupons.matches(order: order)
@@ -101,7 +93,7 @@ extension [POSCartItem] {
     }
 }
 
-extension [POSCartCouponItem] {
+extension [POSCoupon] {
     func matches(order: Order?) -> Bool {
         guard let order else {
             return self.isEmpty

Yosemite/Yosemite/Tools/POS/POSOrderService.swift

@@ -98,7 +98,7 @@ private extension POSOrderService {
         return order
     }
 
-    func updateCoupons(_ coupons: [POSCartCouponItem], on order: Order) -> Order {
+    func updateCoupons(_ coupons: [POSCoupon], on order: Order) -> Order {
         // Get coupon codes from cart
         let cartCouponCodes = Set(coupons.map { $0.code })
 

Yosemite/YosemiteTests/Tools/POS/POSOrderServiceTests.swift

@@ -144,7 +144,7 @@ struct POSOrderServiceTests {
         // When
         let cart = POSCart(
             items: [makePOSCartItem(productID: 100, quantity: 1)],
-            coupons: [.init(code: "SAVE10")]
+            coupons: [.init(id: UUID(), code: "SAVE10")]
         )
         _ = try await sut.syncOrder(cart: cart, order: order, currency: .USD)
 
@@ -186,9 +186,9 @@ struct POSOrderServiceTests {
         let cart = POSCart(
             items: [makePOSCartItem(productID: 100, quantity: 1)],
             coupons: [
-                .init(code: "KEEP1"),
-                .init(code: "NEW1"),
-                .init(code: "NEW2")
+                .init(id: UUID(), code: "KEEP1"),
+                .init(id: UUID(), code: "NEW1"),
+                .init(id: UUID(), code: "NEW2")
             ]
         )
         _ = try await sut.syncOrder(cart: cart, order: order, currency: .USD)
@@ -220,7 +220,7 @@ struct POSOrderServiceTests {
         // When
         let cart = POSCart(
             items: [makePOSCartItem(productID: 100, quantity: 1)],
-            coupons: [.init(code: "KEEP1")] // Same coupon in cart
+            coupons: [.init(id: UUID(), code: "KEEP1")] // Same coupon in cart
         )
         _ = try await sut.syncOrder(cart: cart, order: order, currency: .USD)