Skip to content

Commit a55e970

Browse files
authored
[Woo POS] Remove site_id frompos_card_present_collect_payment_success event (#15894)
2 parents decc41e + 124fd47 commit a55e970

File tree

5 files changed

+4
-13
lines changed

5 files changed

+4
-13
lines changed

WooCommerce/Classes/POS/Analytics/POSCollectOrderPaymentAnalytics.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,15 @@ final class POSCollectOrderPaymentAnalytics: POSCollectOrderPaymentAnalyticsTrac
1212

1313
private let analytics: Analytics
1414

15-
private let siteID: Int64
1615
private var paymentGatewayAccount: PaymentGatewayAccount?
1716
private let configuration: CardPresentPaymentsConfiguration
1817
private var connectedReader: CardReader?
1918
var connectedReaderModel: String? {
2019
connectedReader?.readerType.model
2120
}
2221

23-
init(siteID: Int64,
24-
analytics: Analytics = ServiceLocator.analytics,
22+
init(analytics: Analytics = ServiceLocator.analytics,
2523
configuration: CardPresentPaymentsConfiguration = CardPresentConfigurationLoader().configuration) {
26-
self.siteID = siteID
2724
self.analytics = analytics
2825
self.configuration = configuration
2926
}
@@ -61,7 +58,6 @@ final class POSCollectOrderPaymentAnalytics: POSCollectOrderPaymentAnalyticsTrac
6158
countryCode: configuration.countryCode,
6259
paymentMethod: capturedPaymentData.paymentMethod,
6360
cardReaderModel: connectedReaderModel,
64-
siteID: siteID,
6561
millisecondsSinceCustomerIteractionStarted: elapsedTimeSinceCustomerInteraction,
6662
millisecondsSinceOrderSyncSuccess: elapsedTimeSinceOrderSync,
6763
millisecondsSinceReaderReadyToCollect: elapsedTimeSinceCardReaderReady,

WooCommerce/Classes/POS/Analytics/WooAnalyticsEvent+PointOfSale.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ extension WooAnalyticsEvent {
3030
static let cardReaderModel = "card_reader_model"
3131
static let countryCode = "country"
3232
static let paymentMethodType = "payment_method_type"
33-
static let siteID = "site_id"
3433
static let gatewayID = "plugin_slug"
3534
}
3635

@@ -111,7 +110,6 @@ extension WooAnalyticsEvent {
111110
countryCode: CountryCode,
112111
paymentMethod: PaymentMethod,
113112
cardReaderModel: String?,
114-
siteID: Int64,
115113
millisecondsSinceCustomerIteractionStarted: Double,
116114
millisecondsSinceOrderSyncSuccess: Double,
117115
millisecondsSinceReaderReadyToCollect: Double,
@@ -122,7 +120,6 @@ extension WooAnalyticsEvent {
122120
Key.countryCode: countryCode.rawValue,
123121
Key.gatewayID: safeGatewayID(for: forGatewayID),
124122
Key.paymentMethodType: paymentMethod.analyticsValue,
125-
Key.siteID: siteID,
126123
Key.millisecondsSinceCustomerInteractionStarted: "\(millisecondsSinceCustomerIteractionStarted)",
127124
Key.millisecondsSinceOrderSyncSuccess: "\(millisecondsSinceOrderSyncSuccess)",
128125
Key.millisecondsSinceReaderReadyToCollect: "\(millisecondsSinceReaderReadyToCollect)",

WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private extension POSTabCoordinator {
8888
func presentPOSView() {
8989
Task { @MainActor [weak self] in
9090
guard let self else { return }
91-
let collectOrderPaymentAnalyticsTracker = POSCollectOrderPaymentAnalytics(siteID: siteID)
91+
let collectOrderPaymentAnalyticsTracker = POSCollectOrderPaymentAnalytics()
9292
let cardPresentPaymentService = await CardPresentPaymentService(siteID: siteID,
9393
stores: storesManager,
9494
collectOrderPaymentAnalyticsTracker: collectOrderPaymentAnalyticsTracker)

WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuViewModel.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ final class HubMenuViewModel: ObservableObject {
154154
}()
155155

156156
private(set) var cardPresentPaymentService: CardPresentPaymentFacade?
157-
private(set) var collectOrderPaymentAnalyticsTracker: POSCollectOrderPaymentAnalytics
157+
private(set) var collectOrderPaymentAnalyticsTracker = POSCollectOrderPaymentAnalytics()
158158
private let analytics: Analytics
159159

160160
init(siteID: Int64,
@@ -181,7 +181,6 @@ final class HubMenuViewModel: ObservableObject {
181181
currencySettings: ServiceLocator.currencySettings,
182182
featureFlagService: featureFlagService)
183183
self.analytics = analytics
184-
self.collectOrderPaymentAnalyticsTracker = POSCollectOrderPaymentAnalytics(siteID: siteID)
185184
observeSiteForUIUpdates()
186185
observePlanName()
187186
observeGoogleAdsEntryPointAvailability()

WooCommerce/WooCommerceTests/POS/Analytics/POSCollectOrderPaymentAnalyticsTests.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ struct POSCollectOrderPaymentAnalyticsTests {
1717
// Given
1818
let siteID: Int64 = 123
1919
let configuration = CardPresentPaymentsConfiguration(country: .US)
20-
let sut = POSCollectOrderPaymentAnalytics(siteID: siteID, analytics: analytics, configuration: configuration)
20+
let sut = POSCollectOrderPaymentAnalytics(analytics: analytics, configuration: configuration)
2121
let capturedPaymentData = CardPresentCapturedPaymentData(paymentMethod: .cardPresent(details: .fake()), receiptParameters: nil)
2222
let expectedEvent = "card_present_collect_payment_success"
2323
let expectedProperties = [
@@ -29,7 +29,6 @@ struct POSCollectOrderPaymentAnalyticsTests {
2929
"card_reader_model",
3030
"country",
3131
"payment_method_type",
32-
"site_id",
3332
"plugin_slug"
3433
]
3534

0 commit comments

Comments
 (0)