Make pluginResultsController lazy

Author: iamgabrielma

WooCommerce/Classes/Authentication/Epilogue/SwitchStoreUseCase.swift

@@ -12,7 +12,7 @@ final class SwitchStoreUseCase: SwitchStoreUseCaseProtocol {
 
     private let stores: StoresManager
     private let storageManager: StorageManagerType
-    private let ZendeskShared: ZendeskManagerProtocol = ZendeskProvider.shared
+    private let zendeskShared: ZendeskManagerProtocol = ZendeskProvider.shared
 
     private lazy var resultsController: ResultsController<StorageSite> = {
         return ResultsController(storageManager: storageManager, sortedBy: [])
@@ -73,9 +73,9 @@ final class SwitchStoreUseCase: SwitchStoreUseCaseProtocol {
         // https://github.com/woocommerce/woocommerce-ios/pull/2013#discussion_r454620804
         logOutOfCurrentStore {
             self.finalizeStoreSelection(storeID)
-            // Inform ZD that the site has changed
+            // Inform the Zendesk shared instance that the Store has been switched
             // https://github.com/woocommerce/woocommerce-ios/pull/8008/
-            self.ZendeskShared.test_listenToSiteSwitchChanges()
+            self.zendeskShared.observeStoreSwitch()
             onCompletion(true)
         }
     }

WooCommerce/Classes/Tools/Zendesk/ZendeskManager.swift

@@ -22,7 +22,7 @@ extension NSNotification.Name {
 protocol ZendeskManagerProtocol: SupportManagerAdapter {
     typealias onUserInformationCompletion = (_ success: Bool, _ email: String?) -> Void
 
-    func test_listenToSiteSwitchChanges()
+    func observeStoreSwitch()
 
     /// Displays the Zendesk New Request view from the given controller, for users to submit new tickets.
     ///
@@ -46,7 +46,7 @@ protocol ZendeskManagerProtocol: SupportManagerAdapter {
 }
 
 struct NoZendeskManager: ZendeskManagerProtocol {
-    func test_listenToSiteSwitchChanges() {
+    func observeStoreSwitch() {
         // no-op
     }
 
@@ -148,7 +148,9 @@ final class ZendeskManager: NSObject, ZendeskManagerProtocol {
 
     /// Loads Plugins from the Storage Layer.
     ///
-    private var pluginResultsController: ResultsController<StorageSitePlugin> {
+    private lazy var pluginResultsController: ResultsController<StorageSitePlugin> = updatePluginResultsController()
+
+    private func updatePluginResultsController() -> ResultsController<StorageSitePlugin> {
         var sitePredicate: NSPredicate? = nil
         if let siteID = stores.sessionManager.defaultSite?.siteID {
             sitePredicate = NSPredicate(format: "siteID == %lld", siteID)
@@ -163,12 +165,12 @@ final class ZendeskManager: NSObject, ZendeskManagerProtocol {
                                  sortedBy: pluginStatusDescriptor)
     }
 
-    func test_listenToSiteSwitchChanges() {
-        print("Changed! SiteID: ")
+    func observeStoreSwitch() {
+        pluginResultsController = updatePluginResultsController()
         do {
             try pluginResultsController.performFetch()
         } catch {
-            DDLogError(":(")
+            DDLogError("ZendeskManager: Unable to update plugin results")
         }
     }
 
@@ -249,6 +251,7 @@ final class ZendeskManager: NSObject, ZendeskManagerProtocol {
     ///
     fileprivate override init() {
         super.init()
+        try? pluginResultsController.performFetch()
         observeZendeskNotifications()
     }