Skip to content

Commit bd5c668

Browse files
joshhealdjoshheald
committed
5976 Correct Charge Storage model optionality
1 parent 46a7ef0 commit bd5c668

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

‎Storage/Storage/Model/WCPayCardPaymentDetails+CoreDataProperties.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ extension WCPayCardPaymentDetails {
88
return NSFetchRequest<WCPayCardPaymentDetails>(entityName: "WCPayCardPaymentDetails")
99
}
1010

11-
@NSManaged public var brand: String?
12-
@NSManaged public var last4: String?
13-
@NSManaged public var funding: String?
11+
@NSManaged public var brand: String
12+
@NSManaged public var last4: String
13+
@NSManaged public var funding: String
1414
@NSManaged public var charge: WCPayCharge?
1515

1616
}

‎Storage/Storage/Model/WCPayCardPresentPaymentDetails+CoreDataProperties.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ extension WCPayCardPresentPaymentDetails {
88
return NSFetchRequest<WCPayCardPresentPaymentDetails>(entityName: "WCPayCardPresentPaymentDetails")
99
}
1010

11-
@NSManaged public var brand: String?
12-
@NSManaged public var last4: String?
13-
@NSManaged public var funding: String?
11+
@NSManaged public var brand: String
12+
@NSManaged public var last4: String
13+
@NSManaged public var funding: String
1414
@NSManaged public var receipt: WCPayCardPresentReceiptDetails?
1515
@NSManaged public var charge: WCPayCharge?
1616

‎Storage/Storage/Model/WCPayCardPresentReceiptDetails+CoreDataProperties.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ extension WCPayCardPresentReceiptDetails {
88
return NSFetchRequest<WCPayCardPresentReceiptDetails>(entityName: "WCPayCardPresentReceiptDetails")
99
}
1010

11-
@NSManaged public var accountType: String?
12-
@NSManaged public var applicationPreferredName: String?
13-
@NSManaged public var dedicatedFileName: String?
11+
@NSManaged public var accountType: String
12+
@NSManaged public var applicationPreferredName: String
13+
@NSManaged public var dedicatedFileName: String
1414
@NSManaged public var cardPresentPayment: WCPayCardPresentPaymentDetails?
1515

1616
}

‎Storage/Storage/Model/WCPayCharge+CoreDataProperties.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ extension WCPayCharge {
99
}
1010

1111
@NSManaged public var siteID: Int64
12-
@NSManaged public var id: String?
12+
@NSManaged public var chargeID: String
1313
@NSManaged public var amount: Int64
1414
@NSManaged public var amountCaptured: Int64
1515
@NSManaged public var amountRefunded: Int64
1616
@NSManaged public var authorizationCode: String?
1717
@NSManaged public var captured: Bool
18-
@NSManaged public var created: Date?
19-
@NSManaged public var currency: String?
18+
@NSManaged public var created: Date
19+
@NSManaged public var currency: String
2020
@NSManaged public var paid: Bool
2121
@NSManaged public var paymentIntentID: String?
22-
@NSManaged public var paymentMethodID: String?
22+
@NSManaged public var paymentMethodID: String
2323
@NSManaged public var refunded: Bool
24-
@NSManaged public var status: String?
25-
@NSManaged public var paymentMethodType: String?
24+
@NSManaged public var status: String
25+
@NSManaged public var paymentMethodType: String
2626
@NSManaged public var cardDetails: WCPayCardPaymentDetails?
2727
@NSManaged public var cardPresentDetails: WCPayCardPresentPaymentDetails?
2828

‎Storage/Storage/Model/WooCommerce.xcdatamodeld/Model 64.xcdatamodel/contents‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -726,9 +726,9 @@
726726
<relationship name="stats" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="TopEarnerStats" inverseName="items" inverseEntity="TopEarnerStats"/>
727727
</entity>
728728
<entity name="WCPayCardPaymentDetails" representedClassName="WCPayCardPaymentDetails" syncable="YES">
729-
<attribute name="brand" optional="YES" attributeType="String"/>
730-
<attribute name="funding" optional="YES" attributeType="String"/>
731-
<attribute name="last4" optional="YES" attributeType="String"/>
729+
<attribute name="brand" attributeType="String"/>
730+
<attribute name="funding" attributeType="String"/>
731+
<attribute name="last4" attributeType="String"/>
732732
<relationship name="charge" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="WCPayCharge" inverseName="cardDetails" inverseEntity="WCPayCharge"/>
733733
</entity>
734734
<entity name="WCPayCardPresentPaymentDetails" representedClassName="WCPayCardPresentPaymentDetails" syncable="YES">
@@ -750,9 +750,9 @@
750750
<attribute name="amountRefunded" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
751751
<attribute name="authorizationCode" optional="YES" attributeType="String"/>
752752
<attribute name="captured" attributeType="Boolean" usesScalarValueType="YES"/>
753+
<attribute name="chargeID" attributeType="String"/>
753754
<attribute name="created" attributeType="Date" usesScalarValueType="NO"/>
754755
<attribute name="currency" attributeType="String"/>
755-
<attribute name="id" attributeType="String"/>
756756
<attribute name="paid" attributeType="Boolean" usesScalarValueType="YES"/>
757757
<attribute name="paymentIntentID" optional="YES" attributeType="String"/>
758758
<attribute name="paymentMethodID" attributeType="String"/>
@@ -827,9 +827,9 @@
827827
<element name="TaxClass" positionX="-529.7734375" positionY="-56.109375" width="128" height="88"/>
828828
<element name="TopEarnerStats" positionX="135.3828125" positionY="28.91015625" width="128" height="118"/>
829829
<element name="TopEarnerStatsItem" positionX="308.53125" positionY="29.1484375" width="128" height="165"/>
830-
<element name="WCPayCharge" positionX="-684" positionY="54" width="128" height="284"/>
831830
<element name="WCPayCardPaymentDetails" positionX="-675" positionY="72" width="128" height="89"/>
832831
<element name="WCPayCardPresentPaymentDetails" positionX="-666" positionY="72" width="128" height="104"/>
833832
<element name="WCPayCardPresentReceiptDetails" positionX="-657" positionY="81" width="128" height="89"/>
833+
<element name="WCPayCharge" positionX="-684" positionY="54" width="128" height="284"/>
834834
</elements>
835835
</model>

‎Storage/Storage/Tools/StorageType+Extensions.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ public extension StorageType {
587587
/// Returns a charge with a specified `siteID` and `chargeID`
588588
///
589589
func loadWCPayCharge(siteID: Int64, chargeID: String) -> WCPayCharge? {
590-
let predicate = \WCPayCharge.siteID == siteID && \WCPayCharge.id == chargeID
590+
let predicate = \WCPayCharge.siteID == siteID && \WCPayCharge.chargeID == chargeID
591591
return firstObject(ofType: WCPayCharge.self, matching: predicate)
592592
}
593593

‎Storage/StorageTests/CoreData/MigrationTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1494,7 +1494,7 @@ private extension MigrationTests {
14941494
func insertWCPayCharge(to context: NSManagedObjectContext) -> NSManagedObject {
14951495
context.insert(entityName: "WCPayCharge", properties: [
14961496
"siteID": 1234,
1497-
"id": "ch_idhash",
1497+
"chargeID": "ch_idhash",
14981498
"amount": 12,
14991499
"amountCaptured": 12,
15001500
"amountRefunded": 3,

‎Storage/StorageTests/Tools/StorageTypeExtensionsTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,11 +1174,11 @@ final class StorageTypeExtensionsTests: XCTestCase {
11741174
func test_load_WCPayCharge_by_siteID_and_chargeID() throws {
11751175
// Given
11761176
let charge1 = storage.insertNewObject(ofType: WCPayCharge.self)
1177-
charge1.id = "ch_1"
1177+
charge1.chargeID = "ch_1"
11781178
charge1.siteID = sampleSiteID
11791179

11801180
let charge2 = storage.insertNewObject(ofType: WCPayCharge.self)
1181-
charge2.id = "ch_2"
1181+
charge2.chargeID = "ch_2"
11821182
charge2.siteID = sampleSiteID
11831183

11841184
// When

0 commit comments

Comments
 (0)