Connect time range parameter to StoreInfoDataService

Author: ealeksandrov

WooCommerce/StoreWidgets/StoreInfoDataService.swift

@@ -18,7 +18,7 @@ final class StoreInfoDataService {
     ///
     private var orderStatsRemoteV4: OrderStatsRemoteV4
 
-    /// Visitors remoute source
+    /// Visitors remote source
     ///
     private var siteVisitStatsRemote: SiteVisitStatsRemote
 
@@ -32,9 +32,9 @@ final class StoreInfoDataService {
         siteVisitStatsRemote = SiteVisitStatsRemote(network: network)
     }
 
-    /// Async function that fetches todays stats data.
+    /// Async function that fetches stats data for given time range.
     ///
-    func fetchTodayStats(for storeID: Int64) async throws -> Stats {
+    func fetchStats(for storeID: Int64, timeRange: StatsTimeRangeV4) async throws -> Stats {
         // Prepare them to run in parallel
         async let revenueAndOrdersRequest = fetchTodaysRevenueAndOrders(for: storeID)
         async let visitorsRequest = fetchTodaysVisitors(for: storeID)

WooCommerce/StoreWidgets/StoreInfoProvider.swift

@@ -1,6 +1,7 @@
 import WidgetKit
 import WooFoundation
 import KeychainAccess
+import enum Yosemite.StatsTimeRangeV4
 
 /// Type that represents the all the possible Widget states.
 ///
@@ -90,7 +91,7 @@ final class StoreInfoProvider: IntentTimelineProvider {
         networkService = strongService
         Task {
             do {
-                let todayStats = try await strongService.fetchTodayStats(for: dependencies.storeID)
+                let todayStats = try await strongService.fetchStats(for: dependencies.storeID, timeRange: StatsTimeRangeV4(configuration.timeRange))
                 let entry = Self.dataEntry(for: todayStats, with: dependencies)
                 let reloadDate = Date(timeIntervalSinceNow: reloadInterval)
                 let timeline = Timeline<StoreInfoEntry>(entries: [entry], policy: .after(reloadDate))
@@ -107,6 +108,25 @@ final class StoreInfoProvider: IntentTimelineProvider {
     }
 }
 
+/// Converting StoreWidgetsConfigIntent.StatsTimeRange to StatsTimeRangeV4
+///
+private extension StatsTimeRangeV4 {
+    init(_ timeRange: StatsTimeRange) {
+        switch timeRange {
+        case .today:
+            self = .today
+        case .thisWeek:
+            self = .thisWeek
+        case .thisMonth:
+            self = .thisMonth
+        case .thisYear:
+            self = .thisYear
+        default:
+            self = .today
+        }
+    }
+}
+
 private extension StoreInfoProvider {
 
     /// Dependencies needed by the `StoreInfoProvider`