diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/managers/SearchManager.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/managers/SearchManager.kt index 73f35f66..8a01a867 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/api/managers/SearchManager.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/api/managers/SearchManager.kt @@ -27,6 +27,9 @@ interface SearchManager { * * @param query Search phrase * @param locations Comma separated list of locations IDs + * @param excludedMerchants Merchants to leave out. Applies only together with [locations]: the + * server filters merchants inside the given locations, so without them the parameter is not sent. + * @param excludedBrands Brands to leave out * @param onSearchInstant Callback for search instant * @param onError Callback for error */ diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/params/ProfileParams.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/params/ProfileParams.kt index 8e472f64..2111e1d1 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/api/params/ProfileParams.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/api/params/ProfileParams.kt @@ -1,7 +1,10 @@ package com.personalization.api.params +import org.json.JSONArray import org.json.JSONObject +import java.text.SimpleDateFormat import java.util.Date +import java.util.Locale //TODO use data loader class ProfileParams private constructor( @@ -27,8 +30,13 @@ class ProfileParams private constructor( return this } + /** + * A date goes as `YYYY-MM-DD` in the device's time zone: the server reads `birthday` so. Build + * it at local midnight (`Calendar.getInstance()`); a date picker that returns UTC midnight + * gives the day before on devices west of UTC — pass such a date as a `String` instead. + */ fun put(param: String, value: Date): Builder { - params.put(param, value) + params.put(param, formatDate(value)) return this } @@ -43,38 +51,49 @@ class ProfileParams private constructor( } fun put(param: String, value: Array): Builder { - params.put(param, value) + params.put(param, JSONArray().apply { value.forEach { put(it) } }) return this } fun put(param: String, value: Array): Builder { - params.put(param, value) + params.put(param, JSONArray().apply { value.forEach { put(it) } }) return this } + /** `0.1f` goes as `0.1`, not `0.10000000149011612`; NaN and infinity are not JSON and are left out. */ fun put(param: String, value: Array): Builder { - params.put(param, value) + params.put(param, JSONArray().apply { value.filter { it.isFinite() }.forEach { put(it.toString().toDouble()) } }) return this } fun put(param: String, value: Array): Builder { - params.put(param, value) + params.put(param, JSONArray().apply { value.forEach { put(formatDate(it)) } }) return this } fun put(param: String, value: Array): Builder { - params.put(param, value) + params.put(param, JSONArray().apply { value.forEach { put(it) } }) return this } fun put(param: String, value: Array): Builder { - params.put(param, value) + params.put(param, JSONArray().apply { value.forEach { put(it) } }) return this } fun build(): ProfileParams { return ProfileParams(params) } + + // A raw `Date` or Java array in org.json is written with its `toString()`: the server got + // "Thu Nov 13 10:00:00 GMT+03:00 2026" for a birthday and "[Ljava.lang.String;@1a2b3c" for a + // list, and answered 200 to both. + private fun formatDate(value: Date): String = + SimpleDateFormat(DATE_FORMAT, Locale.US).format(value) + } + + private companion object { + const val DATE_FORMAT = "yyyy-MM-dd" } fun toJson(): JSONObject = params diff --git a/personalization-sdk/src/main/kotlin/com/personalization/di/SdkComponent.kt b/personalization-sdk/src/main/kotlin/com/personalization/di/SdkComponent.kt index f4f65213..a57371c8 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/di/SdkComponent.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/di/SdkComponent.kt @@ -3,7 +3,6 @@ package com.personalization.di import com.personalization.SDK import com.personalization.features.notification.service.NotificationService import com.personalization.sdk.data.di.DataSourcesModule -import com.personalization.sdk.data.di.ModelsModule import com.personalization.sdk.data.di.RepositoriesModule import dagger.Component import javax.inject.Singleton @@ -13,7 +12,6 @@ import javax.inject.Singleton modules = [ DataSourcesModule::class, RepositoriesModule::class, - ModelsModule::class, SdkModule::class, AppModule::class ] diff --git a/personalization-sdk/src/main/kotlin/com/personalization/features/search/impl/SearchManagerImpl.kt b/personalization-sdk/src/main/kotlin/com/personalization/features/search/impl/SearchManagerImpl.kt index dc95ad83..0b079c47 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/features/search/impl/SearchManagerImpl.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/features/search/impl/SearchManagerImpl.kt @@ -54,7 +54,9 @@ internal class SearchManagerImpl @Inject constructor( locations?.let { searchParams.put(SearchParams.Parameter.LOCATIONS, locations) } - excludedMerchants?.let { + // The server filters merchants inside the given locations only: without locations — or with + // an empty list of them — the filter matches no product, and the search comes back empty. + if (!locations.isNullOrBlank() && excludedMerchants != null) { searchParams.put(SearchParams.Parameter.EXCLUDED_MERCHANTS, excludedMerchants.joinToString(",")) } excludedBrands?.let { diff --git a/personalization-sdk/src/main/kotlin/com/personalization/handlers/notifications/NotificationHandler.kt b/personalization-sdk/src/main/kotlin/com/personalization/handlers/notifications/NotificationHandler.kt index 2970a6fb..a38d93b0 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/handlers/notifications/NotificationHandler.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/handlers/notifications/NotificationHandler.kt @@ -4,12 +4,12 @@ import android.content.Context import android.os.Bundle import com.personalization.features.notification.data.helpers.NotificationChannelHelper import com.personalization.features.notification.domain.helpers.NotificationClickProcessor -import com.personalization.sdk.domain.usecases.notification.UpdateNotificationSourceUseCase +import com.personalization.sdk.domain.usecases.trackingSource.SetTrackingSourceUseCase import javax.inject.Inject import org.json.JSONObject class NotificationHandler @Inject constructor( - private val updateSourceUseCase: UpdateNotificationSourceUseCase, + private val setTrackingSourceUseCase: SetTrackingSourceUseCase, private val notificationClickProcessor: NotificationClickProcessor ) { @@ -31,8 +31,11 @@ class NotificationHandler @Inject constructor( notificationClickProcessor.processClick( extras = extras, sendAsync = sendAsync, + // The click attributes the next 48 hours of `/push` events as their `source`, the same + // store `tracking.setSource` writes. It does not go as top-level `from` and `code`: + // `/init` takes those for a new click of the mailing, on every launch. onResult = { type, code -> - updateSourceUseCase(type = type, id = code) + setTrackingSourceUseCase(type = type, code = code) } ) } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/di/DataSourcesModule.kt b/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/di/DataSourcesModule.kt index 4af8fcb4..b14a695c 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/di/DataSourcesModule.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/di/DataSourcesModule.kt @@ -1,7 +1,5 @@ package com.personalization.sdk.data.di -import com.personalization.sdk.data.repositories.notification.NotificationDataSource -import com.personalization.sdk.data.repositories.notification.NotificationDataSourceImpl import com.personalization.sdk.data.repositories.preferences.PreferencesDataSource import com.personalization.sdk.data.repositories.preferences.PreferencesDataSourceImpl import com.personalization.sdk.data.repositories.recommendation.RecommendationDataSource @@ -10,7 +8,6 @@ import com.personalization.sdk.data.repositories.trackingSource.TrackingSourceDa import com.personalization.sdk.data.repositories.trackingSource.TrackingSourceDataSourceImpl import dagger.Binds import dagger.Module -import dagger.Provides import javax.inject.Singleton @Module @@ -27,14 +24,4 @@ interface DataSourcesModule { @Binds @Singleton fun bindTrackingSourceDataSource(impl: TrackingSourceDataSourceImpl): TrackingSourceDataSource - - companion object { - - @Provides - fun provideNotificationDataSource( - preferencesDataSource: PreferencesDataSource - ): NotificationDataSource = NotificationDataSourceImpl( - preferencesDataSource = preferencesDataSource - ) - } } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/di/ModelsModule.kt b/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/di/ModelsModule.kt deleted file mode 100644 index cd7c3ca5..00000000 --- a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/di/ModelsModule.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.personalization.sdk.data.di - -import com.personalization.sdk.data.mappers.notification.NotificationMapper -import dagger.Module -import dagger.Provides - -@Module -class ModelsModule { - - @Provides - fun provideNotificationMapper() = NotificationMapper() -} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/mappers/notification/NotificationMapper.kt b/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/mappers/notification/NotificationMapper.kt deleted file mode 100644 index 33d85c47..00000000 --- a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/mappers/notification/NotificationMapper.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.personalization.sdk.data.mappers.notification - -import com.personalization.sdk.data.models.NotificationSourceDto -import com.personalization.sdk.domain.models.NotificationSource - -class NotificationMapper { - - fun toNotificationSource(notificationSourceDto: NotificationSourceDto): NotificationSource { - return NotificationSource( - type = notificationSourceDto.type, - id = notificationSourceDto.id, - time = notificationSourceDto.time - ) - } -} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/models/NotificationSourceDto.kt b/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/models/NotificationSourceDto.kt deleted file mode 100644 index 676b88b5..00000000 --- a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/models/NotificationSourceDto.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.personalization.sdk.data.models - -data class NotificationSourceDto( - val type: String, - val id: String, - val time: Long -) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/models/params/UserBasicParams.kt b/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/models/params/UserBasicParams.kt index 9220b620..ba2f44ee 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/models/params/UserBasicParams.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/models/params/UserBasicParams.kt @@ -7,6 +7,4 @@ object UserBasicParams { const val SID = "sid" const val SEGMENT = "segment" const val STREAM = "stream" - const val SOURCE_FROM = "from" - const val SOURCE_CODE = "code" } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/repositories/network/NetworkRepositoryImpl.kt b/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/repositories/network/NetworkRepositoryImpl.kt index ed3bb0a1..747d07f5 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/repositories/network/NetworkRepositoryImpl.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/repositories/network/NetworkRepositoryImpl.kt @@ -6,11 +6,8 @@ import com.personalization.api.OnApiCallbackListener import com.personalization.sdk.data.models.params.UserBasicParams import com.personalization.sdk.data.utils.QueryParamsUtils.addMultipleParams import com.personalization.sdk.domain.models.NetworkMethod -import com.personalization.sdk.domain.models.NotificationSource import com.personalization.sdk.domain.repositories.NetworkRepository -import com.personalization.sdk.domain.repositories.NotificationRepository import com.personalization.sdk.domain.repositories.UserSettingsRepository -import com.personalization.utils.TimeUtils import org.json.JSONArray import org.json.JSONException import org.json.JSONObject @@ -30,7 +27,6 @@ import javax.inject.Inject class NetworkRepositoryImpl @Inject constructor( private val userSettingsRepository: UserSettingsRepository, - private val notificationRepository: NotificationRepository, ) : NetworkRepository { private lateinit var baseUrl: String @@ -167,14 +163,8 @@ class NetworkRepositoryImpl @Inject constructor( ) { userSettingsRepository.updateSidLastActTime() - val notificationSource = - notificationRepository.getNotificationSource(TimeUtils.TWO_DAYS.inWholeMilliseconds) - try { - val newParams = addBasicQueryParams( - params = params, - notificationSource = notificationSource, - ) + val newParams = addBasicQueryParams(params = params) executeMethod(networkMethod, newParams, listener) } catch (e: JSONException) { @@ -182,15 +172,12 @@ class NetworkRepositoryImpl @Inject constructor( } } - private fun addBasicQueryParams( - params: JSONObject, - notificationSource: NotificationSource? - ): JSONObject { - // A request with its own `from` or `code` (a story event, a push event) keeps them: the - // clicked push would replace that code and pair its `from` with someone else's code. - val pushSource = notificationSource?.takeUnless { - params.has(UserBasicParams.SOURCE_FROM) || params.has(UserBasicParams.SOURCE_CODE) - } + /** + * The common fields of every request. A clicked push is not among them: `from` and `code` on + * `/init` record one more click of the mailing on every launch, so the click travels as the + * `source` of `/push` events instead ([com.personalization.handlers.notifications.NotificationHandler]). + */ + private fun addBasicQueryParams(params: JSONObject): JSONObject { addMultipleParams( params = params, paramsToAdd = mapOf( @@ -208,8 +195,6 @@ class NetworkRepositoryImpl @Inject constructor( key = UserBasicParams.STREAM, repoValue = userSettingsRepository.getStream(), ), - UserBasicParams.SOURCE_FROM to pushSource?.type, - UserBasicParams.SOURCE_CODE to pushSource?.id ) ) return params diff --git a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/repositories/notification/NotificationDataSource.kt b/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/repositories/notification/NotificationDataSource.kt deleted file mode 100644 index f79aead3..00000000 --- a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/repositories/notification/NotificationDataSource.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.personalization.sdk.data.repositories.notification - -import com.personalization.sdk.data.models.NotificationSourceDto - -interface NotificationDataSource { - - fun getNotificationSourceDto(): NotificationSourceDto - - fun saveType(value: String) - - fun saveId(value: String) - - fun saveTime(value: Long) -} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/repositories/notification/NotificationDataSourceImpl.kt b/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/repositories/notification/NotificationDataSourceImpl.kt deleted file mode 100644 index 1459c706..00000000 --- a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/repositories/notification/NotificationDataSourceImpl.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.personalization.sdk.data.repositories.notification - -import com.personalization.sdk.data.models.NotificationSourceDto -import com.personalization.sdk.data.repositories.preferences.PreferencesDataSource -import javax.inject.Inject - -private const val DEFAULT_TYPE: String = "" -private const val DEFAULT_ID: String = "" -private const val DEFAULT_TIME: Long = 0L - -private const val SOURCE_TYPE_KEY: String = "source_type" -private const val SOURCE_ID_KEY: String = "source_id" -private const val SOURCE_TIME_KEY: String = "source_time" - -class NotificationDataSourceImpl @Inject constructor( - private val preferencesDataSource: PreferencesDataSource -) : NotificationDataSource { - - override fun getNotificationSourceDto(): NotificationSourceDto { - return NotificationSourceDto( - type = getType(), - id = getId(), - time = getTime() - ) - } - - private fun getType(): String = preferencesDataSource.getValue(SOURCE_TYPE_KEY, DEFAULT_TYPE) - override fun saveType(value: String) = preferencesDataSource.saveValue(SOURCE_TYPE_KEY, value) - - private fun getId(): String = preferencesDataSource.getValue(SOURCE_ID_KEY, DEFAULT_ID) - override fun saveId(value: String) = preferencesDataSource.saveValue(SOURCE_ID_KEY, value) - - private fun getTime(): Long = preferencesDataSource.getValue(SOURCE_TIME_KEY, DEFAULT_TIME) - override fun saveTime(value: Long) = preferencesDataSource.saveValue(SOURCE_TIME_KEY, value) -} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/repositories/notification/NotificationRepositoryImpl.kt b/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/repositories/notification/NotificationRepositoryImpl.kt index 6cd8decd..76094ce3 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/repositories/notification/NotificationRepositoryImpl.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/sdk/data/repositories/notification/NotificationRepositoryImpl.kt @@ -3,34 +3,13 @@ package com.personalization.sdk.data.repositories.notification import com.google.gson.Gson import com.personalization.api.OnApiCallbackListener import com.personalization.api.responses.notifications.GetAllNotificationsResponse -import com.personalization.sdk.data.mappers.notification.NotificationMapper import com.personalization.sdk.data.models.params.GetAllNotificationsParams import com.personalization.sdk.data.utils.QueryParamsUtils.formNewJSONWithMultipleParams -import com.personalization.sdk.domain.models.NotificationSource import com.personalization.sdk.domain.repositories.NotificationRepository import org.json.JSONObject import javax.inject.Inject -class NotificationRepositoryImpl @Inject constructor( - private val notificationDataSource: NotificationDataSource, - private val notificationMapper: NotificationMapper -) : NotificationRepository { - - override fun getNotificationSource(timeDuration: Long): NotificationSource? { - val notificationSourceDto = notificationDataSource.getNotificationSourceDto() - - if (!isTimeCorrect(notificationSourceDto.time, timeDuration)) { - return null - } - - return notificationMapper.toNotificationSource(notificationSourceDto) - } - - override fun updateNotificationSource(type: String, id: String) { - notificationDataSource.saveType(type) - notificationDataSource.saveId(id) - notificationDataSource.saveTime(System.currentTimeMillis()) - } +class NotificationRepositoryImpl @Inject constructor() : NotificationRepository { override fun getAllNotificationsParams( email: String?, @@ -73,9 +52,4 @@ class NotificationRepositoryImpl @Inject constructor( onError(code, msg) } } - - private fun isTimeCorrect(time: Long, timeDuration: Long): Boolean { - val currentTime = System.currentTimeMillis() - return time > 0 && (time + timeDuration) > currentTime - } } diff --git a/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/models/NotificationSource.kt b/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/models/NotificationSource.kt deleted file mode 100644 index 509a5644..00000000 --- a/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/models/NotificationSource.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.personalization.sdk.domain.models - -data class NotificationSource( - val type: String, - val id: String, - val time: Long -) diff --git a/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/repositories/NotificationRepository.kt b/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/repositories/NotificationRepository.kt index 858806ae..1ddbebcc 100644 --- a/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/repositories/NotificationRepository.kt +++ b/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/repositories/NotificationRepository.kt @@ -2,15 +2,10 @@ package com.personalization.sdk.domain.repositories import com.personalization.api.OnApiCallbackListener import com.personalization.api.responses.notifications.GetAllNotificationsResponse -import com.personalization.sdk.domain.models.NotificationSource import org.json.JSONObject interface NotificationRepository { - fun getNotificationSource(timeDuration: Long): NotificationSource? - - fun updateNotificationSource(type: String, id: String) - fun getAllNotificationsParams( email: String?, phone: String?, diff --git a/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/usecases/notification/GetNotificationSourceUseCase.kt b/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/usecases/notification/GetNotificationSourceUseCase.kt deleted file mode 100644 index a87901a7..00000000 --- a/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/usecases/notification/GetNotificationSourceUseCase.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.personalization.sdk.domain.usecases.notification - -import com.personalization.sdk.domain.repositories.NotificationRepository -import javax.inject.Inject - -class GetNotificationSourceUseCase @Inject constructor( - private val notificationRepository: NotificationRepository -) { - - fun invoke( - timeDuration: Long - ) = notificationRepository.getNotificationSource( - timeDuration = timeDuration - ) -} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/usecases/notification/UpdateNotificationSourceUseCase.kt b/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/usecases/notification/UpdateNotificationSourceUseCase.kt deleted file mode 100644 index 20d8bc40..00000000 --- a/personalization-sdk/src/main/kotlin/com/personalization/sdk/domain/usecases/notification/UpdateNotificationSourceUseCase.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.personalization.sdk.domain.usecases.notification - -import com.personalization.sdk.domain.repositories.NotificationRepository -import javax.inject.Inject - -class UpdateNotificationSourceUseCase @Inject constructor( - private val notificationRepository: NotificationRepository -) { - - operator fun invoke( - type: String, - id: String - ) = notificationRepository.updateNotificationSource( - type = type, - id = id - ) -} diff --git a/personalization-sdk/src/main/kotlin/com/personalization/utils/TimeUtils.kt b/personalization-sdk/src/main/kotlin/com/personalization/utils/TimeUtils.kt deleted file mode 100644 index b4790a2c..00000000 --- a/personalization-sdk/src/main/kotlin/com/personalization/utils/TimeUtils.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.personalization.utils - -import kotlin.time.Duration -import kotlin.time.Duration.Companion.days - -object TimeUtils { - - val TWO_DAYS: Duration = 2.days -} diff --git a/personalization-sdk/src/test/kotlin/com/personalization/api/params/ProfileParamsTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/api/params/ProfileParamsTest.kt new file mode 100644 index 00000000..6f2433d7 --- /dev/null +++ b/personalization-sdk/src/test/kotlin/com/personalization/api/params/ProfileParamsTest.kt @@ -0,0 +1,49 @@ +package com.personalization.api.params + +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import java.util.Calendar +import java.util.Date + +/** What `profile/set` gets on the wire: Android's own org.json, so Robolectric. */ +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28]) +class ProfileParamsTest { + + private fun date(year: Int, month: Int, day: Int): Date = + Calendar.getInstance().apply { clear(); set(year, month - 1, day) }.time + + private fun wire(params: ProfileParams): JSONObject = JSONObject(params.toJson().toString()) + + @Test + fun `a date goes as YYYY-MM-DD`() { + val json = wire(ProfileParams.Builder().put("birthday", date(1990, 5, 17)).build()) + + assertEquals("1990-05-17", json.getString("birthday")) + } + + @Test + fun `arrays go as JSON arrays`() { + val json = wire( + ProfileParams.Builder() + .put("tags", arrayOf("a", "b")) + .put("sizes", arrayOf(42, 43)) + .put("weights", arrayOf(0.1f, Float.NaN, 1.5f)) + .put("flags", arrayOf(true, false)) + .put("dates", arrayOf(date(2026, 1, 2))) + .put("objects", arrayOf(JSONObject().put("k", "v"))) + .build() + ) + + assertEquals("""["a","b"]""", json.getJSONArray("tags").toString()) + assertEquals("[42,43]", json.getJSONArray("sizes").toString()) + assertEquals("[0.1,1.5]", json.getJSONArray("weights").toString()) + assertEquals("[true,false]", json.getJSONArray("flags").toString()) + assertEquals("""["2026-01-02"]""", json.getJSONArray("dates").toString()) + assertEquals("v", json.getJSONArray("objects").getJSONObject(0).getString("k")) + } +} diff --git a/personalization-sdk/src/test/kotlin/com/personalization/features/search/impl/SearchInstantParamsTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/features/search/impl/SearchInstantParamsTest.kt index ad9aca19..6d73fa76 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/features/search/impl/SearchInstantParamsTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/features/search/impl/SearchInstantParamsTest.kt @@ -24,8 +24,10 @@ class SearchInstantParamsTest { } private val manager = SearchManagerImpl(network) + // Without locations the server's merchant filter matches no product: an instant search with + // `excluded_merchants` alone comes back empty (2568 products → 0 on the demo shop). @Test - fun `excluded merchants are sent without locations`() { + fun `excluded merchants are not sent without locations`() { manager.searchInstant( query = "shoes", locations = null, @@ -35,7 +37,7 @@ class SearchInstantParamsTest { onError = { _, _ -> } ) - assertEquals("m1,m2", params.captured.getString("excluded_merchants")) + assertFalse(params.captured.has("excluded_merchants")) assertFalse(params.captured.has("locations")) } @@ -44,13 +46,27 @@ class SearchInstantParamsTest { manager.searchInstant( query = "shoes", locations = "msk", - excludedMerchants = listOf("m1"), + excludedMerchants = listOf("m1", "m2"), excludedBrands = null, onSearchInstant = {}, onError = { _, _ -> } ) - assertEquals("m1", params.captured.getString("excluded_merchants")) + assertEquals("m1,m2", params.captured.getString("excluded_merchants")) assertEquals("msk", params.captured.getString("locations")) } + + @Test + fun `excluded merchants are not sent with blank locations`() { + manager.searchInstant( + query = "shoes", + locations = " ", + excludedMerchants = listOf("m1"), + excludedBrands = null, + onSearchInstant = {}, + onError = { _, _ -> } + ) + + assertFalse(params.captured.has("excluded_merchants")) + } } diff --git a/personalization-sdk/src/test/kotlin/com/personalization/handlers/notifications/NotificationHandlerSourceTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/handlers/notifications/NotificationHandlerSourceTest.kt new file mode 100644 index 00000000..91ce7dac --- /dev/null +++ b/personalization-sdk/src/test/kotlin/com/personalization/handlers/notifications/NotificationHandlerSourceTest.kt @@ -0,0 +1,34 @@ +package com.personalization.handlers.notifications + +import com.personalization.features.notification.domain.helpers.NotificationClickProcessor +import com.personalization.sdk.domain.usecases.trackingSource.SetTrackingSourceUseCase +import io.mockk.every +import io.mockk.just +import io.mockk.mockk +import io.mockk.runs +import io.mockk.verify +import org.junit.Test + +/** + * A clicked push attributes later events through the tracking source — the `source` object of + * `/push` events — and not through top-level `from` and `code`, which `/init` counts as a click. + */ +class NotificationHandlerSourceTest { + + private val setTrackingSource = mockk { + every { this@mockk(any(), any()) } just runs + } + private val processor = mockk { + every { processClick(any(), any(), any()) } answers { + thirdArg<(String, String) -> Unit>().invoke("bulk", "push-1") + } + } + private val handler = NotificationHandler(setTrackingSource, processor) + + @Test + fun `a clicked push sets the tracking source`() { + handler.notificationClicked(extras = null, sendAsync = { _, _ -> }) + + verify(exactly = 1) { setTrackingSource(type = "bulk", code = "push-1") } + } +} diff --git a/personalization-sdk/src/test/kotlin/com/personalization/sdk/data/repositories/network/NetworkRepositoryImplTest.kt b/personalization-sdk/src/test/kotlin/com/personalization/sdk/data/repositories/network/NetworkRepositoryImplTest.kt index 93fcaacf..68422723 100644 --- a/personalization-sdk/src/test/kotlin/com/personalization/sdk/data/repositories/network/NetworkRepositoryImplTest.kt +++ b/personalization-sdk/src/test/kotlin/com/personalization/sdk/data/repositories/network/NetworkRepositoryImplTest.kt @@ -1,8 +1,6 @@ package com.personalization.sdk.data.repositories.network import com.personalization.api.OnApiCallbackListener -import com.personalization.sdk.domain.models.NotificationSource -import com.personalization.sdk.domain.repositories.NotificationRepository import com.personalization.sdk.domain.repositories.UserSettingsRepository import io.mockk.every import io.mockk.mockk @@ -50,7 +48,6 @@ class NetworkRepositoryImplTest { private var handler: (Recorded) -> Reply? = { Reply(200, "{}") } private val release = CountDownLatch(1) - private val notificationRepository = mockk() private val uncaught = CopyOnWriteArrayList() private var previousUncaughtHandler: Thread.UncaughtExceptionHandler? = null private lateinit var repository: NetworkRepositoryImpl @@ -72,9 +69,7 @@ class NetworkRepositoryImplTest { every { getSegmentForABTesting() } returns "A" every { getStream() } returns "android" } - every { notificationRepository.getNotificationSource(any()) } returns null - - repository = NetworkRepositoryImpl(settings, notificationRepository) + repository = NetworkRepositoryImpl(settings) repository.initialize("http://127.0.0.1:${server.localPort}/") previousUncaughtHandler = Thread.getDefaultUncaughtExceptionHandler() @@ -188,31 +183,26 @@ class NetworkRepositoryImplTest { } @Test - fun `a push click does not replace the request's own code`() { - every { notificationRepository.getNotificationSource(any()) } returns - NotificationSource(type = "bulk", id = "push-1", time = System.currentTimeMillis()) - + fun `a request keeps its own code and gets no from`() { val listener = Recorder() repository.post("track/stories", JSONObject().put("code", "story-1"), listener) listener.awaitCalls() val body = JSONObject(requests.single().body) assertEquals("story-1", body.getString("code")) - assertFalse("from of the push must not pair with the story's code", body.has("from")) + assertFalse(body.has("from")) } + // `/init` with top-level `from` and `code` records a click of that mailing: they are not common + // fields. A clicked push travels as the `source` of `/push` events instead. @Test - fun `a push click is attributed to a request without its own code`() { - every { notificationRepository.getNotificationSource(any()) } returns - NotificationSource(type = "bulk", id = "push-1", time = System.currentTimeMillis()) - + fun `common fields carry no from or code`() { val listener = Recorder() - repository.post("push/attributed", JSONObject(), listener) + repository.post("push", JSONObject().put("event", "view"), listener) listener.awaitCalls() val body = JSONObject(requests.single().body) - assertEquals("bulk", body.getString("from")) - assertEquals("push-1", body.getString("code")) + assertEquals(setOf("event", "shop_id", "did", "sid", "seance", "segment", "stream"), body.keys().asSequence().toSet()) } @Test