Merge pull request #8730 from woocommerce/issue/8729-update-ipp-feedback-status

[IPPInAppFeedback] Update and save feedback status upon merchant submission

Author: iamgabrielma

WooCommerce/Classes/ViewRelated/Orders/OrderListViewController.swift

@@ -832,8 +832,7 @@ private extension OrderListViewController {
         let shareIPPFeedbackAction = TopBannerViewModel.ActionButton(title: Localization.shareFeedbackButton, action: { [weak self] _ in
             self?.displayIPPFeedbackBannerSurvey(survey: survey)
             self?.viewModel.IPPFeedbackBannerCTATapped(for: campaign)
-            // We dismiss the banner at this point as we cannot know if the user successfully submitted it
-            self?.viewModel.IPPFeedbackBannerWasDismissed(for: campaign)
+            self?.viewModel.IPPFeedbackBannerWasSubmitted()
         })
 
         let viewModel = TopBannerViewModel(

WooCommerce/Classes/ViewRelated/Orders/OrderListViewModel.swift

@@ -224,25 +224,17 @@ final class OrderListViewModel {
         stores.dispatch(action)
     }
 
-    // This is a temporary method in order to update the IPP feedback status to `.pending`, and
-    // then load feedback visibility. We need to reset the banner status on UserDefaults for
-    // the banner to appear again for testing purposes.
+    // Requests if the In-Person Payments feedback banner should be shown,
+    // in which case we proceed to sync the view model by fetching transactions
     private func syncIPPBannerVisibility() {
-        let action = AppSettingsAction.updateFeedbackStatus(type: .inPersonPayments, status: .pending) { _ in
-            self.loadIPPFeedbackBannerVisibility()
-            self.fetchIPPTransactions()
-        }
-        stores.dispatch(action)
-    }
-
-    private func loadIPPFeedbackBannerVisibility() {
-        let action = AppSettingsAction.loadFeedbackVisibility(type: .inPersonPayments) { [weak self] result in
-            switch result {
+        let action = AppSettingsAction.loadFeedbackVisibility(type: .inPersonPayments) { [weak self] visibility in
+            switch visibility {
             case .success(let visible):
                 self?.hideIPPFeedbackBanner = !visible
+                self?.fetchIPPTransactions()
             case .failure(let error):
                 self?.hideIPPFeedbackBanner = true
-                ServiceLocator.crashLogging.logError(error)
+                DDLogError("Couldn't load feedback visibility. \(error)")
             }
         }
         self.stores.dispatch(action)
@@ -425,6 +417,22 @@ extension OrderListViewModel {
     func IPPFeedbackBannerWasDismissed(for campaign: FeatureAnnouncementCampaign) {
         dismissIPPFeedbackBanner(remindAfterDays: nil, campaign: campaign)
     }
+
+    func IPPFeedbackBannerWasSubmitted() {
+        //  Updates the IPP feedback banner status as given
+        let updateFeedbackStatus = AppSettingsAction.updateFeedbackStatus(type: .inPersonPayments, status: .given(Date())) { [weak self] _ in
+            self?.hideIPPFeedbackBanner = true
+        }
+        stores.dispatch(updateFeedbackStatus)
+
+        //  Updates the IPP feedback banner status to not be reminded again
+        let updateBannerVisibility = AppSettingsAction.setFeatureAnnouncementDismissed(
+            campaign: .inPersonPaymentsPowerUsers,
+            remindAfterDays: nil,
+            onCompletion: nil
+        )
+        stores.dispatch(updateBannerVisibility)
+    }
 }
 
 // MARK: - Remote Notifications Observation

WooCommerce/WooCommerceTests/ViewRelated/Orders/OrderListViewModelTests.swift

@@ -542,6 +542,101 @@ final class OrderListViewModelTests: XCTestCase {
         assertEqual(expectedSource, actualProperties["source"] as? String)
         assertEqual(expectedRemindLater, actualProperties["remind_later"] as? Bool)
     }
+
+    func test_IPPFeedbackBannerWasSubmitted_hides_banner_after_being_called() {
+        // Given
+        let viewModel = OrderListViewModel(siteID: siteID, filters: nil)
+
+        // When
+        viewModel.IPPFeedbackBannerWasSubmitted()
+        viewModel.hasErrorLoadingData = false
+        viewModel.hideOrdersBanners = true
+
+        // Then
+        waitUntil {
+            viewModel.topBanner == .none
+        }
+    }
+
+    func test_IPPFeedbackBannerWasSubmitted_then_it_calls_updateFeedbackStatus_with_right_parameters() {
+        // Given
+        let viewModel = OrderListViewModel(siteID: siteID, stores: stores, filters: nil)
+        var updatedFeedbackStatus: FeedbackSettings.Status?
+        var receivedFeedbackType: FeedbackType?
+
+        // When
+        stores.whenReceivingAction(ofType: AppSettingsAction.self) { action in
+            switch action {
+            case let .updateFeedbackStatus(type, status, onCompletion):
+                receivedFeedbackType = type
+                updatedFeedbackStatus = status
+                onCompletion(.success(()))
+            default:
+                break
+            }
+        }
+
+        viewModel.activate()
+        viewModel.IPPFeedbackBannerWasSubmitted()
+
+        // Then
+        XCTAssertTrue(viewModel.hideIPPFeedbackBanner)
+
+        XCTAssertEqual(receivedFeedbackType, .inPersonPayments)
+
+        switch updatedFeedbackStatus {
+        case .given:
+            break
+        default:
+            XCTFail()
+        }
+    }
+
+    func test_IPPFeedbackBannerWasSubmitted_then_it_calls_setFeatureAnnouncementDismissed_with_right_parameters() {
+        // Given
+        let viewModel = OrderListViewModel(siteID: siteID, stores: stores, filters: nil)
+        var receivedCampaign: FeatureAnnouncementCampaign?
+        var receivedRemindAfterDays: Int?
+
+        // When
+        stores.whenReceivingAction(ofType: AppSettingsAction.self) { action in
+            switch action {
+            case let .setFeatureAnnouncementDismissed(campaign, remindAfterDays, _):
+                receivedRemindAfterDays = remindAfterDays
+                receivedCampaign = campaign
+            default:
+                break
+            }
+        }
+
+        viewModel.activate()
+        viewModel.IPPFeedbackBannerWasSubmitted()
+
+        // Then
+        XCTAssertEqual(receivedCampaign, .inPersonPaymentsPowerUsers)
+        XCTAssertNil(receivedRemindAfterDays)
+    }
+
+    func test_feedback_status_when_IPPFeedbackBannerWasSubmitted_is_not_called_then_feedback_status_is_nil() {
+        // Given
+        let viewModel = OrderListViewModel(siteID: siteID, stores: stores, filters: nil)
+        var feedbackStatus: FeedbackSettings.Status?
+
+        // When
+        stores.whenReceivingAction(ofType: AppSettingsAction.self) { action in
+            switch action {
+            case let .updateFeedbackStatus(.inPersonPayments, status, onCompletion):
+                feedbackStatus = status
+                onCompletion(.success(()))
+            default:
+                break
+            }
+        }
+        viewModel.activate()
+
+        // Then
+        assertEqual(nil, feedbackStatus)
+    }
 }
 
 // MARK: - Helpers