Remove unused properties from POS models

joshheald · joshheald · commit 2ad06b2eafc3 · 2025-08-29T14:48:18.000+01:00
diff --git a/Modules/Sources/Fakes/Networking.generated.swift b/Modules/Sources/Fakes/Networking.generated.swift
@@ -756,9 +756,6 @@ extension Networking.POSProduct {
             sku: .fake(),
             globalUniqueID: .fake(),
             price: .fake(),
-            regularPrice: .fake(),
-            salePrice: .fake(),
-            onSale: .fake(),
             downloadable: .fake(),
             parentID: .fake(),
             images: .fake(),
@@ -782,9 +779,6 @@ extension Networking.POSProductVariation {
             sku: .fake(),
             globalUniqueID: .fake(),
             price: .fake(),
-            regularPrice: .fake(),
-            salePrice: .fake(),
-            onSale: .fake(),
             downloadable: .fake(),
             manageStock: .fake(),
             stockQuantity: .fake(),
diff --git a/Modules/Sources/Networking/Model/Copiable/Models+Copiable.generated.swift b/Modules/Sources/Networking/Model/Copiable/Models+Copiable.generated.swift
@@ -1249,9 +1249,6 @@ extension Networking.POSProduct {
         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,
@@ -1267,9 +1264,6 @@ extension Networking.POSProduct {
         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
@@ -1286,9 +1280,6 @@ extension Networking.POSProduct {
             sku: sku,
             globalUniqueID: globalUniqueID,
             price: price,
-            regularPrice: regularPrice,
-            salePrice: salePrice,
-            onSale: onSale,
             downloadable: downloadable,
             parentID: parentID,
             images: images,
@@ -1310,9 +1301,6 @@ extension Networking.POSProductVariation {
         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,
@@ -1326,9 +1314,6 @@ extension Networking.POSProductVariation {
         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
@@ -1343,9 +1328,6 @@ extension Networking.POSProductVariation {
             sku: sku,
             globalUniqueID: globalUniqueID,
             price: price,
-            regularPrice: regularPrice,
-            salePrice: salePrice,
-            onSale: onSale,
             downloadable: downloadable,
             manageStock: manageStock,
             stockQuantity: stockQuantity,
diff --git a/Modules/Sources/Networking/Model/POSProduct.swift b/Modules/Sources/Networking/Model/POSProduct.swift
@@ -16,9 +16,6 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
     public let globalUniqueID: String?
 
     public let price: String
-    public let regularPrice: String?
-    public let salePrice: String?
-    public let onSale: Bool
 
     public let downloadable: Bool
 
@@ -50,9 +47,6 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
                 sku: String?,
                 globalUniqueID: String?,
                 price: String,
-                regularPrice: String?,
-                salePrice: String?,
-                onSale: Bool,
                 downloadable: Bool,
                 parentID: Int64,
                 images: [ProductImage],
@@ -68,9 +62,6 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
         self.globalUniqueID = globalUniqueID
 
         self.price = price
-        self.regularPrice = regularPrice
-        self.salePrice = salePrice
-        self.onSale = onSale
 
         self.downloadable = downloadable
 
@@ -111,24 +102,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)
 
@@ -149,9 +122,6 @@ public struct POSProduct: Codable, Equatable, GeneratedCopiable, GeneratedFakeab
                   sku: sku,
                   globalUniqueID: globalUniqueID,
                   price: price,
-                  regularPrice: regularPrice,
-                  salePrice: salePrice,
-                  onSale: onSale,
                   downloadable: downloadable,
                   parentID: parentID,
                   images: images,
@@ -182,9 +152,6 @@ private extension POSProduct {
         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
diff --git a/Modules/Sources/Networking/Model/POSProductVariation.swift b/Modules/Sources/Networking/Model/POSProductVariation.swift
@@ -21,10 +21,6 @@ public struct POSProductVariation: Codable, Equatable, GeneratedCopiable, Genera
     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
@@ -43,9 +39,6 @@ public struct POSProductVariation: Codable, Equatable, GeneratedCopiable, Genera
                 sku: String?,
                 globalUniqueID: String?,
                 price: String,
-                regularPrice: String?,
-                salePrice: String?,
-                onSale: Bool,
                 downloadable: Bool,
                 manageStock: Bool,
                 stockQuantity: Decimal?,
@@ -58,9 +51,6 @@ public struct POSProductVariation: Codable, Equatable, GeneratedCopiable, Genera
         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
@@ -90,18 +80,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,
@@ -128,9 +106,6 @@ public struct POSProductVariation: Codable, Equatable, GeneratedCopiable, Genera
                   sku: sku,
                   globalUniqueID: globalUniqueID,
                   price: price,
-                  regularPrice: regularPrice,
-                  salePrice: salePrice,
-                  onSale: onSale,
                   downloadable: downloadable,
                   manageStock: manageStock,
                   stockQuantity: stockQuantity,
@@ -158,9 +133,6 @@ private extension POSProductVariation {
         case attributes
         case image
         case price
-        case regularPrice = "regular_price"
-        case salePrice = "sale_price"
-        case onSale = "on_sale"
         case sku
         case globalUniqueID = "global_unique_id"
         case downloadable
diff --git a/Modules/Sources/Networking/Remote/POSCatalogSyncRemote.swift b/Modules/Sources/Networking/Remote/POSCatalogSyncRemote.swift
@@ -192,9 +192,6 @@ private extension POSProduct {
             sku: sku,
             globalUniqueID: globalUniqueID,
             price: price,
-            regularPrice: regularPrice,
-            salePrice: salePrice,
-            onSale: onSale,
             downloadable: downloadable,
             manageStock: manageStock,
             stockQuantity: stockQuantity,
diff --git a/Modules/Sources/Yosemite/PointOfSale/Items/POSProductOrVariationResolver.swift b/Modules/Sources/Yosemite/PointOfSale/Items/POSProductOrVariationResolver.swift
@@ -86,9 +86,6 @@ private extension POSProduct {
                 sku: sku,
                 globalUniqueID: globalUniqueID,
                 price: price,
-                regularPrice: regularPrice,
-                salePrice: salePrice,
-                onSale: onSale,
                 downloadable: downloadable,
                 manageStock: manageStock,
                 stockQuantity: stockQuantity,
diff --git a/Modules/Tests/NetworkingTests/Remote/POSCatalogSyncRemoteTests.swift b/Modules/Tests/NetworkingTests/Remote/POSCatalogSyncRemoteTests.swift
@@ -396,8 +396,6 @@ struct POSCatalogSyncRemoteTests {
         #expect(simpleProduct.globalUniqueID == "61732018")
         #expect(simpleProduct.name == "Synergistic Copper Clock")
         #expect(simpleProduct.price == "220")
-        #expect(simpleProduct.regularPrice == "230.04")
-        #expect(simpleProduct.onSale == true)
         #expect(simpleProduct.images.count == 1)
         #expect(simpleProduct.images.first?.src == "https://example.com/wp-content/uploads/2025/08/img-ad.png")
 
@@ -408,8 +406,6 @@ struct POSCatalogSyncRemoteTests {
         #expect(variableProduct.globalUniqueID == "")
         #expect(variableProduct.name == "Incredible Silk Chair")
         #expect(variableProduct.price == "134.58")
-        #expect(variableProduct.regularPrice == "")
-        #expect(variableProduct.onSale == false)
         #expect(variableProduct.images.count == 1)
         #expect(variableProduct.images.first?.src == "https://example.com/wp-content/uploads/2025/08/img-harum.png")
         #expect(variableProduct.attributes == [
@@ -431,8 +427,6 @@ struct POSCatalogSyncRemoteTests {
         #expect(variation.sku == "")
         #expect(variation.globalUniqueID == "")
         #expect(variation.price == "330.34")
-        #expect(variation.regularPrice == "330.34")
-        #expect(variation.onSale == false)
         #expect(variation.attributes.count == 3)
         #expect(variation.image?.src == "https://example.com/wp-content/uploads/2025/08/img-quae.png")
         #expect(variation.attributes == [
diff --git a/Modules/Tests/NetworkingTests/Remote/POSProductsNetworkingTests.swift b/Modules/Tests/NetworkingTests/Remote/POSProductsNetworkingTests.swift
@@ -186,9 +186,6 @@ struct POSProductsNetworkingTests {
         #expect(fieldNames.contains("sku"))
         #expect(fieldNames.contains("global_unique_id"))
         #expect(fieldNames.contains("price"))
-        #expect(fieldNames.contains("regular_price"))
-        #expect(fieldNames.contains("sale_price"))
-        #expect(fieldNames.contains("on_sale"))
         #expect(fieldNames.contains("downloadable"))
         #expect(fieldNames.contains("parent_id"))
         #expect(fieldNames.contains("images"))
diff --git a/Modules/Tests/NetworkingTests/Remote/ProductVariationsRemoteTests.swift b/Modules/Tests/NetworkingTests/Remote/ProductVariationsRemoteTests.swift
@@ -177,9 +177,6 @@ final class ProductVariationsRemoteTests: XCTestCase {
 
         let expectedPrice = 12
         XCTAssertEqual(firstVariation.price, "\(expectedPrice)")
-        XCTAssertEqual(firstVariation.regularPrice, "\(expectedPrice)")
-        XCTAssertEqual(firstVariation.salePrice, "8")
-        XCTAssertFalse(firstVariation.onSale)
 
         let expectedAttributes: [ProductVariationAttribute] = [
             ProductVariationAttribute(id: 0, name: "Darkness", option: "99%"),
