Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ dependencies {
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
implementation 'io.reactivex.rxjava2:rxjava:2.1.8'
implementation 'io.reactivex.rxjava2:rxkotlin:2.2.0'
testImplementation 'io.mockk:mockk:1.7.14'
testImplementation 'io.mockk:mockk:1.9.kotlin12'
testImplementation 'org.robolectric:robolectric:3.6.1'
testImplementation 'com.squareup.okhttp3:mockwebserver:3.11.0'
implementation supportLibs
Expand Down
3 changes: 1 addition & 2 deletions library/src/main/java/io/constructor/core/ConstructorIo.kt
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,7 @@ object ConstructorIo {
val sectionNameParam = sectionName ?: preferenceHelper.defaultItemSection
val params = mutableListOf(Constants.QueryConstants.SESSION to sessionId.toString(),
Constants.QueryConstants.AUTOCOMPLETE_SECTION to sectionNameParam)
clientIds.forEach { params.add(Constants.QueryConstants.CUSTOMER_ID to it) }
disposable.add(dataManager.trackPurchase(params.toTypedArray()).subscribeOn(Schedulers.io())
disposable.add(dataManager.trackPurchase(clientIds.toList(), 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
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(params: Array<Pair<String, String>>): Completable {
return constructorApi.trackPurchase(params.toMap())
fun trackPurchase(customerIds: List<String>, params: Array<Pair<String, String>>): Completable {
return constructorApi.trackPurchase(customerIds, params.toMap())
}

}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.constructor.data.remote

import io.constructor.core.Constants
import io.constructor.data.model.AutocompleteResult
import io.reactivex.Completable
import io.reactivex.Single
Expand Down Expand Up @@ -36,5 +37,5 @@ interface ConstructorApi {
fun trackInputFocus(@Query("term") term: String?, @QueryMap params: Map<String, String>): Completable

@GET(ApiPaths.URL_PURCHASE)
fun trackPurchase(@QueryMap params: Map<String, String>): Completable
fun trackPurchase(@Query(Constants.QueryConstants.CUSTOMER_ID) customerIds: List<String>, @QueryMap params: Map<String, String>): Completable
}
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()) } returns Completable.complete()
every { data.trackPurchase(any(), any()) } returns Completable.complete()
constructorIo.trackPurchase(arrayOf("id1"))
verify(exactly = 1) { data.trackPurchase(any()) }
verify(exactly = 1) { data.trackPurchase(any(), any()) }
}

}
Loading