Stats Traffic: Load required data (#22502)

Author: staskus

Podfile

@@ -51,7 +51,7 @@ end
 
 def wordpress_kit
   # pod 'WordPressKit', '~> 13.0'
-  pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: 'b5c2bd39ec8f478dd53ecb7533ad025aad48f42e'
+  pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: '92c1536724af8bb57ee677996919c2a9e37434e8'
   # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', branch: ''
   # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', tag: ''
   # pod 'WordPressKit', path: '../WordPressKit-iOS'

Podfile.lock

@@ -120,7 +120,7 @@ DEPENDENCIES:
   - SwiftLint (~> 0.50)
   - WordPress-Editor-iOS (~> 1.19.9)
   - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, commit `fa06fca7178b268d382d91861752b3be0729e8a8`)
-  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `b5c2bd39ec8f478dd53ecb7533ad025aad48f42e`)
+  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `92c1536724af8bb57ee677996919c2a9e37434e8`)
   - WordPressShared (~> 2.3)
   - WordPressUI (~> 1.15)
   - ZendeskSupportSDK (= 5.3.0)
@@ -178,7 +178,7 @@ EXTERNAL SOURCES:
     :commit: fa06fca7178b268d382d91861752b3be0729e8a8
     :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
   WordPressKit:
-    :commit: b5c2bd39ec8f478dd53ecb7533ad025aad48f42e
+    :commit: 92c1536724af8bb57ee677996919c2a9e37434e8
     :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
 
 CHECKOUT OPTIONS:
@@ -189,7 +189,7 @@ CHECKOUT OPTIONS:
     :commit: fa06fca7178b268d382d91861752b3be0729e8a8
     :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git
   WordPressKit:
-    :commit: b5c2bd39ec8f478dd53ecb7533ad025aad48f42e
+    :commit: 92c1536724af8bb57ee677996919c2a9e37434e8
     :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
 
 SPEC CHECKSUMS:
@@ -236,6 +236,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced
 
-PODFILE CHECKSUM: 84efe77e1ccd89001bbd5779401e82a421cf358e
+PODFILE CHECKSUM: d7f320bedde48770f2ca24d6086bc5214172ddec
 
 COCOAPODS: 1.14.2

WordPress/Classes/Stores/StatsPeriodCache.swift

@@ -6,27 +6,28 @@ final class StatsPediodCache {
 
     private var cache: [CacheKey: StatsTimeIntervalData] = [:]
 
-    func getValue<T: StatsTimeIntervalData>(record: Record, date: Date, period: StatsPeriodUnit, siteID: NSNumber) -> T? {
-        let key = makeKey(record: record, date: date, period: period, siteID: siteID)
+    func getValue<T: StatsTimeIntervalData>(record: Record, date: Date, period: StatsPeriodUnit, unit: StatsPeriodUnit, siteID: NSNumber) -> T? {
+        let key = makeKey(record: record, date: date, period: period, unit: unit, siteID: siteID)
         return cache[key] as? T
     }
 
     func setValue<T: StatsTimeIntervalData>(_ value: T, record: Record, siteID: NSNumber) {
-        let key = makeKey(record: record, date: value.periodEndDate, period: value.period, siteID: siteID)
+        let key = makeKey(record: record, date: value.periodEndDate, period: value.period, unit: value.unit ?? value.period, siteID: siteID)
         cache[key] = value
     }
 
     func removeAll() {
         cache.removeAll()
     }
 
-    private func makeKey(record: Record, date: Date, period: StatsPeriodUnit, siteID: NSNumber) -> CacheKey {
+    private func makeKey(record: Record, date: Date, period: StatsPeriodUnit, unit: StatsPeriodUnit, siteID: NSNumber) -> CacheKey {
         let date = Calendar.current.startOfDay(for: date)
-        return CacheKey(record: record, date: date, period: period, siteID: siteID)
+        return CacheKey(record: record, date: date, period: period, unit: unit, siteID: siteID)
     }
 
     enum Record: Hashable {
-        case summary
+        case timeIntervalsSummary
+        case totalsSummary
         case topPostsAndPages
         case topReferrers
         case topClicks
@@ -42,6 +43,7 @@ final class StatsPediodCache {
         let record: Record
         let date: Date
         let period: StatsPeriodUnit
+        let unit: StatsPeriodUnit
         let siteID: NSNumber
     }
 }