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
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -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(
Expand All @@ -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
}

Expand All @@ -43,38 +51,49 @@ class ProfileParams private constructor(
}

fun put(param: String, value: Array<String>): Builder {
params.put(param, value)
params.put(param, JSONArray().apply { value.forEach { put(it) } })
return this
}

fun put(param: String, value: Array<Int>): 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<Float>): 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<Date>): Builder {
params.put(param, value)
params.put(param, JSONArray().apply { value.forEach { put(formatDate(it)) } })
return this
}

fun put(param: String, value: Array<Boolean>): Builder {
params.put(param, value)
params.put(param, JSONArray().apply { value.forEach { put(it) } })
return this
}

fun put(param: String, value: Array<JSONObject>): 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -13,7 +12,6 @@ import javax.inject.Singleton
modules = [
DataSourcesModule::class,
RepositoriesModule::class,
ModelsModule::class,
SdkModule::class,
AppModule::class
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
) {

Expand All @@ -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)
}
)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -27,14 +24,4 @@ interface DataSourcesModule {
@Binds
@Singleton
fun bindTrackingSourceDataSource(impl: TrackingSourceDataSourceImpl): TrackingSourceDataSource

companion object {

@Provides
fun provideNotificationDataSource(
preferencesDataSource: PreferencesDataSource
): NotificationDataSource = NotificationDataSourceImpl(
preferencesDataSource = preferencesDataSource
)
}
}

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -167,30 +163,21 @@ 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) {
SDK.error(e.message, e)
}
}

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(
Expand All @@ -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
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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?,
Expand Down Expand Up @@ -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
}
}

This file was deleted.

Loading
Loading