Use optional String instead of Int64 to avoid defaulting to 0 that could lead to unexpected behavior.

Author: toupper

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

@@ -493,7 +493,7 @@ extension OrderItemRefund {
         name: CopiableProp<String> = .copy,
         productID: CopiableProp<Int64> = .copy,
         variationID: CopiableProp<Int64> = .copy,
-        refundedItemID: CopiableProp<Int64> = .copy,
+        refundedItemID: CopiableProp<String> = .copy,
         quantity: CopiableProp<Decimal> = .copy,
         price: CopiableProp<NSDecimalNumber> = .copy,
         sku: NullableCopiableProp<String> = .copy,

Networking/Networking/Model/Refund/OrderItemRefund.swift

@@ -8,7 +8,7 @@ public struct OrderItemRefund: Codable, Equatable, GeneratedFakeable, GeneratedC
     public let name: String
     public let productID: Int64
     public let variationID: Int64
-    public let refundedItemID: Int64?
+    public let refundedItemID: String?
     public let quantity: Decimal
 
     /// Price is a currency.
@@ -31,7 +31,7 @@ public struct OrderItemRefund: Codable, Equatable, GeneratedFakeable, GeneratedC
                 name: String,
                 productID: Int64,
                 variationID: Int64,
-                refundedItemID: Int64?,
+                refundedItemID: String?,
                 quantity: Decimal,
                 price: NSDecimalNumber,
                 sku: String?,
@@ -80,11 +80,7 @@ public struct OrderItemRefund: Codable, Equatable, GeneratedFakeable, GeneratedC
         let totalTax = try container.decode(String.self, forKey: .totalTax)
 
         let allOrderItemRefundMetaData = try container.decode([OrderItemRefundMetaData].self, forKey: .metadata)
-
-        var refundedItemID: Int64?
-        if let refundedItemIDString = allOrderItemRefundMetaData.first(where: { $0.key == "_refunded_item_id" })?.value {
-            refundedItemID = Int64(refundedItemIDString)
-        }
+        let refundedItemID = allOrderItemRefundMetaData.first(where: { $0.key == "_refunded_item_id" })?.value
 
         // initialize the struct
         self.init(itemID: itemID,

Storage/Storage/Model/OrderItemRefund+CoreDataProperties.swift

@@ -12,7 +12,7 @@ extension OrderItemRefund {
     @NSManaged public var name: String?
     @NSManaged public var productID: Int64
     @NSManaged public var variationID: Int64
-    @NSManaged public var refundedItemID: Int64
+    @NSManaged public var refundedItemID: String?
     @NSManaged public var quantity: NSDecimalNumber?
     @NSManaged public var price: NSDecimalNumber?
     @NSManaged public var sku: String?

Storage/Storage/Model/WooCommerce.xcdatamodeld/Model 70.xcdatamodel/contents

@@ -210,7 +210,7 @@
         <attribute name="price" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
         <attribute name="productID" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="quantity" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
-        <attribute name="refundedItemID" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="refundedItemID" optional="YES" attributeType="String"/>
         <attribute name="sku" optional="YES" attributeType="String"/>
         <attribute name="subtotal" optional="YES" attributeType="String"/>
         <attribute name="subtotalTax" optional="YES" attributeType="String"/>

WooCommerce/Classes/Tools/AggregateData/AggregateDataHelper.swift

@@ -49,7 +49,13 @@ final class AggregateDataHelper {
                 .compactMap { currency.convertToDecimal($0.total) }
                 .reduce(NSDecimalNumber(value: 0), { $0.adding($1) })
 
-            let attributes = orderItems.first(where: { $0.itemID == item.refundedItemID })?.attributes ?? []
+            let attributes = orderItems.first(where: {
+                guard let refundedItemID = item.refundedItemID else {
+                    return false
+                }
+
+                return $0.itemID == Int64(refundedItemID)
+            })?.attributes ?? []
 
             return AggregateOrderItem(
                 productID: item.productID,

Yosemite/Yosemite/Model/Storage/OrderItemRefund+ReadOnlyConvertible.swift

@@ -13,7 +13,7 @@ extension Storage.OrderItemRefund: ReadOnlyConvertible {
         name = orderItemRefund.name
         productID = orderItemRefund.productID
         variationID = orderItemRefund.variationID
-        refundedItemID = orderItemRefund.refundedItemID ?? 0
+        refundedItemID = orderItemRefund.refundedItemID
         quantity = NSDecimalNumber(decimal: orderItemRefund.quantity)
         price = orderItemRefund.price
         sku = orderItemRefund.sku