Product List: Replace full product objects with simplified objects

Modules/Sources/Fakes/Networking.generated.swift

@@ -1162,13 +1162,17 @@ extension Networking.ProductListItem {
             sku: .fake(),
             price: .fake(),
             virtual: .fake(),
+            manageStock: .fake(),
             stockQuantity: .fake(),
             stockStatusKey: .fake(),
             reviewsAllowed: .fake(),
             averageRating: .fake(),
             ratingCount: .fake(),
             images: .fake(),
-            addOns: .fake()
+            addOns: .fake(),
+            variations: .fake(),
+            bundleStockStatus: .fake(),
+            bundleStockQuantity: .fake()
         )
     }
 }

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

@@ -1982,13 +1982,17 @@ extension Networking.ProductListItem {
         sku: NullableCopiableProp<String> = .copy,
         price: CopiableProp<String> = .copy,
         virtual: CopiableProp<Bool> = .copy,
+        manageStock: CopiableProp<Bool> = .copy,
         stockQuantity: NullableCopiableProp<Decimal> = .copy,
         stockStatusKey: CopiableProp<String> = .copy,
         reviewsAllowed: CopiableProp<Bool> = .copy,
         averageRating: CopiableProp<String> = .copy,
         ratingCount: CopiableProp<Int> = .copy,
         images: CopiableProp<[ProductImage]> = .copy,
-        addOns: CopiableProp<[ProductAddOn]> = .copy
+        addOns: CopiableProp<[ProductAddOn]> = .copy,
+        variations: CopiableProp<[Int64]> = .copy,
+        bundleStockStatus: NullableCopiableProp<ProductStockStatus> = .copy,
+        bundleStockQuantity: NullableCopiableProp<Int64> = .copy
     ) -> Networking.ProductListItem {
         let siteID = siteID ?? self.siteID
         let productID = productID ?? self.productID
@@ -1998,13 +2002,17 @@ extension Networking.ProductListItem {
         let sku = sku ?? self.sku
         let price = price ?? self.price
         let virtual = virtual ?? self.virtual
+        let manageStock = manageStock ?? self.manageStock
         let stockQuantity = stockQuantity ?? self.stockQuantity
         let stockStatusKey = stockStatusKey ?? self.stockStatusKey
         let reviewsAllowed = reviewsAllowed ?? self.reviewsAllowed
         let averageRating = averageRating ?? self.averageRating
         let ratingCount = ratingCount ?? self.ratingCount
         let images = images ?? self.images
         let addOns = addOns ?? self.addOns
+        let variations = variations ?? self.variations
+        let bundleStockStatus = bundleStockStatus ?? self.bundleStockStatus
+        let bundleStockQuantity = bundleStockQuantity ?? self.bundleStockQuantity
 
         return Networking.ProductListItem(
             siteID: siteID,
@@ -2015,13 +2023,17 @@ extension Networking.ProductListItem {
             sku: sku,
             price: price,
             virtual: virtual,
+            manageStock: manageStock,
             stockQuantity: stockQuantity,
             stockStatusKey: stockStatusKey,
             reviewsAllowed: reviewsAllowed,
             averageRating: averageRating,
             ratingCount: ratingCount,
             images: images,
-            addOns: addOns
+            addOns: addOns,
+            variations: variations,
+            bundleStockStatus: bundleStockStatus,
+            bundleStockQuantity: bundleStockQuantity
         )
     }
 }

Modules/Sources/Networking/Model/Product/ProductListItem.swift

@@ -16,6 +16,7 @@ public struct ProductListItem: GeneratedCopiable, Equatable, GeneratedFakeable {
     public let price: String
     public let virtual: Bool
 
+    public let manageStock: Bool
     public let stockQuantity: Decimal?    // Core API reports Int or null; some extensions allow decimal values as well
     public let stockStatusKey: String   // instock, outofstock, backorder
 
@@ -27,6 +28,16 @@ public struct ProductListItem: GeneratedCopiable, Equatable, GeneratedFakeable {
 
     public let addOns: [ProductAddOn] //TODO: migrate AddOns to MetaData
 
+    public let variations: [Int64]
+
+    // MARK: Product Bundle properties
+
+    /// Stock status of this bundle, taking bundled product quantity requirements and limitations into account. Applicable for bundle-type products only.
+    public let bundleStockStatus: ProductStockStatus?
+
+    /// Quantity of bundles left in stock, taking bundled product quantity requirements into account. Applicable for bundle-type products only.
+    public let bundleStockQuantity: Int64?
+
     /// Computed Properties
     ///
     public var productStatus: ProductStatus {
@@ -51,13 +62,17 @@ public struct ProductListItem: GeneratedCopiable, Equatable, GeneratedFakeable {
                 sku: String?,
                 price: String,
                 virtual: Bool,
+                manageStock: Bool,
                 stockQuantity: Decimal?,
                 stockStatusKey: String,
                 reviewsAllowed: Bool,
                 averageRating: String,
                 ratingCount: Int,
                 images: [ProductImage],
-                addOns: [ProductAddOn]) {
+                addOns: [ProductAddOn],
+                variations: [Int64],
+                bundleStockStatus: ProductStockStatus?,
+                bundleStockQuantity: Int64?) {
         self.siteID = siteID
         self.productID = productID
         self.name = name
@@ -66,13 +81,17 @@ public struct ProductListItem: GeneratedCopiable, Equatable, GeneratedFakeable {
         self.sku = sku
         self.price = price
         self.virtual = virtual
+        self.manageStock = manageStock
         self.stockQuantity = stockQuantity
         self.stockStatusKey = stockStatusKey
         self.reviewsAllowed = reviewsAllowed
         self.averageRating = averageRating
         self.ratingCount = ratingCount
         self.images = images
         self.addOns = addOns
+        self.variations = variations
+        self.bundleStockStatus = bundleStockStatus
+        self.bundleStockQuantity = bundleStockQuantity
     }
 
 }

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

@@ -228,6 +228,7 @@ extension Storage.Product: ListItemConvertible {
         name = item.name
         productTypeKey = item.productTypeKey
         statusKey = item.statusKey
+        manageStock = item.manageStock
         sku = item.sku
         price = item.price
         virtual = item.virtual
@@ -241,6 +242,9 @@ extension Storage.Product: ListItemConvertible {
         reviewsAllowed = item.reviewsAllowed
         averageRating = item.averageRating
         ratingCount = Int64(item.ratingCount)
+        variations = item.variations
+        bundleStockQuantity = item.bundleStockQuantity as? NSNumber
+        bundleStockStatus = item.bundleStockStatus?.rawValue
     }
 
     public func toListItem() -> Yosemite.ProductListItem {
@@ -252,6 +256,11 @@ extension Storage.Product: ListItemConvertible {
             quantity = Decimal(string: stockQuantity)
         }
 
+        var productBundleStockStatus: ProductStockStatus?
+        if let bundleStockStatus {
+            productBundleStockStatus = ProductStockStatus(rawValue: bundleStockStatus)
+        }
+
         return ProductListItem(siteID: siteID,
                                productID: productID,
                                name: name,
@@ -260,12 +269,16 @@ extension Storage.Product: ListItemConvertible {
                                sku: sku,
                                price: price,
                                virtual: virtual,
+                               manageStock: manageStock,
                                stockQuantity: quantity,
                                stockStatusKey: stockStatusKey,
                                reviewsAllowed: reviewsAllowed,
                                averageRating: averageRating,
                                ratingCount: Int(ratingCount),
                                images: productImages,
-                               addOns: addOnsArray.map { $0.toReadOnly() })
+                               addOns: addOnsArray.map { $0.toReadOnly() },
+                               variations: variations ?? [],
+                               bundleStockStatus: productBundleStockStatus,
+                               bundleStockQuantity: bundleStockQuantity as? Int64)
     }
 }

Modules/Sources/Yosemite/Tools/ResultsController.swift

@@ -357,4 +357,8 @@ public extension ResultsController where T: ListItemConvertible {
 
         return listItemObjects ?? []
     }
+
+    func listItem(at indexPath: IndexPath) -> T.ListItemType {
+        return controller.object(at: indexPath).toListItem()
+    }
 }