WMSDK-410: change slidingExpiration contract

mindbox-cloud · Feb 13, 2025 · 9992d11 · 9992d11
1 parent 11c8e75
commit 9992d11
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/data/mapper/InAppMapper.kt b/sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/data/mapper/InAppMapper.kt
@@ -467,7 +467,7 @@ internal class InAppMapper {
     )
 
     fun mapToSlidingExpiration(slidingExpirationDtoBlank: SettingsDtoBlank.SlidingExpirationDtoBlank) = SlidingExpirationDto(
-        inappSession = slidingExpirationDtoBlank.inappSession
+        config = slidingExpirationDtoBlank.config
     )
 
     private fun getTargetingProductSegmentationsList(targeting: TreeTargeting): List<String> {

diff --git a/.../main/java/cloud/mindbox/mobile_sdk/inapp/data/repositories/MobileConfigRepositoryImpl.kt b/.../main/java/cloud/mindbox/mobile_sdk/inapp/data/repositories/MobileConfigRepositoryImpl.kt
@@ -160,8 +160,8 @@ internal class MobileConfigRepositoryImpl(
             null
         }
 
-        val slidingExpiration = runCatching { getInAppSession(configBlank) }.getOrNull {
-            mindboxLogW("Unable to get InAppSession settings $it")
+        val slidingExpiration = runCatching { getConfigSession(configBlank) }.getOrNull {
+            mindboxLogW("Unable to get slidingExpiration settings $it")
         }
 
         return SettingsDto(operations, ttl, slidingExpiration)
@@ -179,15 +179,15 @@ internal class MobileConfigRepositoryImpl(
             null
         }
 
-    private fun getInAppSession(configBlank: InAppConfigResponseBlank?): SlidingExpirationDto? =
+    private fun getConfigSession(configBlank: InAppConfigResponseBlank?): SlidingExpirationDto? =
         try {
             configBlank?.settings?.slidingExpiration?.takeIf { slidingExpirationDtoBlank ->
                 slidingExpirationValidator.isValid(slidingExpirationDtoBlank)
             }?.let { slidingExpirationDtoBlank ->
                 inAppMapper.mapToSlidingExpiration(slidingExpirationDtoBlank)
             }
         } catch (e: Exception) {
-            mindboxLogE("Error parse inappsSession time", e)
+            mindboxLogE("Error parse  config session time", e)
             null
         }
 

diff --git a/...va/cloud/mindbox/mobile_sdk/inapp/data/validators/SlidingExpirationParametersValidator.kt b/...va/cloud/mindbox/mobile_sdk/inapp/data/validators/SlidingExpirationParametersValidator.kt
@@ -7,6 +7,6 @@ import cloud.mindbox.mobile_sdk.utils.loggingRunCatching
 internal class SlidingExpirationParametersValidator : Validator<SettingsDtoBlank.SlidingExpirationDtoBlank> {
     override fun isValid(item: SettingsDtoBlank.SlidingExpirationDtoBlank): Boolean =
         loggingRunCatching(false) {
-            item.inappSession.parseTimeSpanToMillis() > 0
+            item.config.parseTimeSpanToMillis() > 0
         }
 }
diff --git a/sdk/src/main/java/cloud/mindbox/mobile_sdk/managers/MobileConfigSettingsManagerImpl.kt b/sdk/src/main/java/cloud/mindbox/mobile_sdk/managers/MobileConfigSettingsManagerImpl.kt
@@ -8,7 +8,7 @@ import kotlin.time.Duration.Companion.milliseconds
 
 internal class MobileConfigSettingsManagerImpl(private val sessionStorageManager: SessionStorageManager) : MobileConfigSettingsManager {
     override fun saveSessionTime(config: InAppConfigResponse) {
-        config.settings?.slidingExpiration?.inappSession?.parseTimeSpanToMillis()?.let { sessionTime ->
+        config.settings?.slidingExpiration?.config?.parseTimeSpanToMillis()?.let { sessionTime ->
             if (sessionTime > 0) {
                 sessionStorageManager.sessionTime = sessionTime.milliseconds
                 mindboxLogI("Session time set to ${sessionStorageManager.sessionTime.inWholeMilliseconds} ms")

diff --git a/sdk/src/main/java/cloud/mindbox/mobile_sdk/models/operation/response/InAppConfigResponse.kt b/sdk/src/main/java/cloud/mindbox/mobile_sdk/models/operation/response/InAppConfigResponse.kt
@@ -35,8 +35,8 @@ internal data class SettingsDtoBlank(
     )
 
     internal data class SlidingExpirationDtoBlank(
-        @SerializedName("inappSession")
-        val inappSession: String
+        @SerializedName("config")
+        val config: String
     )
 }
 
@@ -60,8 +60,8 @@ internal data class TtlDto(
 )
 
 internal data class SlidingExpirationDto(
-    @SerializedName("inappSession")
-    val inappSession: String
+    @SerializedName("config")
+    val config: String
 )
 
 internal data class LogRequestDto(

diff --git a/sdk/src/test/java/cloud/mindbox/mobile_sdk/models/SettingsStub.kt b/sdk/src/test/java/cloud/mindbox/mobile_sdk/models/SettingsStub.kt
@@ -14,7 +14,7 @@ internal class SettingsStub {
                     operations = emptyMap(),
                     ttl = null,
                     slidingExpiration = SlidingExpirationDto(
-                        inappSession = timeSpan
+                        config = timeSpan
                     )
                 ),
                 abtests = null

diff --git a/sdk/src/test/resources/ConfigParsing/Config/ConfigWithSettingsABTestsMonitoringInapps.json b/sdk/src/test/resources/ConfigParsing/Config/ConfigWithSettingsABTestsMonitoringInapps.json
@@ -324,7 +324,7 @@
       "inapps": "1.00:00:00"
     },
     "slidingExpiration": {
-      "inappSession": "1.00:00:00"
+      "config": "1.00:00:00"
     }
   },
   "abtests": [