Places now update after data migration runs on the home page

Author: mattbarker016

TCAT/AppDelegate.swift

@@ -36,17 +36,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         GMSServices.provideAPIKey(Keys.googleMaps.value)
         GMSPlacesClient.provideAPIKey(Keys.googlePlaces.value)
 
-        // v1.2.2 Data Migration
-        
-        print("Begin Data Migration")
-        if VersionStore.shared.savedAppVersion <= WhatsNew.Version(major: 1, minor: 2, patch: 1) {
-            migrationToNewPlacesModel { (success, errorDescription) in
-                print("Data Migration Complete - Success: \(success), Error: \(errorDescription ?? "n/a")")
-                let payload = DataMigrationOnePointThreePayload(success: success, errorDescription: errorDescription)
-                Analytics.shared.log(payload)
-            }
-        }
-        
         // Update shortcut items
         AppShortcuts.shared.updateShortcutItems()
 
@@ -80,6 +69,19 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let rootVC = showOnboarding ? OnboardingViewController(initialViewing: true) : HomeViewController()
         let navigationController = showOnboarding ? OnboardingNavigationController(rootViewController: rootVC) :
             CustomNavigationController(rootViewController: rootVC)
+        
+        // v1.2.2 Data Migration
+        print("Begin Data Migration")
+        if VersionStore.shared.savedAppVersion <= WhatsNew.Version(major: 1, minor: 2, patch: 1) {
+            migrationToNewPlacesModel { (success, errorDescription) in
+                if let homeViewController = rootVC as? HomeViewController {
+                    homeViewController.viewWillAppear(false)
+                }
+                print("Data Migration Complete - Success: \(success), Error: \(errorDescription ?? "n/a")")
+                let payload = DataMigrationOnePointThreePayload(success: success, errorDescription: errorDescription)
+                Analytics.shared.log(payload)
+            }
+        }
 
         // Initalize window without storyboard
         self.window = UIWindow(frame: UIScreen.main.bounds)

TCAT/Controllers/HomeViewController.swift

@@ -57,10 +57,8 @@ class HomeViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        // Fetch Places
-        recentLocations = SearchTableViewManager.shared.retrievePlaces(for: Constants.UserDefaults.recentSearch)
-        favorites = SearchTableViewManager.shared.retrievePlaces(for: Constants.UserDefaults.favorites)
-
+        updatePlaces()
+        
         // Add Notification Observers
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil)
@@ -86,7 +84,6 @@ class HomeViewController: UIViewController {
 
         tableView.snp.makeConstraints { (make) in
             make.leading.trailing.bottom.equalToSuperview()
-
             if #available(iOS 11.0, *) {
                 make.top.equalTo(view.safeAreaLayoutGuide.snp.top)
             } else {
@@ -151,13 +148,10 @@ class HomeViewController: UIViewController {
             return
         }
 
-        // Dismiss current banner, if any
+        // Dismiss current banner or loading indicator, if any
         banner?.dismiss()
         banner = nil
-
-        // Dismiss current loading indicator, if any
-        loadingIndicator?.removeFromSuperview()
-        loadingIndicator = nil
+        removeLoadingIndicator()
 
         switch reachability.connection {
         case .none:
@@ -180,19 +174,15 @@ class HomeViewController: UIViewController {
         reachability?.stopNotifier()
         NotificationCenter.default.removeObserver(self, name: .reachabilityChanged, object: reachability)
 
-        // Remove banner
+        // Remove banner and loading indicator
         banner?.dismiss()
         banner = nil
-
-        // Remove activity indicator
-        loadingIndicator?.removeFromSuperview()
-        loadingIndicator = nil
+        removeLoadingIndicator()
     }
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        recentLocations = SearchTableViewManager.shared.retrievePlaces(for: Constants.UserDefaults.recentSearch)
-        favorites = SearchTableViewManager.shared.retrievePlaces(for: Constants.UserDefaults.favorites)
+        updatePlaces()
         if !isNetworkDown {
             sections = createSections()
         }
@@ -206,6 +196,11 @@ class HomeViewController: UIViewController {
         StoreReviewHelper.checkAndAskForReview()
 
     }
+    
+    func updatePlaces() {
+        recentLocations = SearchTableViewManager.shared.retrievePlaces(for: Constants.UserDefaults.recentSearch)
+        favorites = SearchTableViewManager.shared.retrievePlaces(for: Constants.UserDefaults.favorites)
+    }
 
     func createSections() -> [Section] {
         var allSections: [Section] = []
@@ -538,7 +533,7 @@ extension HomeViewController: DZNEmptyDataSetSource, DZNEmptyDataSetDelegate {
         return NSAttributedString(string: title, attributes: [.foregroundColor: Colors.tcatBlue])
     }
 
-    func setUpLoadingIndicator() {
+    func setupLoadingIndicator() {
         loadingIndicator = LoadingIndicator()
         if let loadingIndicator = loadingIndicator {
             view.addSubview(loadingIndicator)
@@ -548,9 +543,14 @@ extension HomeViewController: DZNEmptyDataSetSource, DZNEmptyDataSetDelegate {
             }
         }
     }
+    
+    func removeLoadingIndicator() {
+        loadingIndicator?.removeFromSuperview()
+        loadingIndicator = nil
+    }
 
     func emptyDataSet(_ scrollView: UIScrollView, didTap didTapButton: UIButton) {
-        setUpLoadingIndicator()
+        setupLoadingIndicator()
         if isLoading {
             tableView.reloadData()
 
@@ -562,8 +562,7 @@ extension HomeViewController: DZNEmptyDataSetSource, DZNEmptyDataSetDelegate {
                     self.searchBar.text = nil
                     self.searchBar.placeholder = Constants.General.searchPlaceholder
                 }
-                self.loadingIndicator?.removeFromSuperview()
-                self.loadingIndicator = nil
+                self.removeLoadingIndicator()
                 self.tableView.reloadData()
             }
         }