From 124fd47f8bba3316849ce100a12bb7ba29ce2f53 Mon Sep 17 00:00:00 2001 From: Povilas Staskus <4062343+staskus@users.noreply.github.com> Date: Thu, 10 Jul 2025 22:10:20 +0300 Subject: [PATCH] Remove site_id from POSCollectOrderPaymentAnalytics --- .../POS/Analytics/POSCollectOrderPaymentAnalytics.swift | 6 +----- .../POS/Analytics/WooAnalyticsEvent+PointOfSale.swift | 3 --- WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift | 2 +- .../Classes/ViewRelated/Hub Menu/HubMenuViewModel.swift | 3 +-- .../Analytics/POSCollectOrderPaymentAnalyticsTests.swift | 3 +-- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/WooCommerce/Classes/POS/Analytics/POSCollectOrderPaymentAnalytics.swift b/WooCommerce/Classes/POS/Analytics/POSCollectOrderPaymentAnalytics.swift index f78506dc336..b8fb64b85bc 100644 --- a/WooCommerce/Classes/POS/Analytics/POSCollectOrderPaymentAnalytics.swift +++ b/WooCommerce/Classes/POS/Analytics/POSCollectOrderPaymentAnalytics.swift @@ -12,7 +12,6 @@ final class POSCollectOrderPaymentAnalytics: POSCollectOrderPaymentAnalyticsTrac private let analytics: Analytics - private let siteID: Int64 private var paymentGatewayAccount: PaymentGatewayAccount? private let configuration: CardPresentPaymentsConfiguration private var connectedReader: CardReader? @@ -20,10 +19,8 @@ final class POSCollectOrderPaymentAnalytics: POSCollectOrderPaymentAnalyticsTrac connectedReader?.readerType.model } - init(siteID: Int64, - analytics: Analytics = ServiceLocator.analytics, + init(analytics: Analytics = ServiceLocator.analytics, configuration: CardPresentPaymentsConfiguration = CardPresentConfigurationLoader().configuration) { - self.siteID = siteID self.analytics = analytics self.configuration = configuration } @@ -61,7 +58,6 @@ final class POSCollectOrderPaymentAnalytics: POSCollectOrderPaymentAnalyticsTrac countryCode: configuration.countryCode, paymentMethod: capturedPaymentData.paymentMethod, cardReaderModel: connectedReaderModel, - siteID: siteID, millisecondsSinceCustomerIteractionStarted: elapsedTimeSinceCustomerInteraction, millisecondsSinceOrderSyncSuccess: elapsedTimeSinceOrderSync, millisecondsSinceReaderReadyToCollect: elapsedTimeSinceCardReaderReady, diff --git a/WooCommerce/Classes/POS/Analytics/WooAnalyticsEvent+PointOfSale.swift b/WooCommerce/Classes/POS/Analytics/WooAnalyticsEvent+PointOfSale.swift index e462276f49c..807a3006fe6 100644 --- a/WooCommerce/Classes/POS/Analytics/WooAnalyticsEvent+PointOfSale.swift +++ b/WooCommerce/Classes/POS/Analytics/WooAnalyticsEvent+PointOfSale.swift @@ -30,7 +30,6 @@ extension WooAnalyticsEvent { static let cardReaderModel = "card_reader_model" static let countryCode = "country" static let paymentMethodType = "payment_method_type" - static let siteID = "site_id" static let gatewayID = "plugin_slug" } @@ -111,7 +110,6 @@ extension WooAnalyticsEvent { countryCode: CountryCode, paymentMethod: PaymentMethod, cardReaderModel: String?, - siteID: Int64, millisecondsSinceCustomerIteractionStarted: Double, millisecondsSinceOrderSyncSuccess: Double, millisecondsSinceReaderReadyToCollect: Double, @@ -122,7 +120,6 @@ extension WooAnalyticsEvent { Key.countryCode: countryCode.rawValue, Key.gatewayID: safeGatewayID(for: forGatewayID), Key.paymentMethodType: paymentMethod.analyticsValue, - Key.siteID: siteID, Key.millisecondsSinceCustomerInteractionStarted: "\(millisecondsSinceCustomerIteractionStarted)", Key.millisecondsSinceOrderSyncSuccess: "\(millisecondsSinceOrderSyncSuccess)", Key.millisecondsSinceReaderReadyToCollect: "\(millisecondsSinceReaderReadyToCollect)", diff --git a/WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift b/WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift index 1d9d1719c3f..23492bdb61b 100644 --- a/WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift +++ b/WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift @@ -88,7 +88,7 @@ private extension POSTabCoordinator { func presentPOSView() { Task { @MainActor [weak self] in guard let self else { return } - let collectOrderPaymentAnalyticsTracker = POSCollectOrderPaymentAnalytics(siteID: siteID) + let collectOrderPaymentAnalyticsTracker = POSCollectOrderPaymentAnalytics() let cardPresentPaymentService = await CardPresentPaymentService(siteID: siteID, stores: storesManager, collectOrderPaymentAnalyticsTracker: collectOrderPaymentAnalyticsTracker) diff --git a/WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuViewModel.swift b/WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuViewModel.swift index 9ed421efb6c..15ed4ce4348 100644 --- a/WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuViewModel.swift +++ b/WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuViewModel.swift @@ -154,7 +154,7 @@ final class HubMenuViewModel: ObservableObject { }() private(set) var cardPresentPaymentService: CardPresentPaymentFacade? - private(set) var collectOrderPaymentAnalyticsTracker: POSCollectOrderPaymentAnalytics + private(set) var collectOrderPaymentAnalyticsTracker = POSCollectOrderPaymentAnalytics() private let analytics: Analytics init(siteID: Int64, @@ -181,7 +181,6 @@ final class HubMenuViewModel: ObservableObject { currencySettings: ServiceLocator.currencySettings, featureFlagService: featureFlagService) self.analytics = analytics - self.collectOrderPaymentAnalyticsTracker = POSCollectOrderPaymentAnalytics(siteID: siteID) observeSiteForUIUpdates() observePlanName() observeGoogleAdsEntryPointAvailability() diff --git a/WooCommerce/WooCommerceTests/POS/Analytics/POSCollectOrderPaymentAnalyticsTests.swift b/WooCommerce/WooCommerceTests/POS/Analytics/POSCollectOrderPaymentAnalyticsTests.swift index bf1f425dff5..96a0fdebe8a 100644 --- a/WooCommerce/WooCommerceTests/POS/Analytics/POSCollectOrderPaymentAnalyticsTests.swift +++ b/WooCommerce/WooCommerceTests/POS/Analytics/POSCollectOrderPaymentAnalyticsTests.swift @@ -17,7 +17,7 @@ struct POSCollectOrderPaymentAnalyticsTests { // Given let siteID: Int64 = 123 let configuration = CardPresentPaymentsConfiguration(country: .US) - let sut = POSCollectOrderPaymentAnalytics(siteID: siteID, analytics: analytics, configuration: configuration) + let sut = POSCollectOrderPaymentAnalytics(analytics: analytics, configuration: configuration) let capturedPaymentData = CardPresentCapturedPaymentData(paymentMethod: .cardPresent(details: .fake()), receiptParameters: nil) let expectedEvent = "card_present_collect_payment_success" let expectedProperties = [ @@ -29,7 +29,6 @@ struct POSCollectOrderPaymentAnalyticsTests { "card_reader_model", "country", "payment_method_type", - "site_id", "plugin_slug" ]