Skip to content

[My Store] Add support for storing site summary stats #8420

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 7 commits into from
Dec 15, 2022
Merged

[My Store] Add support for storing site summary stats #8420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9105776
Add Core Data Model 80
rachelmcr Dec 15, 2022
ac3ec36
Add SiteSummaryStats storage entity
rachelmcr Dec 15, 2022
a540af1
Generate Core Data files for SiteSummaryStats
rachelmcr Dec 15, 2022
1348f4c
Update unit tests for Networking SiteSummaryStats result
rachelmcr Dec 15, 2022
14dca7e
Add migration test for Model 79 to 80
rachelmcr Dec 15, 2022
f97f4ff
Update migrations changelog
rachelmcr Dec 15, 2022
d01b65f
Merge branch 'trunk' into issue/8173-sitesummarystats-storage
rachelmcr Dec 15, 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
12 changes: 11 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 @@ -178,6 +178,8 @@
CC2C030C262DCC6900928C9C /* ShippingLabelPaymentMethod+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC2C0308262DCC6900928C9C /* ShippingLabelPaymentMethod+CoreDataProperties.swift */; };
CC6A054328770933002C144E /* OrderMetaData+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC6A054128770933002C144E /* OrderMetaData+CoreDataClass.swift */; };
CC6A054428770933002C144E /* OrderMetaData+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC6A054228770933002C144E /* OrderMetaData+CoreDataProperties.swift */; };
CC80E406294B33C200D5FF45 /* SiteSummaryStats+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC80E405294B33C100D5FF45 /* SiteSummaryStats+CoreDataClass.swift */; };
CC80E408294B33F100D5FF45 /* SiteSummaryStats+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC80E407294B33F100D5FF45 /* SiteSummaryStats+CoreDataProperties.swift */; };
CCBEBD4027C68E660010C96F /* FeatureIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCBEBD3F27C68E660010C96F /* FeatureIcon.swift */; };
CCD2E70725DE9AAA00BD975D /* WooCommerceModelV45toV46.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = CCD2E70625DE9AAA00BD975D /* WooCommerceModelV45toV46.xcmappingmodel */; };
CE12FBE32220515600C59248 /* WooCommerceModelV9toV10.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = CE12FBE22220515600C59248 /* WooCommerceModelV9toV10.xcmappingmodel */; };
Expand Down Expand Up @@ -433,6 +435,9 @@
CC6A05402877012B002C144E /* Model 71.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model 71.xcdatamodel"; sourceTree = "<group>"; };
CC6A054128770933002C144E /* OrderMetaData+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OrderMetaData+CoreDataClass.swift"; sourceTree = "<group>"; };
CC6A054228770933002C144E /* OrderMetaData+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OrderMetaData+CoreDataProperties.swift"; sourceTree = "<group>"; };
CC80E3FA294B30D700D5FF45 /* Model 80.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model 80.xcdatamodel"; sourceTree = "<group>"; };
CC80E405294B33C100D5FF45 /* SiteSummaryStats+CoreDataClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SiteSummaryStats+CoreDataClass.swift"; sourceTree = "<group>"; };
CC80E407294B33F100D5FF45 /* SiteSummaryStats+CoreDataProperties.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SiteSummaryStats+CoreDataProperties.swift"; sourceTree = "<group>"; };
CCA1D60B29477F5E00B40560 /* Model 79.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model 79.xcdatamodel"; sourceTree = "<group>"; };
CCBEBD3F27C68E660010C96F /* FeatureIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureIcon.swift; sourceTree = "<group>"; };
CCD2E70625DE9AAA00BD975D /* WooCommerceModelV45toV46.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = WooCommerceModelV45toV46.xcmappingmodel; sourceTree = "<group>"; };
Expand Down Expand Up @@ -670,6 +675,8 @@
D8FBFF5222D66A06006E3336 /* OrderStatsV4Totals+CoreDataProperties.swift */,
D8FBFF5322D66A06006E3336 /* OrderStatsV4+CoreDataClass.swift */,
D8FBFF5422D66A06006E3336 /* OrderStatsV4+CoreDataProperties.swift */,
CC80E405294B33C100D5FF45 /* SiteSummaryStats+CoreDataClass.swift */,
CC80E407294B33F100D5FF45 /* SiteSummaryStats+CoreDataProperties.swift */,
7471A510216CF0FD00219F7E /* SiteVisitStats+CoreDataClass.swift */,
7471A513216CF0FE00219F7E /* SiteVisitStats+CoreDataProperties.swift */,
7471A512216CF0FE00219F7E /* SiteVisitStatsItem+CoreDataClass.swift */,
Expand Down Expand Up @@ -1234,6 +1241,7 @@
AE93BE90272C0E9F001B55EA /* GeneralStoreSettings.swift in Sources */,
031C1EA227AD3AFE00298699 /* WCPayCharge+CoreDataProperties.swift in Sources */,
D87F61552265AA900031A13B /* PListFileStorage.swift in Sources */,
CC80E406294B33C200D5FF45 /* SiteSummaryStats+CoreDataClass.swift in Sources */,
B5B914C620EFF03500F2F832 /* Site+CoreDataProperties.swift in Sources */,
45E462072684BCEE00011BF2 /* StateOfACountry+CoreDataClass.swift in Sources */,
CC6A054328770933002C144E /* OrderMetaData+CoreDataClass.swift in Sources */,
Expand Down Expand Up @@ -1309,6 +1317,7 @@
028296F3237D404F00E84012 /* ProductVariation+CoreDataProperties.swift in Sources */,
5772842325BF465A0092FB2C /* NSPersistentStoreCoordinator+PersistentStoreCoordinatorProtocol.swift in Sources */,
077F39C4269F1F4600ABEADC /* SystemPlugin+CoreDataClass.swift in Sources */,
CC80E408294B33F100D5FF45 /* SiteSummaryStats+CoreDataProperties.swift in Sources */,
B54CA5C920A4C17800F38CD1 /* NSObject+Storage.swift in Sources */,
6889089D28F66DED0081A07E /* CustomerSearchResult+CoreDataClass.swift in Sources */,
7471A516216CF0FE00219F7E /* SiteVisitStatsItem+CoreDataClass.swift in Sources */,
Expand Down Expand Up @@ -1817,6 +1826,7 @@
DEC51AA4275B41BE009F3DF4 /* WooCommerce.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
CC80E3FA294B30D700D5FF45 /* Model 80.xcdatamodel */,
CCA1D60B29477F5E00B40560 /* Model 79.xcdatamodel */,
CCF3209E2927EBEE002114B1 /* Model 78.xcdatamodel */,
AE7DF9FA2919023100C4D1ED /* Model 77.xcdatamodel */,
Expand Down Expand Up @@ -1897,7 +1907,7 @@
DEC51ADE275B41BE009F3DF4 /* Model 47.xcdatamodel */,
DEC51ADF275B41BE009F3DF4 /* Model 19.xcdatamodel */,
);
currentVersion = CCA1D60B29477F5E00B40560 /* Model 79.xcdatamodel */;
currentVersion = CC80E3FA294B30D700D5FF45 /* Model 80.xcdatamodel */;
path = WooCommerce.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
Expand Down
4 changes: 4 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,10 @@

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 80 (Release 11.7.0.0)
- @rachelmcr 2022-12-15
- Added `SiteSummaryStats` entity.

## Model 79 (Release 11.7.0.0)
- @rachelmcr 2022-12-12
- Added `views` attribute to `SiteVisitStatsItem` entity.
Expand Down
7 changes: 7 additions & 0 deletions Storage/Storage/Model/SiteSummaryStats+CoreDataClass.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import Foundation
import CoreData

@objc(SiteSummaryStats)
public class SiteSummaryStats: NSManagedObject {

}
21 changes: 21 additions & 0 deletions Storage/Storage/Model/SiteSummaryStats+CoreDataProperties.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import Foundation
import CoreData


extension SiteSummaryStats {

@nonobjc public class func fetchRequest() -> NSFetchRequest<SiteSummaryStats> {
return NSFetchRequest<SiteSummaryStats>(entityName: "SiteSummaryStats")
}

@NSManaged public var siteID: Int64
@NSManaged public var period: String
@NSManaged public var date: String
@NSManaged public var visitors: Int64
@NSManaged public var views: Int64

}

extension SiteSummaryStats: Identifiable {

}
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 79.xcdatamodel</string>
<string>Model 80.xcdatamodel</string>
</dict>
</plist>
Loading