Skip to content

Commit b019b67

Browse files
iamgabrielmaiamgabrielma
authored
Merge pull request #7860 from woocommerce/issue/7741-add-siteID-to-data-model
Add `siteID` and `keyword` attributes to `Customer` and `CustomerSearchResult` entities
2 parents dfae9a9 + 07ae1ca commit b019b67

File tree

8 files changed

+4588
-36
lines changed

8 files changed

+4588
-36
lines changed

‎Storage/Storage.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
6889089B28F66DED0081A07E /* Customer+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6889089728F66DED0081A07E /* Customer+CoreDataClass.swift */; };
108108
6889089C28F66DED0081A07E /* Customer+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6889089828F66DED0081A07E /* Customer+CoreDataProperties.swift */; };
109109
6889089D28F66DED0081A07E /* CustomerSearchResult+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6889089928F66DED0081A07E /* CustomerSearchResult+CoreDataClass.swift */; };
110+
688908AA28FD00320081A07E /* WooCommerceModelV74toV75.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 688908A928FD00320081A07E /* WooCommerceModelV74toV75.xcmappingmodel */; };
110111
68BC97FB41770051C287D1A8 /* Pods_StorageTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47556EE256120BEE49FF5FD3 /* Pods_StorageTests.framework */; };
111112
7028A41485A08AC748206184 /* Pods_Storage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF3D3B298350F68191CD1DAD /* Pods_Storage.framework */; };
112113
7426A05020F69D00002A4E07 /* OrderCoupon+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7426A04E20F69D00002A4E07 /* OrderCoupon+CoreDataClass.swift */; };
@@ -350,6 +351,8 @@
350351
6889089728F66DED0081A07E /* Customer+CoreDataClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Customer+CoreDataClass.swift"; sourceTree = "<group>"; };
351352
6889089828F66DED0081A07E /* Customer+CoreDataProperties.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Customer+CoreDataProperties.swift"; sourceTree = "<group>"; };
352353
6889089928F66DED0081A07E /* CustomerSearchResult+CoreDataClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CustomerSearchResult+CoreDataClass.swift"; sourceTree = "<group>"; };
354+
688908A328F8EB360081A07E /* Model 75.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model 75.xcdatamodel"; sourceTree = "<group>"; };
355+
688908A928FD00320081A07E /* WooCommerceModelV74toV75.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = WooCommerceModelV74toV75.xcmappingmodel; sourceTree = "<group>"; };
353356
7426A04E20F69D00002A4E07 /* OrderCoupon+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OrderCoupon+CoreDataClass.swift"; sourceTree = "<group>"; };
354357
7426A04F20F69D00002A4E07 /* OrderCoupon+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OrderCoupon+CoreDataProperties.swift"; sourceTree = "<group>"; };
355358
7426A05220F69DA4002A4E07 /* OrderItem+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OrderItem+CoreDataClass.swift"; sourceTree = "<group>"; };
@@ -688,6 +691,7 @@
688691
574CFDEB25A531C90044730C /* WooCommerceModelV39toV40.xcmappingmodel */,
689692
0284BD8825BAC83700D00C06 /* WooCommerceModelV42toV43.xcmappingmodel */,
690693
CCD2E70625DE9AAA00BD975D /* WooCommerceModelV45toV46.xcmappingmodel */,
694+
688908A928FD00320081A07E /* WooCommerceModelV74toV75.xcmappingmodel */,
691695
);
692696
name = "Mapping Models";
693697
sourceTree = "<group>";
@@ -1202,6 +1206,7 @@
12021206
CE4FD44B2350EB7600A16B31 /* OrderItemTaxRefund+CoreDataClass.swift in Sources */,
12031207
B54CA5BB20A4BD2800F38CD1 /* NSManagedObject+Object.swift in Sources */,
12041208
025CA2BD238EB86200B05C81 /* ProductShippingClass+CoreDataClass.swift in Sources */,
1209+
688908AA28FD00320081A07E /* WooCommerceModelV74toV75.xcmappingmodel in Sources */,
12051210
D821645D2239F5FC00F46F89 /* ShipmentTrackingProviderGroup+CoreDataClass.swift in Sources */,
12061211
D88E233B25AE08C90023F3B1 /* OrderFeeLine+CoreDataClass.swift in Sources */,
12071212
0371C38128781E2900277E2C /* FeatureAnnouncementCampaignSettings.swift in Sources */,
@@ -1807,6 +1812,7 @@
18071812
DEC51AA4275B41BE009F3DF4 /* WooCommerce.xcdatamodeld */ = {
18081813
isa = XCVersionGroup;
18091814
children = (
1815+
688908A328F8EB360081A07E /* Model 75.xcdatamodel */,
18101816
6889088D28F668330081A07E /* Model 74.xcdatamodel */,
18111817
027CE79D28D167D0001B8D0E /* Model 73.xcdatamodel */,
18121818
0372D8B828AFD9530041028A /* Model 72.xcdatamodel */,
@@ -1882,7 +1888,7 @@
18821888
DEC51ADE275B41BE009F3DF4 /* Model 47.xcdatamodel */,
18831889
DEC51ADF275B41BE009F3DF4 /* Model 19.xcdatamodel */,
18841890
);
1885-
currentVersion = 6889088D28F668330081A07E /* Model 74.xcdatamodel */;
1891+
currentVersion = 688908A328F8EB360081A07E /* Model 75.xcdatamodel */;
18861892
path = WooCommerce.xcdatamodeld;
18871893
sourceTree = "<group>";
18881894
versionGroupType = wrapper.xcdatamodel;

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

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

11-
@NSManaged public var customerID: Int64
12-
@NSManaged public var email: String?
13-
@NSManaged public var firstName: String?
14-
@NSManaged public var lastName: String?
15-
@NSManaged public var billingFirstName: String?
16-
@NSManaged public var billingLastName: String?
17-
@NSManaged public var billingCompany: String?
1811
@NSManaged public var billingAddress1: String?
1912
@NSManaged public var billingAddress2: String?
2013
@NSManaged public var billingCity: String?
21-
@NSManaged public var billingState: String?
22-
@NSManaged public var billingPostcode: String?
14+
@NSManaged public var billingCompany: String?
2315
@NSManaged public var billingCountry: String?
24-
@NSManaged public var billingPhone: String?
2516
@NSManaged public var billingEmail: String?
26-
@NSManaged public var shippingFirstName: String?
27-
@NSManaged public var shippingLastName: String?
28-
@NSManaged public var shippingCompany: String?
17+
@NSManaged public var billingFirstName: String?
18+
@NSManaged public var billingLastName: String?
19+
@NSManaged public var billingPhone: String?
20+
@NSManaged public var billingPostcode: String?
21+
@NSManaged public var billingState: String?
22+
@NSManaged public var customerID: Int64
23+
@NSManaged public var email: String?
24+
@NSManaged public var firstName: String?
25+
@NSManaged public var lastName: String?
2926
@NSManaged public var shippingAddress1: String?
3027
@NSManaged public var shippingAddress2: String?
3128
@NSManaged public var shippingCity: String?
32-
@NSManaged public var shippingState: String?
33-
@NSManaged public var shippingPostcode: String?
29+
@NSManaged public var shippingCompany: String?
3430
@NSManaged public var shippingCountry: String?
35-
@NSManaged public var shippingPhone: String?
3631
@NSManaged public var shippingEmail: String?
32+
@NSManaged public var shippingFirstName: String?
33+
@NSManaged public var shippingLastName: String?
34+
@NSManaged public var shippingPhone: String?
35+
@NSManaged public var shippingPostcode: String?
36+
@NSManaged public var shippingState: String?
37+
@NSManaged public var siteID: Int64
3738
@NSManaged public var searchResults: Set<CustomerSearchResult>?
38-
3939
}
4040

4141
// MARK: Generated accessors for searchResults
@@ -52,5 +52,4 @@ extension Customer {
5252

5353
@objc(removeSearchResults:)
5454
@NSManaged public func removeFromSearchResults(_ values: NSSet)
55-
5655
}

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

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

11-
@NSManaged public var customerID: Int64
11+
@NSManaged public var keyword: String
12+
@NSManaged public var siteID: Int64
1213
@NSManaged public var customers: Set<Customer>?
13-
1414
}
1515

1616
// MARK: Generated accessors for customers
@@ -27,5 +27,4 @@ extension CustomerSearchResult {
2727

2828
@objc(removeCustomers:)
2929
@NSManaged public func removeFromCustomers(_ values: NSSet)
30-
3130
}

‎Storage/Storage/Model/MIGRATIONS.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
This file documents changes in the WCiOS Storage data model. Please explain any changes to the data model as well as any custom migrations.
44

5+
## Model 75 (Release 10.9.0.0)
6+
- @iamgabrielma 2022-10-17
7+
- Added `siteID` attribute to `Customer` entity.
8+
- Added `siteID` attribute to `CustomerSearchResult` entity.
9+
- Added `keyword` attribute to `CustomerSearchResult` entity.
10+
- Removed `customerID` attribute from `CustomerSearchResult` entity.
11+
- Added `WooCommerceModelV74toV75` mapping model.
12+
513
## Model 74 (Release 10.8.0.0)
614
- @iamgabrielma 2022-10-12
715
- Added `Customer` entity.

‎Storage/Storage/Model/WooCommerce.xcdatamodeld/.xccurrentversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<plist version="1.0">
44
<dict>
55
<key>_XCCurrentVersionName</key>
6-
<string>Model 74.xcdatamodel</string>
6+
<string>Model 75.xcdatamodel</string>
77
</dict>
88
</plist>

0 commit comments

Comments
 (0)