Add observable background notifications to observe and reset the last sync timestamp in store stats.

Author: jaclync

WooCommerce/Classes/Notifications/PushNotificationsManager.swift

@@ -45,6 +45,16 @@ final class PushNotificationsManager: PushNotesManager {
     /// Mutable reference to `inactiveNotifications`
     private let inactiveNotificationsSubject = PassthroughSubject<PushNotification, Never>()
 
+    /// An observable that emits values when a Remote Notification is received while the app is
+    /// in the background.
+    ///
+    var backgroundNotifications: AnyPublisher<PushNotification, Never> {
+        backgroundNotificationsSubject.eraseToAnyPublisher()
+    }
+
+    /// Mutable reference to `backgroundNotifications`
+    private let backgroundNotificationsSubject = PassthroughSubject<PushNotification, Never>()
+
     /// An observable that emits values when a local notification is received.
     ///
     var localNotificationUserResponses: AnyPublisher<UNNotificationResponse, Never> {
@@ -292,6 +302,10 @@ extension PushNotificationsManager {
 
         handleRemoteNotificationInAllAppStates(userInfo)
 
+        if let notification = PushNotification.from(userInfo: userInfo) {
+            backgroundNotificationsSubject.send(notification)
+        }
+
         return await synchronizeNotifications()
     }
 

WooCommerce/Classes/ServiceLocator/PushNotesManager.swift

@@ -20,6 +20,11 @@ protocol PushNotesManager {
     ///
     var inactiveNotifications: AnyPublisher<PushNotification, Never> { get }
 
+    /// An observable that emits values when a Remote Notification is received while the app is
+    /// in the background.
+    ///
+    var backgroundNotifications: AnyPublisher<PushNotification, Never> { get }
+
     /// An observable that emits values when a local notification response is received.
     ///
     var localNotificationUserResponses: AnyPublisher<UNNotificationResponse, Never> { get }

WooCommerce/Classes/ViewRelated/Dashboard/Stats v4/StoreStatsAndTopPerformersViewController.swift

@@ -268,7 +268,7 @@ private extension StoreStatsAndTopPerformersViewController {
     func observeRemotelyCreatedOrdersToResetLastSyncTimestamp() {
         let siteID = self.siteID
         remoteOrdersSubscription = Publishers
-            .Merge(pushNotificationsManager.inactiveNotifications, pushNotificationsManager.foregroundNotificationsToView)
+            .Merge(pushNotificationsManager.backgroundNotifications, pushNotificationsManager.foregroundNotifications)
             .filter { $0.kind == .storeOrder && $0.siteID == siteID }
             .sink { [weak self] _ in
                 self?.resetLastSyncTimestamp()

WooCommerce/WooCommerceTests/Mocks/MockPushNotificationsManager.swift

@@ -24,6 +24,12 @@ final class MockPushNotificationsManager: PushNotesManager {
 
     private let inactiveNotificationsSubject = PassthroughSubject<PushNotification, Never>()
 
+    var backgroundNotifications: AnyPublisher<PushNotification, Never> {
+        backgroundNotificationsSubject.eraseToAnyPublisher()
+    }
+
+    private let backgroundNotificationsSubject = PassthroughSubject<PushNotification, Never>()
+
     var localNotificationUserResponses: AnyPublisher<UNNotificationResponse, Never> {
         localNotificationResponsesSubject.eraseToAnyPublisher()
     }

WooCommerce/WooCommerceTests/Notifications/PushNotificationsManagerTests.swift

@@ -470,6 +470,48 @@ final class PushNotificationsManagerTests: XCTestCase {
         XCTAssertNil(emittedNotification.message)
     }
 
+    // MARK: - Background Notification Observable
+
+    func test_it_emits_background_notifications_when_it_receives_a_notification_while_app_is_active() async throws {
+        // Given
+        application.applicationState = .background
+
+        manager = {
+            let configuration = PushNotificationsConfiguration(application: self.application,
+                                                               defaults: self.defaults,
+                                                               storesManager: self.storesManager,
+                                                               supportManager: self.supportManager,
+                                                               userNotificationsCenter: self.userNotificationCenter)
+            return PushNotificationsManager(configuration: configuration)
+        }()
+
+        var emittedNotifications = [PushNotification]()
+        manager.backgroundNotifications.sink { notification in
+            emittedNotifications.append(notification)
+        }.store(in: &subscriptions)
+
+        let userinfo = notificationPayload(noteID: 9_981,
+                                           type: .storeOrder,
+                                           siteID: 606,
+                                           title: Sample.defaultTitle,
+                                           subtitle: Sample.defaultSubtitle,
+                                           message: Sample.defaultMessage)
+
+        // When
+        _ = await manager.handleRemoteNotificationInTheBackground(userInfo: userinfo)
+
+        // Then
+        XCTAssertEqual(emittedNotifications.count, 1)
+
+        let emittedNotification = try XCTUnwrap(emittedNotifications.first)
+        XCTAssertEqual(emittedNotification.kind, .storeOrder)
+        XCTAssertEqual(emittedNotification.noteID, 9_981)
+        XCTAssertEqual(emittedNotification.siteID, 606)
+        XCTAssertEqual(emittedNotification.title, Sample.defaultTitle)
+        XCTAssertEqual(emittedNotification.subtitle, Sample.defaultSubtitle)
+        XCTAssertEqual(emittedNotification.message, Sample.defaultMessage)
+    }
+
     // MARK: - App Badge Number
 
     /// Verifies that `handleNotification` updates app badge number to 1 when the notification is from the same site.