[Woo POS][Local Catalog] Update properties for POS entities

Modules/Sources/Fakes/Networking.generated.swift

@@ -753,12 +753,11 @@ extension Networking.POSProduct {
             productID: .fake(),
             name: .fake(),
             productTypeKey: .fake(),
+            fullDescription: .fake(),
+            shortDescription: .fake(),
             sku: .fake(),
             globalUniqueID: .fake(),
             price: .fake(),
-            regularPrice: .fake(),
-            salePrice: .fake(),
-            onSale: .fake(),
             downloadable: .fake(),
             parentID: .fake(),
             images: .fake(),
@@ -779,12 +778,10 @@ extension Networking.POSProductVariation {
             productVariationID: .fake(),
             attributes: .fake(),
             image: .fake(),
+            fullDescription: .fake(),
             sku: .fake(),
             globalUniqueID: .fake(),
             price: .fake(),
-            regularPrice: .fake(),
-            salePrice: .fake(),
-            onSale: .fake(),
             downloadable: .fake(),
             manageStock: .fake(),
             stockQuantity: .fake(),

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

@@ -1246,12 +1246,11 @@ extension Networking.POSProduct {
         productID: CopiableProp<Int64> = .copy,
         name: CopiableProp<String> = .copy,
         productTypeKey: CopiableProp<String> = .copy,
+        fullDescription: NullableCopiableProp<String> = .copy,
+        shortDescription: NullableCopiableProp<String> = .copy,
         sku: NullableCopiableProp<String> = .copy,
         globalUniqueID: NullableCopiableProp<String> = .copy,
         price: CopiableProp<String> = .copy,
-        regularPrice: NullableCopiableProp<String> = .copy,
-        salePrice: NullableCopiableProp<String> = .copy,
-        onSale: CopiableProp<Bool> = .copy,
         downloadable: CopiableProp<Bool> = .copy,
         parentID: CopiableProp<Int64> = .copy,
         images: CopiableProp<[ProductImage]> = .copy,
@@ -1264,12 +1263,11 @@ extension Networking.POSProduct {
         let productID = productID ?? self.productID
         let name = name ?? self.name
         let productTypeKey = productTypeKey ?? self.productTypeKey
+        let fullDescription = fullDescription ?? self.fullDescription
+        let shortDescription = shortDescription ?? self.shortDescription
         let sku = sku ?? self.sku
         let globalUniqueID = globalUniqueID ?? self.globalUniqueID
         let price = price ?? self.price
-        let regularPrice = regularPrice ?? self.regularPrice
-        let salePrice = salePrice ?? self.salePrice
-        let onSale = onSale ?? self.onSale
         let downloadable = downloadable ?? self.downloadable
         let parentID = parentID ?? self.parentID
         let images = images ?? self.images
@@ -1283,12 +1281,11 @@ extension Networking.POSProduct {
             productID: productID,
             name: name,
             productTypeKey: productTypeKey,
+            fullDescription: fullDescription,
+            shortDescription: shortDescription,
             sku: sku,
             globalUniqueID: globalUniqueID,
             price: price,
-            regularPrice: regularPrice,
-            salePrice: salePrice,
-            onSale: onSale,
             downloadable: downloadable,
             parentID: parentID,
             images: images,
@@ -1307,12 +1304,10 @@ extension Networking.POSProductVariation {
         productVariationID: CopiableProp<Int64> = .copy,
         attributes: CopiableProp<[ProductVariationAttribute]> = .copy,
         image: NullableCopiableProp<ProductImage> = .copy,
+        fullDescription: NullableCopiableProp<String> = .copy,
         sku: NullableCopiableProp<String> = .copy,
         globalUniqueID: NullableCopiableProp<String> = .copy,
         price: CopiableProp<String> = .copy,
-        regularPrice: NullableCopiableProp<String> = .copy,
-        salePrice: NullableCopiableProp<String> = .copy,
-        onSale: CopiableProp<Bool> = .copy,
         downloadable: CopiableProp<Bool> = .copy,
         manageStock: CopiableProp<Bool> = .copy,
         stockQuantity: NullableCopiableProp<Decimal> = .copy,
@@ -1323,12 +1318,10 @@ extension Networking.POSProductVariation {
         let productVariationID = productVariationID ?? self.productVariationID
         let attributes = attributes ?? self.attributes
         let image = image ?? self.image
+        let fullDescription = fullDescription ?? self.fullDescription
         let sku = sku ?? self.sku
         let globalUniqueID = globalUniqueID ?? self.globalUniqueID
         let price = price ?? self.price
-        let regularPrice = regularPrice ?? self.regularPrice
-        let salePrice = salePrice ?? self.salePrice
-        let onSale = onSale ?? self.onSale
         let downloadable = downloadable ?? self.downloadable
         let manageStock = manageStock ?? self.manageStock
         let stockQuantity = stockQuantity ?? self.stockQuantity
@@ -1340,12 +1333,10 @@ extension Networking.POSProductVariation {
             productVariationID: productVariationID,
             attributes: attributes,
             image: image,
+            fullDescription: fullDescription,
             sku: sku,
             globalUniqueID: globalUniqueID,
             price: price,
-            regularPrice: regularPrice,
-            salePrice: salePrice,
-            onSale: onSale,
             downloadable: downloadable,
             manageStock: manageStock,
             stockQuantity: stockQuantity,

Modules/Sources/Networking/Model/POSProduct.swift

@@ -12,13 +12,13 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
     public let productID: Int64
     public let name: String
     public let productTypeKey: String
+    public let fullDescription: String?
+    // periphery:ignore - Will be used for search in future
+    public let shortDescription: String?
     public let sku: String?
     public let globalUniqueID: String?
 
     public let price: String
-    public let regularPrice: String?
-    public let salePrice: String?
-    public let onSale: Bool
 
     public let downloadable: Bool
 
@@ -47,12 +47,11 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
                 productID: Int64,
                 name: String,
                 productTypeKey: String,
+                fullDescription: String?,
+                shortDescription: String?,
                 sku: String?,
                 globalUniqueID: String?,
                 price: String,
-                regularPrice: String?,
-                salePrice: String?,
-                onSale: Bool,
                 downloadable: Bool,
                 parentID: Int64,
                 images: [ProductImage],
@@ -64,13 +63,12 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
         self.productID = productID
         self.name = name
         self.productTypeKey = productTypeKey
+        self.fullDescription = fullDescription
+        self.shortDescription = shortDescription
         self.sku = sku
         self.globalUniqueID = globalUniqueID
 
         self.price = price
-        self.regularPrice = regularPrice
-        self.salePrice = salePrice
-        self.onSale = onSale
 
         self.downloadable = downloadable
 
@@ -101,6 +99,8 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
         let productID = try container.decode(Int64.self, forKey: .productID)
         let name = try container.decode(String.self, forKey: .name)
         let productTypeKey = try container.decode(String.self, forKey: .productTypeKey)
+        let fullDescription = try container.decodeIfPresent(String.self, forKey: .fullDescription)
+        let shortDescription = try container.decodeIfPresent(String.self, forKey: .shortDescription)
         let sku = container.failsafeDecodeIfPresent(
             targetType: String.self,
             forKey: .sku,
@@ -111,24 +111,6 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
             targetType: String.self,
             forKey: .price,
             alternativeTypes: [decimalString]) ?? ""
-        let regularPrice = container.failsafeDecodeIfPresent(
-            targetType: String.self,
-            forKey: .regularPrice,
-            alternativeTypes: [decimalString])
-        let onSale = container.failsafeDecodeIfPresent(
-            targetType: Bool.self,
-            forKey: .onSale,
-            alternativeTypes: [ .string(transform: { NSString(string: $0).boolValue })]) ?? false
-
-        // Even though a plain install of WooCommerce Core provides string values,
-        // some plugins alter the field value from String to Int or Decimal.
-        let salePrice = container.failsafeDecodeIfPresent(
-            targetType: String.self,
-            forKey: .salePrice,
-            shouldDecodeTargetTypeFirst: false,
-            alternativeTypes: [
-                .string(transform: { (onSale && $0.isEmpty) ? "0" : $0 }),
-                decimalString])
 
         let downloadable = try container.decode(Bool.self, forKey: .downloadable)
 
@@ -146,12 +128,11 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
                   productID: productID,
                   name: name,
                   productTypeKey: productTypeKey,
+                  fullDescription: fullDescription,
+                  shortDescription: shortDescription,
                   sku: sku,
                   globalUniqueID: globalUniqueID,
                   price: price,
-                  regularPrice: regularPrice,
-                  salePrice: salePrice,
-                  onSale: onSale,
                   downloadable: downloadable,
                   parentID: parentID,
                   images: images,
@@ -179,12 +160,11 @@ private extension POSProduct {
         case productID = "id"
         case name
         case productTypeKey = "type"
+        case fullDescription = "description"
+        case shortDescription = "short_description"
         case sku
         case globalUniqueID = "global_unique_id"
         case price
-        case regularPrice = "regular_price"
-        case salePrice = "sale_price"
-        case onSale = "on_sale"
         case downloadable
         case parentID = "parent_id"
         case images

Modules/Sources/Networking/Model/POSProductVariation.swift

@@ -17,14 +17,12 @@ public struct POSProductVariation: Codable, Equatable, GeneratedCopiable, Genera
     public let attributes: [ProductVariationAttribute]
     public let image: ProductImage?
 
+    // periphery:ignore - Will be used for search in future
+    public let fullDescription: String?
     public let sku: String?
     public let globalUniqueID: String?
 
     public let price: String
-    public let regularPrice: String?
-    public let salePrice: String?
-    public let onSale: Bool
-
     public let downloadable: Bool
 
     public let manageStock: Bool
@@ -40,12 +38,10 @@ public struct POSProductVariation: Codable, Equatable, GeneratedCopiable, Genera
                 productVariationID: Int64,
                 attributes: [ProductVariationAttribute],
                 image: ProductImage?,
+                fullDescription: String?,
                 sku: String?,
                 globalUniqueID: String?,
                 price: String,
-                regularPrice: String?,
-                salePrice: String?,
-                onSale: Bool,
                 downloadable: Bool,
                 manageStock: Bool,
                 stockQuantity: Decimal?,
@@ -55,12 +51,10 @@ public struct POSProductVariation: Codable, Equatable, GeneratedCopiable, Genera
         self.productVariationID = productVariationID
         self.attributes = attributes
         self.image = image
+        self.fullDescription = fullDescription
         self.sku = sku
         self.globalUniqueID = globalUniqueID
         self.price = price
-        self.regularPrice = regularPrice
-        self.salePrice = salePrice
-        self.onSale = onSale
         self.downloadable = downloadable
         self.manageStock = manageStock
         self.stockQuantity = stockQuantity
@@ -81,6 +75,7 @@ public struct POSProductVariation: Codable, Equatable, GeneratedCopiable, Genera
         let productID = try container.decode(Int64.self, forKey: .productID)
         let attributes = try container.decode([ProductVariationAttribute].self, forKey: .attributes)
         let image = try container.decodeIfPresent(ProductImage.self, forKey: .image)
+        let fullDescription = try container.decodeIfPresent(String.self, forKey: .fullDescription)
         let sku = container.failsafeDecodeIfPresent(
             targetType: String.self,
             forKey: .sku,
@@ -90,18 +85,6 @@ public struct POSProductVariation: Codable, Equatable, GeneratedCopiable, Genera
             targetType: String.self,
             forKey: .price,
             alternativeTypes: [decimalString]) ?? ""
-        let regularPrice = container.failsafeDecodeIfPresent(
-            targetType: String.self,
-            forKey: .regularPrice,
-            alternativeTypes: [decimalString])
-        let salePrice = container.failsafeDecodeIfPresent(
-            targetType: String.self,
-            forKey: .salePrice,
-            alternativeTypes: [decimalString])
-        let onSale = container.failsafeDecodeIfPresent(
-            targetType: Bool.self,
-            forKey: .onSale,
-            alternativeTypes: [.string(transform: { NSString(string: $0).boolValue })]) ?? false
         let downloadable = try container.decode(Bool.self, forKey: .downloadable)
         let manageStock = container.failsafeDecodeIfPresent(
             targetType: Bool.self,
@@ -125,12 +108,10 @@ public struct POSProductVariation: Codable, Equatable, GeneratedCopiable, Genera
                   productVariationID: productVariationID,
                   attributes: attributes,
                   image: image,
+                  fullDescription: fullDescription,
                   sku: sku,
                   globalUniqueID: globalUniqueID,
                   price: price,
-                  regularPrice: regularPrice,
-                  salePrice: salePrice,
-                  onSale: onSale,
                   downloadable: downloadable,
                   manageStock: manageStock,
                   stockQuantity: stockQuantity,
@@ -158,9 +139,7 @@ private extension POSProductVariation {
         case attributes
         case image
         case price
-        case regularPrice = "regular_price"
-        case salePrice = "sale_price"
-        case onSale = "on_sale"
+        case fullDescription = "description"
         case sku
         case globalUniqueID = "global_unique_id"
         case downloadable

Modules/Sources/Networking/Remote/POSCatalogSyncRemote.swift

@@ -189,12 +189,10 @@ private extension POSProduct {
             productVariationID: productID,
             attributes: variationAttributes,
             image: firstImage,
+            fullDescription: fullDescription,
             sku: sku,
             globalUniqueID: globalUniqueID,
             price: price,
-            regularPrice: regularPrice,
-            salePrice: salePrice,
-            onSale: onSale,
             downloadable: downloadable,
             manageStock: manageStock,
             stockQuantity: stockQuantity,

Modules/Sources/Storage/GRDB/Migrations/V001InitialSchema.swift

@@ -43,6 +43,10 @@ struct V001InitialSchema {
             productTable.column("downloadable", .boolean).notNull()
 
             productTable.column("parentID", .integer).notNull()
+
+            productTable.column("manageStock", .boolean).notNull()
+            productTable.column("stockQuantity", .double)
+            productTable.column("stockStatusKey", .text).notNull()
         }
     }
 
@@ -87,6 +91,10 @@ struct V001InitialSchema {
             productVariationTable.column("downloadable", .boolean).notNull()
 
             productVariationTable.column("fullDescription", .text)
+
+            productVariationTable.column("manageStock", .boolean).notNull()
+            productVariationTable.column("stockQuantity", .double)
+            productVariationTable.column("stockStatusKey", .text).notNull()
         }
     }
 

Modules/Sources/Yosemite/PointOfSale/Items/POSProductOrVariationResolver.swift

@@ -83,12 +83,10 @@ private extension POSProduct {
                 productVariationID: productID,
                 attributes: try attributes.compactMap { try $0.toProductVariationAttribute() },
                 image: images.first,
+                fullDescription: fullDescription,
                 sku: sku,
                 globalUniqueID: globalUniqueID,
                 price: price,
-                regularPrice: regularPrice,
-                salePrice: salePrice,
-                onSale: onSale,
                 downloadable: downloadable,
                 manageStock: manageStock,
                 stockQuantity: stockQuantity,