Skip to content

Commit

Permalink
Update all AnalyticsEventParams properties to vals (#1243)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tdchow
tdchow authored Dec 18, 2024
1 parent 4bfcf65 commit 2447b2f
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 53 deletions.
12 changes: 6 additions & 6 deletions BraintreeCore/src/main/java/com/braintreepayments/api/core/AnalyticsEventParams.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import androidx.annotation.RestrictTo
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
data class AnalyticsEventParams @JvmOverloads constructor(
var payPalContextId: String? = null,
var linkType: String? = null,
var isVaultRequest: Boolean = false,
var startTime: Long? = null,
var endTime: Long? = null,
var endpoint: String? = null,
val payPalContextId: String? = null,
val linkType: String? = null,
val isVaultRequest: Boolean = false,
val startTime: Long? = null,
val endTime: Long? = null,
val endpoint: String? = null,
val experiment: String? = null,
val paymentMethodsDisplayed: List<String> = emptyList(),
val appSwitchUrl: String? = null
Expand Down
5 changes: 3 additions & 2 deletions LocalPayment/src/main/java/com/braintreepayments/api/localpayment/LocalPaymentClient.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,9 @@ class LocalPaymentClient internal constructor(
}

private fun sendAnalyticsEvent(eventName: String) {
val eventParameters = AnalyticsEventParams()
eventParameters.payPalContextId = payPalContextId
val eventParameters = AnalyticsEventParams(
payPalContextId = payPalContextId
)
braintreeClient.sendAnalyticsEvent(eventName, eventParameters)
}

Expand Down
5 changes: 3 additions & 2 deletions ...ment/src/test/java/com/braintreepayments/api/localpayment/LocalPaymentClientUnitTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,9 @@ public void createPaymentAuthRequest_success_withPaymentId_sendsAnalyticsEvents(
sut.createPaymentAuthRequest(getIdealLocalPaymentRequest(), localPaymentAuthCallback);

verify(braintreeClient).sendAnalyticsEvent(LocalPaymentAnalytics.PAYMENT_STARTED, new AnalyticsEventParams());
AnalyticsEventParams params = new AnalyticsEventParams();
params.setPayPalContextId("some-paypal-context-id");
AnalyticsEventParams params = new AnalyticsEventParams(
"some-paypal-context-id"
);
verify(braintreeClient).sendAnalyticsEvent(LocalPaymentAnalytics.BROWSER_SWITCH_SUCCEEDED, params);
}

Expand Down
90 changes: 54 additions & 36 deletions PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalClientUnitTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,11 @@ public void createPaymentAuthRequest_whenPayPalNotEnabled_returnsError() {
"for more information.",
((PayPalPaymentAuthRequest.Failure) request).getError().getMessage());

AnalyticsEventParams params = new AnalyticsEventParams();
params.setVaultRequest(false);
AnalyticsEventParams params = new AnalyticsEventParams(
null,
null,
false
);
verify(braintreeClient).sendAnalyticsEvent(PayPalAnalytics.TOKENIZATION_FAILED, params);
}

Expand All @@ -309,8 +312,11 @@ public void createPaymentAuthRequest_whenCheckoutRequest_whenConfigError_forward
assertTrue(request instanceof PayPalPaymentAuthRequest.Failure);
assertEquals(authError, ((PayPalPaymentAuthRequest.Failure) request).getError());

AnalyticsEventParams params = new AnalyticsEventParams();
params.setVaultRequest(false);
AnalyticsEventParams params = new AnalyticsEventParams(
null,
null,
false
);
verify(braintreeClient).sendAnalyticsEvent(PayPalAnalytics.TOKENIZATION_FAILED, params);
}

Expand All @@ -334,8 +340,11 @@ public void requestBillingAgreement_whenConfigError_forwardsErrorToListener() {
assertTrue(request instanceof PayPalPaymentAuthRequest.Failure);
assertEquals(authError, ((PayPalPaymentAuthRequest.Failure) request).getError());

AnalyticsEventParams params = new AnalyticsEventParams();
params.setVaultRequest(true);
AnalyticsEventParams params = new AnalyticsEventParams(
null,
null,
true
);
verify(braintreeClient).sendAnalyticsEvent(PayPalAnalytics.TOKENIZATION_FAILED, params);
}

Expand Down Expand Up @@ -414,9 +423,11 @@ public void createPaymentAuthRequest_whenVaultRequest_sendsAppSwitchStartedEvent
assertFalse(browserSwitchOptions.isLaunchAsNewTask());


AnalyticsEventParams params = new AnalyticsEventParams();
params.setVaultRequest(true);
params.setLinkType("universal");
AnalyticsEventParams params = new AnalyticsEventParams(
null,
"universal",
true
);
verify(braintreeClient).sendAnalyticsEvent(PayPalAnalytics.APP_SWITCH_STARTED, params);
}

Expand Down Expand Up @@ -541,8 +552,11 @@ public void tokenize_whenCancelUriReceived_notifiesCancellationAndSendsAnalytics
PayPalResult result = captor.getValue();
assertTrue(result instanceof PayPalResult.Cancel);

AnalyticsEventParams params = new AnalyticsEventParams();
params.setVaultRequest(false);
AnalyticsEventParams params = new AnalyticsEventParams(
null,
null,
false
);
verify(braintreeClient).sendAnalyticsEvent(PayPalAnalytics.BROWSER_LOGIN_CANCELED, params);
}

Expand Down Expand Up @@ -582,9 +596,11 @@ public void tokenize_whenPayPalInternalClientTokenizeResult_callsBackResult()
assertTrue(result instanceof PayPalResult.Success);
assertEquals(payPalAccountNonce, ((PayPalResult.Success) result).getNonce());

AnalyticsEventParams params = new AnalyticsEventParams();
params.setPayPalContextId("EC-HERMES-SANDBOX-EC-TOKEN");
params.setVaultRequest(false);
AnalyticsEventParams params = new AnalyticsEventParams(
"EC-HERMES-SANDBOX-EC-TOKEN",
null,
false
);
verify(braintreeClient).sendAnalyticsEvent(PayPalAnalytics.TOKENIZATION_SUCCEEDED, params);
}

Expand Down Expand Up @@ -624,19 +640,20 @@ public void tokenize_whenPayPalInternalClientTokenizeResult_sendsAppSwitchSuccee
assertTrue(result instanceof PayPalResult.Success);
assertEquals(payPalAccountNonce, ((PayPalResult.Success) result).getNonce());

AnalyticsEventParams params = new AnalyticsEventParams();
params.setPayPalContextId("EC-HERMES-SANDBOX-EC-TOKEN");
AnalyticsEventParams params = new AnalyticsEventParams(
"EC-HERMES-SANDBOX-EC-TOKEN"
);
verify(braintreeClient).sendAnalyticsEvent(PayPalAnalytics.TOKENIZATION_SUCCEEDED, params);
AnalyticsEventParams appSwitchParams = new AnalyticsEventParams(
"EC-HERMES-SANDBOX-EC-TOKEN",
null,
false,
null,
null,
null,
null,
emptyList(),
"sample-scheme://onetouch/v1/success?PayerID=HERMES-SANDBOX-PAYER-ID&paymentId=HERMES-SANDBOX-PAYMENT-ID&token=EC-HERMES-SANDBOX-EC-TOKEN&switch_initiated_time=17166111926211"
"EC-HERMES-SANDBOX-EC-TOKEN",
null,
false,
null,
null,
null,
null,
emptyList(),
"sample-scheme://onetouch/v1/success?PayerID=HERMES-SANDBOX-PAYER-ID&paymentId=HERMES-SANDBOX-PAYMENT-ID&token=EC-HERMES-SANDBOX-EC-TOKEN&switch_initiated_time=17166111926211"
);
verify(braintreeClient).sendAnalyticsEvent(PayPalAnalytics.APP_SWITCH_SUCCEEDED, appSwitchParams);
}
Expand Down Expand Up @@ -666,19 +683,20 @@ public void tokenize_whenPayPalNotEnabled_sendsAppSwitchFailedEvents() throws JS

sut.tokenize(payPalPaymentAuthResult, payPalTokenizeCallback);

AnalyticsEventParams params = new AnalyticsEventParams();
params.setPayPalContextId("SOME-BA");
AnalyticsEventParams params = new AnalyticsEventParams(
"SOME-BA"
);
verify(braintreeClient).sendAnalyticsEvent(PayPalAnalytics.TOKENIZATION_FAILED, params);
AnalyticsEventParams appSwitchParams = new AnalyticsEventParams(
"SOME-BA",
null,
false,
null,
null,
null,
null,
emptyList(),
"https://some-scheme/onetouch/v1/cancel?token=SOME-BA&switch_initiated_time=17166111926211"
"SOME-BA",
null,
false,
null,
null,
null,
null,
emptyList(),
"https://some-scheme/onetouch/v1/cancel?token=SOME-BA&switch_initiated_time=17166111926211"
);
verify(braintreeClient).sendAnalyticsEvent(PayPalAnalytics.APP_SWITCH_FAILED, appSwitchParams);
}
Expand Down
10 changes: 6 additions & 4 deletions Venmo/src/main/java/com/braintreepayments/api/venmo/VenmoClient.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,12 @@ class VenmoClient internal constructor(

private val analyticsParams: AnalyticsEventParams
get() {
val eventParameters = AnalyticsEventParams(appSwitchUrl = venmoRepository.venmoUrl.toString())
eventParameters.payPalContextId = payPalContextId
eventParameters.linkType = LINK_TYPE
eventParameters.isVaultRequest = isVaultRequest
val eventParameters = AnalyticsEventParams(
payPalContextId = payPalContextId,
linkType = LINK_TYPE,
isVaultRequest = isVaultRequest,
appSwitchUrl = venmoRepository.venmoUrl.toString(),
)
return eventParameters
}

Expand Down
8 changes: 5 additions & 3 deletions Venmo/src/test/java/com/braintreepayments/api/venmo/VenmoClientUnitTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -960,9 +960,11 @@ public void tokenize_withFailedVaultCall_forwardsErrorToActivityResultListener_a
assertTrue(result instanceof VenmoResult.Failure);
assertEquals(error, ((VenmoResult.Failure) result).getError());

AnalyticsEventParams params = new AnalyticsEventParams();
params.setLinkType(LINK_TYPE);
params.setVaultRequest(true);
AnalyticsEventParams params = new AnalyticsEventParams(
null,
LINK_TYPE,
true
);
verify(braintreeClient).sendAnalyticsEvent(VenmoAnalytics.TOKENIZE_FAILED, expectedVaultAnalyticsParams);
}

Expand Down

0 comments on commit 2447b2f

Please sign in to comment.