NotificationsViewController: Simplifies Mark All as Read

Author: jleandroperez

WooCommerce/Classes/ViewRelated/Notifications/NotificationsViewController.swift

@@ -72,12 +72,6 @@ class NotificationsViewController: UIViewController {
         return resultsController.isEmpty
     }
 
-    /// Returns a collection of every Unreead Notification
-    ///
-    private var unreadNotes: [Note] {
-        return resultsController.fetchedObjects.filter { $0.read == false }
-    }
-
 
     // MARK: - View Lifecycle
 
@@ -177,16 +171,14 @@ private extension NotificationsViewController {
     }
 
     @IBAction func markAllAsRead() {
-        let identifiers = unreadNotes.map { $0.noteId }
-        guard identifiers.isEmpty == false else {
+        let unread = resultsController.fetchedObjects.filter { $0.read == false }
+        if unread.isEmpty {
             DDLogVerbose("# Every single notification is already marked as Read!")
             return
         }
 
-        hapticGenerator.prepare()
+        markAsRead(notes: unread)
         hapticGenerator.notificationOccurred(.success)
-
-        markAsRead(identifiers: identifiers)
     }
 }
 
@@ -195,31 +187,32 @@ private extension NotificationsViewController {
 //
 private extension NotificationsViewController {
 
-    /// Synchronizes the Notifications associated to the active WordPress.com account.
+    /// Marks the specified collection of Notifications as Read.
     ///
-    func synchronizeNotifications(onCompletion: (() -> Void)? = nil) {
-        let action = NotificationAction.synchronizeNotifications { error in
+    func markAsRead(notes: [Note]) {
+        let identifiers = notes.map { $0.noteId }
+        let action = NotificationAction.updateMultipleReadStatus(noteIds: identifiers, read: true) { error in
             if let error = error {
-                DDLogError("⛔️ Error synchronizing notifications: \(error)")
+                DDLogError("⛔️ Error marking notifications as read: \(error)")
             }
-
-            self.transitionToResultsUpdatedState()
-            onCompletion?()
         }
 
-        transitionToSyncingState()
         StoresManager.shared.dispatch(action)
     }
 
-    /// Marks the specified collection of Notifications as Read.
+    /// Synchronizes the Notifications associated to the active WordPress.com account.
     ///
-    func markAsRead(identifiers: [Int64]) {
-        let action = NotificationAction.updateMultipleReadStatus(noteIds: identifiers, read: true) { error in
+    func synchronizeNotifications(onCompletion: (() -> Void)? = nil) {
+        let action = NotificationAction.synchronizeNotifications { error in
             if let error = error {
-                DDLogError("⛔️ Error marking notifications as read: \(error)")
+                DDLogError("⛔️ Error synchronizing notifications: \(error)")
             }
+
+            self.transitionToResultsUpdatedState()
+            onCompletion?()
         }
 
+        transitionToSyncingState()
         StoresManager.shared.dispatch(action)
     }
 }