Merge pull request #8430 from woocommerce/issue/8318-error-handling-in-data-fetch

[Analytics Hub] Update error handling in data sync

Author: ealeksandrov

WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsHubViewModel.swift

@@ -132,50 +132,48 @@ private extension AnalyticsHubViewModel {
         let currentTimeRange = try timeRangeSelection.unwrapCurrentTimeRange()
         let previousTimeRange = try timeRangeSelection.unwrapPreviousTimeRange()
 
-        try await withThrowingTaskGroup(of: Void.self) { group in
+        await withTaskGroup(of: Void.self) { group in
             group.addTask {
-                try await self.retrieveOrderStats(currentTimeRange: currentTimeRange, previousTimeRange: previousTimeRange)
+                await self.retrieveOrderStats(currentTimeRange: currentTimeRange, previousTimeRange: previousTimeRange)
             }
             group.addTask {
-                try await self.retrieveItemsSoldStats(currentTimeRange: currentTimeRange, previousTimeRange: previousTimeRange)
+                await self.retrieveItemsSoldStats(currentTimeRange: currentTimeRange, previousTimeRange: previousTimeRange)
             }
             group.addTask {
-                try await self.retrieveSiteStats(currentTimeRange: currentTimeRange)
+                await self.retrieveSiteStats(currentTimeRange: currentTimeRange)
             }
-            try await group.waitForAll()
         }
     }
 
     @MainActor
-    func retrieveOrderStats(currentTimeRange: AnalyticsHubTimeRange, previousTimeRange: AnalyticsHubTimeRange) async throws {
+    func retrieveOrderStats(currentTimeRange: AnalyticsHubTimeRange, previousTimeRange: AnalyticsHubTimeRange) async {
         async let currentPeriodRequest = retrieveStats(earliestDateToInclude: currentTimeRange.start,
                                                        latestDateToInclude: currentTimeRange.end,
                                                        forceRefresh: true)
         async let previousPeriodRequest = retrieveStats(earliestDateToInclude: previousTimeRange.start,
                                                         latestDateToInclude: previousTimeRange.end,
                                                         forceRefresh: true)
 
-        let (currentPeriodStats, previousPeriodStats) = try await (currentPeriodRequest, previousPeriodRequest)
-        self.currentOrderStats = currentPeriodStats
-        self.previousOrderStats = previousPeriodStats
+        let allStats: (currentPeriodStats: OrderStatsV4, previousPeriodStats: OrderStatsV4)?
+        allStats = try? await (currentPeriodRequest, previousPeriodRequest)
+        self.currentOrderStats = allStats?.currentPeriodStats
+        self.previousOrderStats = allStats?.previousPeriodStats
     }
 
     @MainActor
-    func retrieveItemsSoldStats(currentTimeRange: AnalyticsHubTimeRange, previousTimeRange: AnalyticsHubTimeRange) async throws {
+    func retrieveItemsSoldStats(currentTimeRange: AnalyticsHubTimeRange, previousTimeRange: AnalyticsHubTimeRange) async {
         async let itemsSoldRequest = retrieveTopItemsSoldStats(earliestDateToInclude: currentTimeRange.start,
                                                                latestDateToInclude: currentTimeRange.end,
                                                                forceRefresh: true)
 
-        let itemsSoldStats = try await itemsSoldRequest
-        self.itemsSoldStats = itemsSoldStats
+        self.itemsSoldStats = try? await itemsSoldRequest
     }
 
     @MainActor
-    func retrieveSiteStats(currentTimeRange: AnalyticsHubTimeRange) async throws {
+    func retrieveSiteStats(currentTimeRange: AnalyticsHubTimeRange) async {
         async let siteStatsRequest = retrieveSiteSummaryStats(latestDateToInclude: currentTimeRange.end)
 
-        let summaryStats = try await siteStatsRequest
-        self.siteStats = summaryStats
+        self.siteStats = try? await siteStatsRequest
     }
 
     @MainActor

WooCommerce/WooCommerceTests/ViewRelated/Dashboard/Analytics Hub/AnalyticsHubViewModelTests.swift

@@ -79,6 +79,37 @@ final class AnalyticsHubViewModelTests: XCTestCase {
         XCTAssertTrue(vm.sessionsCard.showSyncError)
     }
 
+    func test_cards_viewmodels_show_sync_error_only_if_underlying_request_fails() async {
+        // Given
+        let vm = AnalyticsHubViewModel(siteID: 123, statsTimeRange: .thisMonth, usageTracksEventEmitter: eventEmitter, stores: stores)
+        stores.whenReceivingAction(ofType: StatsActionV4.self) { action in
+            switch action {
+            case let .retrieveCustomStats(_, _, _, _, _, _, completion):
+                completion(.failure(NSError(domain: "Test", code: 1)))
+            case let .retrieveTopEarnerStats(_, _, _, _, _, _, _, completion):
+                let topEarners = TopEarnerStats.fake().copy(items: [.fake()])
+                completion(.success(topEarners))
+            case let .retrieveSiteSummaryStats(_, _, _, _, completion):
+                completion(.failure(NSError(domain: "Test", code: 1)))
+            default:
+                break
+            }
+        }
+
+        // When
+        await vm.updateData()
+
+        // Then
+        XCTAssertTrue(vm.revenueCard.showSyncError)
+        XCTAssertTrue(vm.ordersCard.showSyncError)
+        XCTAssertTrue(vm.productsStatsCard.showStatsError)
+
+        XCTAssertFalse(vm.itemsSoldCard.showItemsSoldError)
+        XCTAssertEqual(vm.itemsSoldCard.itemsSoldData.count, 1)
+
+        XCTAssertTrue(vm.sessionsCard.showSyncError)
+    }
+
     func test_cards_viewmodels_redacted_while_updating_from_network() async {
         // Given
         let vm = AnalyticsHubViewModel(siteID: 123, statsTimeRange: .thisMonth, usageTracksEventEmitter: eventEmitter, stores: stores)