Skip to content

Add siteID and keyword attributes to Customer and CustomerSearchResult entities #7860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 18, 2022
Merged

Add siteID and keyword attributes to Customer and CustomerSearchResult entities #7860

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2f312fd
Update data model to 75
iamgabrielma Oct 14, 2022
017f527
Make keyword attribute optional. fix migration tests
iamgabrielma Oct 14, 2022
352537a
Update migrations.md
iamgabrielma Oct 14, 2022
312e9fd
Make keyword non-optional. Simplify test helper
iamgabrielma Oct 14, 2022
761736b
Remove unneeded helper function
iamgabrielma Oct 14, 2022
db370f8
Add WooCommerceModelV74toV75 mapping model
iamgabrielma Oct 17, 2022
e08e392
Fix line length warning
iamgabrielma Oct 17, 2022
07ae1ca
Add NSEntityMigrationPolicy to mapping migration
iamgabrielma Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Storage/Storage.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@
6889089728F66DED0081A07E /* Customer+CoreDataClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Customer+CoreDataClass.swift"; sourceTree = "<group>"; };
6889089828F66DED0081A07E /* Customer+CoreDataProperties.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Customer+CoreDataProperties.swift"; sourceTree = "<group>"; };
6889089928F66DED0081A07E /* CustomerSearchResult+CoreDataClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CustomerSearchResult+CoreDataClass.swift"; sourceTree = "<group>"; };
688908A328F8EB360081A07E /* Model 75.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model 75.xcdatamodel"; sourceTree = "<group>"; };
7426A04E20F69D00002A4E07 /* OrderCoupon+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OrderCoupon+CoreDataClass.swift"; sourceTree = "<group>"; };
7426A04F20F69D00002A4E07 /* OrderCoupon+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OrderCoupon+CoreDataProperties.swift"; sourceTree = "<group>"; };
7426A05220F69DA4002A4E07 /* OrderItem+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OrderItem+CoreDataClass.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1807,6 +1808,7 @@
DEC51AA4275B41BE009F3DF4 /* WooCommerce.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
688908A328F8EB360081A07E /* Model 75.xcdatamodel */,
6889088D28F668330081A07E /* Model 74.xcdatamodel */,
027CE79D28D167D0001B8D0E /* Model 73.xcdatamodel */,
0372D8B828AFD9530041028A /* Model 72.xcdatamodel */,
Expand Down Expand Up @@ -1882,7 +1884,7 @@
DEC51ADE275B41BE009F3DF4 /* Model 47.xcdatamodel */,
DEC51ADF275B41BE009F3DF4 /* Model 19.xcdatamodel */,
);
currentVersion = 6889088D28F668330081A07E /* Model 74.xcdatamodel */;
currentVersion = 688908A328F8EB360081A07E /* Model 75.xcdatamodel */;
path = WooCommerce.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
Expand Down
35 changes: 17 additions & 18 deletions Storage/Storage/Model/Customer+CoreDataProperties.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,34 @@ extension Customer {
return NSFetchRequest<Customer>(entityName: "Customer")
}

@NSManaged public var customerID: Int64
@NSManaged public var email: String?
@NSManaged public var firstName: String?
@NSManaged public var lastName: String?
@NSManaged public var billingFirstName: String?
@NSManaged public var billingLastName: String?
@NSManaged public var billingCompany: String?
@NSManaged public var billingAddress1: String?
@NSManaged public var billingAddress2: String?
@NSManaged public var billingCity: String?
@NSManaged public var billingState: String?
@NSManaged public var billingPostcode: String?
@NSManaged public var billingCompany: String?
@NSManaged public var billingCountry: String?
@NSManaged public var billingPhone: String?
@NSManaged public var billingEmail: String?
@NSManaged public var shippingFirstName: String?
@NSManaged public var shippingLastName: String?
@NSManaged public var shippingCompany: String?
@NSManaged public var billingFirstName: String?
@NSManaged public var billingLastName: String?
@NSManaged public var billingPhone: String?
@NSManaged public var billingPostcode: String?
@NSManaged public var billingState: String?
@NSManaged public var customerID: Int64
@NSManaged public var email: String?
@NSManaged public var firstName: String?
@NSManaged public var lastName: String?
@NSManaged public var shippingAddress1: String?
@NSManaged public var shippingAddress2: String?
@NSManaged public var shippingCity: String?
@NSManaged public var shippingState: String?
@NSManaged public var shippingPostcode: String?
@NSManaged public var shippingCompany: String?
@NSManaged public var shippingCountry: String?
@NSManaged public var shippingPhone: String?
@NSManaged public var shippingEmail: String?
@NSManaged public var shippingFirstName: String?
@NSManaged public var shippingLastName: String?
@NSManaged public var shippingPhone: String?
@NSManaged public var shippingPostcode: String?
@NSManaged public var shippingState: String?
@NSManaged public var siteID: Int64
Comment on lines 10 to +37
Copy link
Contributor

@joshheald joshheald Oct 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yay inconsistent code generation... this isn't a problem, but this is what I meant when I mentioned that I'll often just run the generation to check it works, then revert it and add/update properties on the generated files so that the change is easier to see. No need to do anything, but it's a good practical example.

@NSManaged public var searchResults: Set<CustomerSearchResult>?

}

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

@objc(removeSearchResults:)
@NSManaged public func removeFromSearchResults(_ values: NSSet)

}
5 changes: 2 additions & 3 deletions Storage/Storage/Model/CustomerSearchResult+CoreDataProperties.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ extension CustomerSearchResult {
return NSFetchRequest<CustomerSearchResult>(entityName: "CustomerSearchResult")
}

@NSManaged public var customerID: Int64
@NSManaged public var siteID: Int64
@NSManaged public var keyword: String?
Copy link
Contributor

@joshheald joshheald Oct 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add optional keyword property to CustomerSearchResult

Why optional? I don't think it makes sense to have a search result with a nil keyword...

Copy link
Contributor Author

@iamgabrielma iamgabrielma Oct 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙇 Made the changes discussed in Slack here: 312e9fd by changing keyword to be non-optional and providing a default value so we're sure that the entity conforms to the new schema when migrating

@NSManaged public var customers: Set<Customer>?

}

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

@objc(removeCustomers:)
@NSManaged public func removeFromCustomers(_ values: NSSet)

}
7 changes: 7 additions & 0 deletions Storage/Storage/Model/MIGRATIONS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

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

## Model 75 (Release 10.8.0.0)
- @iamgabrielma 2022-10-14
- Added `siteID` attribute to `Customer` entity.
- Added `siteID` attribute to `CustomerSearchResult` entity.
- Added `keyword` attribute to `CustomerSearchResult` entity.
- Removed `customerID` attribute from `CustomerSearchResult` entity.

## Model 74 (Release 10.8.0.0)
- @iamgabrielma 2022-10-12
- Added `Customer` entity.
Expand Down
2 changes: 1 addition & 1 deletion Storage/Storage/Model/WooCommerce.xcdatamodeld/.xccurrentversion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>_XCCurrentVersionName</key>
<string>Model 74.xcdatamodel</string>
<string>Model 75.xcdatamodel</string>
</dict>
</plist>
Loading