Skip to content

Ch4842/revenu param purchase - cherry-picked #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 5, 2019
Merged

Ch4842/revenu param purchase - cherry-picked #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions library/src/main/java/io/constructor/core/ConstructorIo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ object ConstructorIo {

fun trackConversion(itemName: String, customerId: String, revenue: Double?, searchTerm: String = Constants.QueryConstants.TERM_UNKNOWN, sectionName: String? = null, errorCallback: ConstructorError = null) {
val sessionId = preferenceHelper.getSessionId(sessionIncrementEventHandler)
disposable.add(dataManager.trackConversion(searchTerm, itemName, customerId, "%.2f".format(revenue),
val revenueString = revenue?.let { "%.2f".format(revenue) }
disposable.add(dataManager.trackConversion(searchTerm, itemName, customerId, revenueString,
arrayOf(Constants.QueryConstants.SESSION to sessionId.toString(),
Constants.QueryConstants.AUTOCOMPLETE_SECTION to (sectionName ?: preferenceHelper.defaultItemSection))).subscribeOn(Schedulers.io())
.subscribe({}, { t ->
Expand Down Expand Up @@ -192,12 +193,13 @@ object ConstructorIo {
}))
}

fun trackPurchase(clientIds: Array<String>, sectionName: String? = null, errorCallback: ConstructorError = null) {
fun trackPurchase(clientIds: Array<String>, revenue: Double?, sectionName: String? = null, errorCallback: ConstructorError = null) {
val sessionId = preferenceHelper.getSessionId(sessionIncrementEventHandler)
val sectionNameParam = sectionName ?: preferenceHelper.defaultItemSection
val revenueString = revenue?.let { "%.2f".format(revenue) }
val params = mutableListOf(Constants.QueryConstants.SESSION to sessionId.toString(),
Constants.QueryConstants.AUTOCOMPLETE_SECTION to sectionNameParam)
disposable.add(dataManager.trackPurchase(clientIds.toList(), params.toTypedArray()).subscribeOn(Schedulers.io())
disposable.add(dataManager.trackPurchase(clientIds.toList(), revenueString, params.toTypedArray()).subscribeOn(Schedulers.io())
.subscribe({}, { t ->
t.printStackTrace()
errorCallback?.invoke(t)
Expand Down
4 changes: 2 additions & 2 deletions library/src/main/java/io/constructor/data/DataManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ constructor(private val constructorApi: ConstructorApi) {
return constructorApi.trackInputFocus(term, params.toMap())
}

fun trackPurchase(customerIds: List<String>, params: Array<Pair<String, String>>): Completable {
return constructorApi.trackPurchase(customerIds, params.toMap())
fun trackPurchase(customerIds: List<String>, revenue: String? = null, params: Array<Pair<String, String>>): Completable {
return constructorApi.trackPurchase(customerIds, revenue, params.toMap())
}

}
4 changes: 3 additions & 1 deletion library/src/main/java/io/constructor/data/remote/ConstructorApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,7 @@ interface ConstructorApi {
fun trackInputFocus(@Query("term") term: String?, @QueryMap params: Map<String, String>): Completable

@GET(ApiPaths.URL_PURCHASE)
fun trackPurchase(@Query(Constants.QueryConstants.CUSTOMER_ID) customerIds: List<String>, @QueryMap params: Map<String, String>): Completable
fun trackPurchase(@Query(Constants.QueryConstants.CUSTOMER_ID) customerIds: List<String>,
@Query("revenue") revenue: String?,
@QueryMap params: Map<String, String>): Completable
}
6 changes: 3 additions & 3 deletions library/src/test/java/io/constructor/core/ConstructorIoTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,9 @@ class ConstructorIoTest {
@Test
fun trackPurchase() {
every { pref.defaultItemSection } returns "Products"
every { data.trackPurchase(any(), any()) } returns Completable.complete()
constructorIo.trackPurchase(arrayOf("id1"))
verify(exactly = 1) { data.trackPurchase(any(), any()) }
every { data.trackPurchase(any(), any(), any()) } returns Completable.complete()
constructorIo.trackPurchase(arrayOf("id1"), 12.99)
verify(exactly = 1) { data.trackPurchase(any(), any(), any()) }
}

}
6 changes: 3 additions & 3 deletions library/src/test/java/io/constructor/data/DataManagerHttpTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ class DataManagerHttpTest {
val path = "/" + ApiPaths.URL_PURCHASE
val mockResponse = MockResponse().setResponseCode(204)
mockServer.enqueue(mockResponse)
val observer = dataManager.trackPurchase(listOf("1", "2"), arrayOf()).test()
val observer = dataManager.trackPurchase(listOf("1", "2"), "12.99", arrayOf()).test()
observer.assertComplete()
val request = mockServer.takeRequest()
assert(request.path.startsWith(path))
Expand All @@ -414,7 +414,7 @@ class DataManagerHttpTest {
val path = "/" + ApiPaths.URL_PURCHASE
val mockResponse = MockResponse().setResponseCode(500).setBody("Internal server error")
mockServer.enqueue(mockResponse)
val observer = dataManager.trackPurchase(listOf("1", "2"), arrayOf()).test()
val observer = dataManager.trackPurchase(listOf("1", "2"), "12.99", arrayOf()).test()
observer.assertError { true }
val request = mockServer.takeRequest()
assert(request.path.startsWith(path))
Expand All @@ -428,7 +428,7 @@ class DataManagerHttpTest {
val mockResponse = MockResponse().setResponseCode(500).setBody("Internal server error")
mockResponse.throttleBody(0, 5, TimeUnit.SECONDS)
mockServer.enqueue(mockResponse)
val observer = dataManager.trackPurchase(listOf("1", "2"), arrayOf()).test()
val observer = dataManager.trackPurchase(listOf("1", "2"), "12.99", arrayOf()).test()
observer.assertError(SocketTimeoutException::class.java)
val request = mockServer.takeRequest()
assert(request.path.startsWith(path))
Expand Down
6 changes: 3 additions & 3 deletions library/src/test/java/io/constructor/data/DataManagerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@ class DataManagerTest {

@Test
fun trackPurchase() {
every { constructorApi.trackPurchase(any(), any()) } returns Completable.complete()
dataManager.trackPurchase(listOf(), arrayOf())
verify(exactly = 1) { constructorApi.trackPurchase(any(), any()) }
every { constructorApi.trackPurchase(any(), any(), any()) } returns Completable.complete()
dataManager.trackPurchase(listOf(), "12.99", arrayOf())
verify(exactly = 1) { constructorApi.trackPurchase(any(), any(), any()) }
}

}