Merge branch 'trunk' into task/WOOMOB-534-more-asset-reduction

Author: iamgabrielma

Modules/Sources/Fakes/Networking.generated.swift

@@ -1451,6 +1451,7 @@ extension Networking.ShippingLabelAccountSettings {
             isEmailReceiptsEnabled: .fake(),
             paperSize: .fake(),
             lastSelectedPackageID: .fake(),
+            lastOrderCompleted: .fake(),
             addPaymentMethodURL: .fake()
         )
     }

Modules/Sources/Networking/Model/Copiable/Models+Copiable.generated.swift

@@ -2424,6 +2424,7 @@ extension Networking.ShippingLabelAccountSettings {
         isEmailReceiptsEnabled: CopiableProp<Bool> = .copy,
         paperSize: CopiableProp<ShippingLabelPaperSize> = .copy,
         lastSelectedPackageID: CopiableProp<String> = .copy,
+        lastOrderCompleted: CopiableProp<Bool> = .copy,
         addPaymentMethodURL: NullableCopiableProp<URL> = .copy
     ) -> Networking.ShippingLabelAccountSettings {
         let siteID = siteID ?? self.siteID
@@ -2438,6 +2439,7 @@ extension Networking.ShippingLabelAccountSettings {
         let isEmailReceiptsEnabled = isEmailReceiptsEnabled ?? self.isEmailReceiptsEnabled
         let paperSize = paperSize ?? self.paperSize
         let lastSelectedPackageID = lastSelectedPackageID ?? self.lastSelectedPackageID
+        let lastOrderCompleted = lastOrderCompleted ?? self.lastOrderCompleted
         let addPaymentMethodURL = addPaymentMethodURL ?? self.addPaymentMethodURL
 
         return Networking.ShippingLabelAccountSettings(
@@ -2453,6 +2455,7 @@ extension Networking.ShippingLabelAccountSettings {
             isEmailReceiptsEnabled: isEmailReceiptsEnabled,
             paperSize: paperSize,
             lastSelectedPackageID: lastSelectedPackageID,
+            lastOrderCompleted: lastOrderCompleted,
             addPaymentMethodURL: addPaymentMethodURL
         )
     }

Modules/Sources/Networking/Model/ShippingLabel/Shipments/WooShippingShipmentItem.swift

@@ -49,3 +49,10 @@ public struct WooShippingShipmentItem: Codable, Equatable, GeneratedFakeable, Ge
 }
 
 public typealias WooShippingShipments = [String: [WooShippingShipmentItem]]
+
+public extension WooShippingShipmentItem {
+    var quantity: Decimal {
+        guard let subItems else { return 0 }
+        return subItems.count > 0 ? Decimal(subItems.count) : 1
+    }
+}

Modules/Sources/Networking/Model/ShippingLabel/ShippingLabelAccountSettings.swift

@@ -43,6 +43,10 @@ public struct ShippingLabelAccountSettings: Equatable, GeneratedFakeable, Genera
     /// Uses the `id` for predefined packages or `name` for custom packages.
     public let lastSelectedPackageID: String
 
+    /// Whether to mark order as completed after last label purchase
+    /// This is available only in the new Woo Shipping plugin.
+    public let lastOrderCompleted: Bool
+
     /// URL to open the web view for adding new payment methods
     public let addPaymentMethodURL: URL?
 
@@ -58,6 +62,7 @@ public struct ShippingLabelAccountSettings: Equatable, GeneratedFakeable, Genera
                 isEmailReceiptsEnabled: Bool,
                 paperSize: ShippingLabelPaperSize,
                 lastSelectedPackageID: String,
+                lastOrderCompleted: Bool,
                 addPaymentMethodURL: URL?) {
         self.siteID = siteID
         self.canManagePayments = canManagePayments
@@ -71,6 +76,7 @@ public struct ShippingLabelAccountSettings: Equatable, GeneratedFakeable, Genera
         self.isEmailReceiptsEnabled = isEmailReceiptsEnabled
         self.paperSize = paperSize
         self.lastSelectedPackageID = lastSelectedPackageID
+        self.lastOrderCompleted = lastOrderCompleted
         self.addPaymentMethodURL = addPaymentMethodURL
     }
 }
@@ -105,6 +111,7 @@ extension ShippingLabelAccountSettings: Decodable {
 
         let userMetaContainer = try container.nestedContainer(keyedBy: UserMetaKeys.self, forKey: .userMeta)
         let lastSelectedPackageID = try userMetaContainer.decode(String.self, forKey: .lastSelectedPackageID)
+        let lastOrderCompleted = (try? userMetaContainer.decodeIfPresent(Bool.self, forKey: .lastOrderCompleted)) ?? false
 
         self.init(siteID: siteID,
                   canManagePayments: canManagePayments,
@@ -118,6 +125,7 @@ extension ShippingLabelAccountSettings: Decodable {
                   isEmailReceiptsEnabled: isEmailReceiptsEnabled,
                   paperSize: paperSize,
                   lastSelectedPackageID: lastSelectedPackageID,
+                  lastOrderCompleted: lastOrderCompleted,
                   addPaymentMethodURL: addPaymentMethodURL)
     }
 }
@@ -150,6 +158,7 @@ private extension ShippingLabelAccountSettings {
 
     private enum UserMetaKeys: String, CodingKey {
         case lastSelectedPackageID = "last_box_id"
+        case lastOrderCompleted = "last_order_completed"
     }
 }
 

Modules/Sources/Networking/Remote/WooShippingRemote.swift

@@ -37,6 +37,7 @@ public protocol WooShippingRemoteProtocol {
                                originAddress: WooShippingAddress,
                                destinationAddress: WooShippingAddress,
                                package: WooShippingPackagePurchase,
+                               markOrderComplete: Bool?,
                                completion: @escaping (Result<[ShippingLabelPurchase], Error>) -> Void)
     func checkLabelStatus(siteID: Int64,
                           orderID: Int64,
@@ -284,7 +285,14 @@ public final class WooShippingRemote: Remote, WooShippingRemoteProtocol {
                                       originAddress: WooShippingAddress,
                                       destinationAddress: WooShippingAddress,
                                       package: WooShippingPackagePurchase,
+                                      markOrderComplete: Bool?,
                                       completion: @escaping (Result<[ShippingLabelPurchase], Error>) -> Void) {
+        let userMeta: [String: Any]? = {
+            guard let markOrderComplete else {
+                return nil
+            }
+            return [ParameterKey.lastOrderCompleted: markOrderComplete]
+        }()
         do {
             let parameters: [String: Any] = [
                 ParameterKey.async: true,
@@ -296,7 +304,8 @@ public final class WooShippingRemote: Remote, WooShippingRemoteProtocol {
                 ParameterKey.featuresSupported: [Values.upsdap],
                 ParameterKey.hazmat: package.encodedHazmat(),
                 ParameterKey.customs: try package.encodedCustomsForm(),
-            ]
+                ParameterKey.userMeta: userMeta,
+            ].compactMapValues { $0 }
             let path = "\(Path.purchase)/\(orderID)"
             let request = JetpackRequest(wooApiVersion: .wooShipping,
                                          method: .post,
@@ -635,6 +644,8 @@ private extension WooShippingRemote {
         static let enabled = "enabled"
         static let featuresSupported = "features_supported_by_client"
         static let confirmed = "confirmed"
+        static let userMeta = "user_meta"
+        static let lastOrderCompleted = "last_order_completed"
     }
 
     enum Values {

Modules/Sources/Storage/Tools/StorageType+Deletions.swift

@@ -195,11 +195,11 @@ public extension StorageType {
         }
     }
 
-    /// Deletes all of the stored SystemPlugins for the provided siteID whose name is not included in `currentSystemPlugins` array
+    /// Deletes stored system plugins for the provided siteID that are not in the currentSystemPluginPaths list.
     ///
-    func deleteStaleSystemPlugins(siteID: Int64, currentSystemPlugins: [String]) {
+    func deleteStaleSystemPlugins(siteID: Int64, currentSystemPluginPaths: [String]) {
         let systemPlugins = loadSystemPlugins(siteID: siteID).filter {
-            !currentSystemPlugins.contains($0.name)
+            !currentSystemPluginPaths.contains($0.plugin)
         }
         systemPlugins.forEach {
             deleteObject($0)

Modules/Sources/Storage/Tools/StorageType+Extensions.swift

@@ -841,11 +841,28 @@ public extension StorageType {
 
     /// Returns a system plugin with a specified `siteID` and `path`.
     ///
-    func loadSystemPlugin(siteID: Int64, path: String) -> SystemPlugin? {
-        let predicate = \SystemPlugin.siteID == siteID && \SystemPlugin.plugin == path
+    /// - Parameters:
+    ///   - siteID: The site ID to filter by.
+    ///   - path: The plugin path to match (e.g., "woocommerce/woocommerce.php").
+    ///   - active: Optional active state filter. If provided, only plugins with matching active state are returned. If nil, active state is ignored.
+    /// - Returns: The matching system plugin, or nil if not found.
+    func loadSystemPlugin(siteID: Int64, path: String, active: Bool? = nil) -> SystemPlugin? {
+        let predicate = if let active {
+            \SystemPlugin.siteID == siteID && \SystemPlugin.plugin == path && \SystemPlugin.active == active
+        } else {
+            \SystemPlugin.siteID == siteID && \SystemPlugin.plugin == path
+        }
         return firstObject(ofType: SystemPlugin.self, matching: predicate)
     }
 
+    /// Returns stored system plugins for a provided `siteID` matching the given plugin `paths`.
+    ///
+    func loadSystemPlugins(siteID: Int64, matchingPaths paths: [String]) -> [SystemPlugin] {
+        let predicate = NSPredicate(format: "siteID == %lld && plugin in %@", siteID, paths)
+        let descriptor = NSSortDescriptor(keyPath: \SystemPlugin.plugin, ascending: true)
+        return allObjects(ofType: SystemPlugin.self, matching: predicate, sortedBy: [descriptor])
+    }
+
     // MARK: - Inbox Notes
 
     /// Returns a single Inbox Note given a `siteID` and `id`

Modules/Sources/Yosemite/Actions/WooShippingAction.swift

@@ -56,6 +56,7 @@ public enum WooShippingAction: Action {
                                originAddress: WooShippingAddress,
                                destinationAddress: WooShippingAddress,
                                package: WooShippingPackagePurchase,
+                               markOrderComplete: Bool?,
                                backendProcessingDelay: TimeInterval = 2.0,
                                pollingDelay: TimeInterval = 1.0,
                                pollingMaximumRetries: Int64 = 3,

Modules/Sources/Yosemite/Model/Storage/ShippingLabelAccountSettings+ReadOnlyConvertible.swift

@@ -26,8 +26,8 @@ extension Storage.ShippingLabelAccountSettings: ReadOnlyConvertible {
         let paymentMethodItems = paymentMethods?.map { $0.toReadOnly() } ?? []
 
         /// Since account settings are not persisted for the new shipping label flow,
-        /// the conversion for the new property `addPaymentMethodURL` is ignored.
-        /// This avoids the complication of unnecessary Core Data migration for the new property.
+        /// the conversion for the new properties `addPaymentMethodURL` & `lastOrderCompleted` is ignored.
+        /// This avoids the complication of unnecessary Core Data migration for the new properties.
         return ShippingLabelAccountSettings(siteID: siteID,
                                             canManagePayments: canManagePayments,
                                             canEditSettings: canEditSettings,
@@ -40,6 +40,7 @@ extension Storage.ShippingLabelAccountSettings: ReadOnlyConvertible {
                                             isEmailReceiptsEnabled: isEmailReceiptsEnabled,
                                             paperSize: .init(rawValue: paperSize ?? ""),
                                             lastSelectedPackageID: lastSelectedPackageID ?? "",
+                                            lastOrderCompleted: false,
                                             addPaymentMethodURL: nil)
     }
 }

Modules/Sources/Yosemite/PointOfSale/Eligibility/POSSystemStatusService.swift

@@ -48,12 +48,13 @@ public final class POSSystemStatusService: POSSystemStatusServiceProtocol {
         )
 
         // Upserts all plugins in storage.
-        await storageManager.performAndSaveAsync({ [weak self] storage in
-            self?.upsertSystemPlugins(siteID: siteID, systemStatus: systemStatus, in: storage)
+        await storageManager.performAndSaveAsync({ storage in
+            let useCase = SystemPluginsUpsertUseCase(storage: storage)
+            useCase.upsert(siteID: siteID, activePlugins: systemStatus.activePlugins, inactivePlugins: systemStatus.inactivePlugins)
         })
 
         // Loads WooCommerce plugin from storage.
-        guard let wcPlugin = storageManager.viewStorage.loadSystemPlugin(siteID: siteID, path: Constants.wcPluginPath)?.toReadOnly() else {
+        guard let wcPlugin = storageManager.viewStorage.loadSystemPlugin(siteID: siteID, path: Constants.wcPluginPath, active: true)?.toReadOnly() else {
             return POSPluginAndFeatureInfo(wcPlugin: nil, featureValue: nil)
         }
 
@@ -63,42 +64,6 @@ public final class POSSystemStatusService: POSSystemStatusServiceProtocol {
     }
 }
 
-private extension POSSystemStatusService {
-    /// Updates or inserts system plugins in storage.
-    func upsertSystemPlugins(siteID: Int64, systemStatus: POSPluginEligibilitySystemStatus, in storage: StorageType) {
-        // Active and inactive plugins share identical structure, but are stored in separate parts of the remote response
-        // (and without an active attribute in the response). So we apply the correct value for active (or not)
-        let readonlySystemPlugins: [SystemPlugin] = {
-            let activePlugins = systemStatus.activePlugins.map {
-                $0.copy(active: true)
-            }
-
-            let inactivePlugins = systemStatus.inactivePlugins.map {
-                $0.copy(active: false)
-            }
-
-            return activePlugins + inactivePlugins
-        }()
-
-        let storedPlugins = storage.loadSystemPlugins(siteID: siteID, matching: readonlySystemPlugins.map { $0.name })
-        readonlySystemPlugins.forEach { readonlySystemPlugin in
-            // Loads or creates new StorageSystemPlugin matching the readonly one.
-            let storageSystemPlugin: StorageSystemPlugin = {
-                if let systemPlugin = storedPlugins.first(where: { $0.name == readonlySystemPlugin.name }) {
-                    return systemPlugin
-                }
-                return storage.insertNewObject(ofType: StorageSystemPlugin.self)
-            }()
-
-            storageSystemPlugin.update(with: readonlySystemPlugin)
-        }
-
-        // Removes stale system plugins.
-        let currentSystemPlugins = readonlySystemPlugins.map(\.name)
-        storage.deleteStaleSystemPlugins(siteID: siteID, currentSystemPlugins: currentSystemPlugins)
-    }
-}
-
 private extension POSSystemStatusService {
     enum Constants {
         static let wcPluginPath = "woocommerce/woocommerce.php"