- Fixes of Redmine-14014 (Issue, Letter)

prosky5 · prosky5 · commit 2a3f55535e3a · 2025-12-26T17:13:46.000+03:00
- Fixed "func update()" on Order SSEC
diff --git a/app/src/main/java/com/sendsay/example/view/fragments/TrackFragment.kt b/app/src/main/java/com/sendsay/example/view/fragments/TrackFragment.kt
@@ -166,12 +166,12 @@ class TrackFragment : BaseFragment(), AdapterView.OnItemClickListener {
 
     private fun trackClearBasket() {
         // Получение текущего времени с использованием SimpleDateFormat
-        val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US)
-        val currentDateTime = dateFormat.format(Date())
+//        val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US)
+//        val currentDateTime = dateFormat.format(Date())
 
         val data = TrackSSEC
             .basketClear()
-            .dateTime(dt = currentDateTime)
+//            .dateTime(dt = currentDateTime)
             .items(listOf(OrderItem(id = "-1")))
             .buildData()
 
diff --git a/app/src/main/res/layout/dialog_track_custom_event.xml b/app/src/main/res/layout/dialog_track_custom_event.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="Track Custom Event"
+        android:text="Track Custom Event (CCE)"
         android:textSize="20sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_track.xml b/app/src/main/res/layout/fragment_track.xml
@@ -218,7 +218,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_marginStart="8dp"
-        android:text="Custom Event"
+        android:text="Custom Event (cce)"
         android:theme="@style/AppButton"
         app:layout_constraintBottom_toBottomOf="@+id/buttonUpdateProperties"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/sdk/src/main/java/com/sendsay/sdk/models/NotificationPayload.kt b/sdk/src/main/java/com/sendsay/sdk/models/NotificationPayload.kt
@@ -17,7 +17,7 @@ internal class NotificationPayload(val rawData: HashMap<String, String>) {
     val buttons: ArrayList<ActionPayload>? = parseActions(rawData["actions"])
     val notificationAction: ActionPayload = parseMainAction(rawData["action"], rawData["url"])
     val notificationData: NotificationData = parseNotificationData(rawData)
-    val attributes: Map<String, Any>? = parseAttributes(rawData["attributes"])
+    val attributes: Map<String, Any>? = parseAttributes(rawData["data"] ?: rawData["attributes"])
     var deliveredTimestamp: Double? = notificationData.sentTimestamp
 
     data class ActionPayload(
diff --git a/sdk/src/main/java/com/sendsay/sdk/models/TrackSSECBuilders.kt b/sdk/src/main/java/com/sendsay/sdk/models/TrackSSECBuilders.kt
@@ -1,7 +1,10 @@
 package com.sendsay.sdk.models
 
 import com.sendsay.sdk.preferences.SendsayPreferencesImpl
+import com.sendsay.sdk.repository.PushNotificationRepositoryImpl
 import com.sendsay.sdk.repository.PushNotificationRepositoryImpl.Companion.KEY_ISSUE
+import com.sendsay.sdk.repository.PushNotificationRepositoryImpl.Companion.KEY_ISSUE_LETTER_DATETIME_DATA_UTC
+import com.sendsay.sdk.repository.PushNotificationRepositoryImpl.Companion.KEY_LETTER
 import com.sendsay.sdk.services.SendsayContextProvider
 
 // Типо-безопасные билдеры-обёртки вокруг существующего TrackSSECDataCore
@@ -43,8 +46,8 @@ class ViewProductBuilder internal constructor(
     }
 
     //    fun email(value: String) = apply { core.setEmail(value) }
-    fun update(isUpdate: Boolean? = null, isUpdatePerItem: Boolean? = null) = apply {
-        core.setUpdate(isUpdate, isUpdatePerItem)
+    fun update(isUpdate: Boolean? = null,) = apply {
+        core.setUpdate(isUpdate)
     }
 
     //    override fun cp(map: Map<String, Any>) = apply { core.setCp(map) }
@@ -69,8 +72,8 @@ class OrderBuilder internal constructor(
         core.setTransaction(id = id, dt = dt, sum = sum, discount = discount, status = status)
     }
 
-    fun update(isUpdate: Boolean? = null, isUpdatePerItem: Boolean? = null) = apply {
-        core.setUpdate(isUpdate, isUpdatePerItem)
+    fun update(isUpdate: Boolean? = null) = apply {
+        core.setUpdate(isUpdate)
     }
 
     fun delivery(dt: String, price: Double? = null) = apply { core.setDelivery(dt, price) }
@@ -88,7 +91,11 @@ class OrderBuilder internal constructor(
         core.setProduct(id = id, name = name, price = price)
     }
 
-    //    override fun cp(map: Map<String, Any>) = apply { core.setCp(map) }
+    fun update(isUpdate: Boolean? = null, isUpdatePerItem: Boolean? = null) = apply {
+        core.setUpdate(isUpdate, isUpdatePerItem)
+    }
+
+        //    override fun cp(map: Map<String, Any>) = apply { core.setCp(map) }
     override fun buildData(): TrackSSECData = core.build()
     override fun buildProperties(): HashMap<String, Any> =
         core.build().toProperties(TrackingSSECType.ORDER)
@@ -435,11 +442,12 @@ internal class TrackSSECDataCore(private val type: TrackingSSECType) {
         val formattedPaymentDt = paymentDt
 
         // Передача данных о выпуске CDP Sendsay (Redmine 14014)
-        val prefs = SendsayPreferencesImpl(SendsayContextProvider.applicationContext!!)
+        val prefs =
+            PushNotificationRepositoryImpl(SendsayPreferencesImpl(SendsayContextProvider.applicationContext!!)).getExtraData() as HashMap<String, Any>
         setIssueLetter(
-            issue = prefs.getLong(key = KEY_ISSUE, default = 0L).toInt(),
-            letter = prefs.getLong(key = KEY_ISSUE, default = 0L).toInt(),
-            issueDt = prefs.getString(key = KEY_ISSUE, default = "")
+            issue = (prefs.entries.find { it.key == KEY_ISSUE }?.value as String).toIntOrNull() ?: -1,
+            letter = (prefs.entries.find { it.key == KEY_LETTER }?.value as String).toIntOrNull() ?: -1,
+//            issueDt = prefs.entries.find { it.key == KEY_ISSUE_LETTER_DATETIME_DATA_UTC }?.value as String
         )
 
         return TrackSSECData(
diff --git a/sdk/src/main/java/com/sendsay/sdk/repository/PushNotificationRepositoryImpl.kt b/sdk/src/main/java/com/sendsay/sdk/repository/PushNotificationRepositoryImpl.kt
@@ -6,17 +6,19 @@ import com.sendsay.sdk.models.PushOpenedData
 import com.sendsay.sdk.preferences.SendsayPreferences
 import com.sendsay.sdk.util.Logger
 import com.sendsay.sdk.util.fromJson
-import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Clock
+import kotlin.time.Duration.Companion.hours
 import kotlin.time.DurationUnit
+import kotlin.time.ExperimentalTime
 
 internal class PushNotificationRepositoryImpl(
     private val preferences: SendsayPreferences
 ) : PushNotificationRepository {
     companion object {
-        //    private val ISSUE_LETTER_EXPIRE_DURATION: Long = 48.hours.toLong(DurationUnit.MILLISECONDS)
-        val ISSUE_LETTER_EXPIRE_DURATION: Long = 15.minutes.toLong(DurationUnit.MILLISECONDS)
+        private val ISSUE_LETTER_EXPIRE_DURATION: Long = 48.hours.toLong(DurationUnit.MILLISECONDS)
+//        val ISSUE_LETTER_EXPIRE_DURATION: Long = 15.minutes.toLong(DurationUnit.MILLISECONDS)
 
-        val KEY_ISSUE_LETTER_DATETIME_DATA = "SendsayIssueLetterDateTimeData"
+        val KEY_ISSUE_LETTER_DATETIME_DATA_UTC = "sendsay_issue_letter_datetime"
         val KEY_ISSUE = "sendsay_issue_id"
         val KEY_LETTER = "sendsay_letter_id"
     }
@@ -30,38 +32,42 @@ internal class PushNotificationRepositoryImpl(
         if (dataString.isEmpty()) {
             return null
         }
-        val mapData = Gson().fromJson<HashMap<String, Any>>(dataString)
-        checkIssueAndLetterOnExpire(mapData)
+        var mapData = Gson().fromJson<HashMap<String, Any>>(dataString)
+        mapData = checkIssueAndLetterOnExpire(mapData)
         return mapData
     }
 
-    private fun checkIssueAndLetterOnExpire(data: Map<String, Any>) {
-        val now = Calendar.getInstance().timeInMillis
+    @OptIn(ExperimentalTime::class)
+    private fun checkIssueAndLetterOnExpire(data: HashMap<String, Any>) : HashMap<String, Any> {
+        val now = Clock.System.now().toEpochMilliseconds()
         val lastIssueLetterDateTime: Long =
-            (data.entries.firstOrNull { it.key == KEY_ISSUE_LETTER_DATETIME_DATA }
-                ?.value as? Long ?: now)
+            ((data.entries.firstOrNull { it.key == KEY_ISSUE_LETTER_DATETIME_DATA_UTC }
+                ?.value as? String)?.toLong() ?: now)
         if ((now - lastIssueLetterDateTime)
             >= ISSUE_LETTER_EXPIRE_DURATION
         ) {
             val mutableMap = data.toMutableMap()
-            mutableMap.remove(KEY_ISSUE_LETTER_DATETIME_DATA)
+            mutableMap.remove(KEY_ISSUE_LETTER_DATETIME_DATA_UTC)
             mutableMap.remove(KEY_ISSUE)
             mutableMap.remove(KEY_LETTER)
             setExtraData(mutableMap)
+            return mutableMap as HashMap
         }
+        return data
     }
 
     override fun setExtraData(data: Map<String, Any>) {
-        setLastDateTimeOnIssueAndLetter(data)
-        val dataString = Gson().toJson(data)
+        val newData = setLastDateTimeOnIssueAndLetter(data)
+        val dataString = Gson().toJson(newData)
         preferences.setString(KEY_EXTRA_DATA, dataString)
     }
 
-    private fun setLastDateTimeOnIssueAndLetter(data: Map<String, Any>) {
+    private fun setLastDateTimeOnIssueAndLetter(data: Map<String, Any>): Map<String, Any> {
         if (data.entries.any { it.key == KEY_ISSUE || it.key == KEY_LETTER }) {
-            val currentDateTime = Calendar.getInstance().timeInMillis
-            data.entries.plus(KEY_ISSUE_LETTER_DATETIME_DATA to currentDateTime)
+            val currentDateTime = Calendar.getInstance().timeInMillis.toString()
+            return data.plus(KEY_ISSUE_LETTER_DATETIME_DATA_UTC to currentDateTime)
         }
+        return data
     }
 
     override fun appendDeliveredNotification(data: Map<String, String>) {
