WMSDK-411: Renaming some properties and functions

mindbox-cloud · Feb 14, 2025 · a20cfc5 · a20cfc5
1 parent 32d45a7
commit a20cfc5
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/Mindbox/Extensions/Notification+Extensions.swift b/Mindbox/Extensions/Notification+Extensions.swift
@@ -11,5 +11,5 @@ import Foundation
 extension Notification.Name {
     static let initializationCompleted = Notification.Name("MBNotification-initializationCompleted")
     static let shouldDiscardInapps = Notification.Name("MBNotification-shouldDiscardInapps")
-    static let inappConfigDownloaded = Notification.Name("MBNotification-inappConfigDownloaded")
+    static let mobileConfigDownloaded = Notification.Name("MBNotification-mobileConfigDownloaded")
 }
diff --git a/Mindbox/InAppMessages/Configuration/InAppConfigurationManager.swift b/Mindbox/InAppMessages/Configuration/InAppConfigurationManager.swift
@@ -153,16 +153,16 @@ class InAppConfigurationManager: InAppConfigurationManagerProtocol {
             SessionTemporaryStorage.shared.operationsFromSettings.insert(viewProduct.systemName.lowercased())
         }
 
-        saveInappSessionToCache(config: settings.slidingExpiration?.config)
+        saveConfigSessionToCache(settings.slidingExpiration?.config)
     }
 
     private func createTTLValidationService() -> TTLValidationProtocol {
         return TTLValidationService(persistenceStorage: self.persistenceStorage)
     }
 
-    private func saveInappSessionToCache(config: String?) {
-        SessionTemporaryStorage.shared.expiredInappSession = config
-        Logger.common(message: "Saved slidingExpiration.config - \(config) to temporary storage.")
-        NotificationCenter.default.post(name: .inappConfigDownloaded, object: nil)
+    private func saveConfigSessionToCache(_ config: String?) {
+        SessionTemporaryStorage.shared.expiredConfigSession = config
+        Logger.common(message: "Saved slidingExpiration.config - \(String(describing: config)) to temporary storage.")
+        NotificationCenter.default.post(name: .mobileConfigDownloaded, object: nil)
     }
 }
diff --git a/Mindbox/InAppMessages/InappSessionManager/InappSessionManager.swift b/Mindbox/InAppMessages/InappSessionManager/InappSessionManager.swift
@@ -51,7 +51,7 @@ final class InappSessionManager: InappSessionManagerProtocol {
             return
         }
 
-        guard let sessionTimeInSeconds = getInappSession(), sessionTimeInSeconds > 0 else {
+        guard let sessionTimeInSeconds = getConfigSession(), sessionTimeInSeconds > 0 else {
             Logger.common(message: "[InappSessionManager] expiredInappTime is nil/invalid or <= 0 — skip session expiration check.")
             return
         }
@@ -88,9 +88,9 @@ final class InappSessionManager: InappSessionManagerProtocol {
         NotificationCenter.default.post(name: .shouldDiscardInapps, object: nil)
     }
 
-    private func getInappSession() -> Double? {
-        guard let inappSession = SessionTemporaryStorage.shared.expiredInappSession,
-              let sessionTimeInSeconds = try? inappSession.parseTimeStampToSeconds() else {
+    private func getConfigSession() -> Double? {
+        guard let configSession = SessionTemporaryStorage.shared.expiredConfigSession,
+              let sessionTimeInSeconds = try? configSession.parseTimeStampToSeconds() else {
             return nil
         }
 
@@ -99,7 +99,7 @@ final class InappSessionManager: InappSessionManagerProtocol {
 
     private func addObserverToDismissInApp() {
         NotificationCenter.default.addObserver(
-            forName: .inappConfigDownloaded,
+            forName: .mobileConfigDownloaded,
             object: nil,
             queue: nil
         ) { [weak self] _ in
@@ -109,7 +109,7 @@ final class InappSessionManager: InappSessionManagerProtocol {
 
     private func logNearestInappSessionExpirationTime() {
         if let lastTrackVisitTimestamp = lastTrackVisitTimestamp,
-           let sessionTimeInSeconds = self.getInappSession(), sessionTimeInSeconds > 0 {
+           let sessionTimeInSeconds = self.getConfigSession(), sessionTimeInSeconds > 0 {
             let expirationDate = lastTrackVisitTimestamp.addingTimeInterval(sessionTimeInSeconds)
             Logger.common(message: "[InappSessionManager] Nearest session expiration time is \(expirationDate.asDateTimeWithSeconds).")
         }

diff --git a/Mindbox/Utilities/SessionTemporaryStorage.swift b/Mindbox/Utilities/SessionTemporaryStorage.swift
@@ -30,7 +30,7 @@ final class SessionTemporaryStorage {
         }
     }
 
-    var expiredInappSession: String?
+    var expiredConfigSession: String?
     var isUserVisitSaved = false
     private init() {}
 

diff --git a/MindboxTests/InApp/Tests/InappSessionManagerTests/InappSessionManagerTests.swift b/MindboxTests/InApp/Tests/InappSessionManagerTests/InappSessionManagerTests.swift
@@ -22,13 +22,13 @@ final class InappSessionManagerTests: XCTestCase {
         coreManagerMock = DI.injectOrFail(InAppCoreManagerProtocol.self) as? InAppCoreManagerMock
         persistenceStorage = DI.injectOrFail(PersistenceStorage.self)
         targetingChecker = DI.injectOrFail(InAppTargetingCheckerProtocol.self)
-        SessionTemporaryStorage.shared.expiredInappSession = ""
+        SessionTemporaryStorage.shared.expiredConfigSession = ""
     }
 
     override func tearDown() {
         manager = nil
         coreManagerMock = nil
-        SessionTemporaryStorage.shared.expiredInappSession = nil
+        SessionTemporaryStorage.shared.expiredConfigSession = nil
         super.tearDown()
     }
 
@@ -42,7 +42,7 @@ final class InappSessionManagerTests: XCTestCase {
         manager.lastTrackVisitTimestamp = Date().addingTimeInterval(-100)
         let oldTimestamp = manager.lastTrackVisitTimestamp
 
-        SessionTemporaryStorage.shared.expiredInappSession = nil
+        SessionTemporaryStorage.shared.expiredConfigSession = nil
 
         manager.checkInappSession()
 
@@ -58,7 +58,7 @@ final class InappSessionManagerTests: XCTestCase {
         manager.lastTrackVisitTimestamp = Date().addingTimeInterval(-100)
         let oldTimestamp = manager.lastTrackVisitTimestamp
 
-        SessionTemporaryStorage.shared.expiredInappSession = "0.00:00:00.0000000"
+        SessionTemporaryStorage.shared.expiredConfigSession = "0.00:00:00.0000000"
 
         manager.checkInappSession()
 
@@ -74,7 +74,7 @@ final class InappSessionManagerTests: XCTestCase {
         manager.lastTrackVisitTimestamp = Date().addingTimeInterval(-100)
         let oldTimestamp = manager.lastTrackVisitTimestamp
 
-        SessionTemporaryStorage.shared.expiredInappSession = "-0.00:00:01.0000000"
+        SessionTemporaryStorage.shared.expiredConfigSession = "-0.00:00:01.0000000"
 
         manager.checkInappSession()
 
@@ -90,7 +90,7 @@ final class InappSessionManagerTests: XCTestCase {
         manager.lastTrackVisitTimestamp = Date().addingTimeInterval(-100)
         let oldTimestamp = manager.lastTrackVisitTimestamp
 
-        SessionTemporaryStorage.shared.expiredInappSession = "100"
+        SessionTemporaryStorage.shared.expiredConfigSession = "100"
 
         manager.checkInappSession()
 
@@ -107,7 +107,7 @@ final class InappSessionManagerTests: XCTestCase {
         manager.lastTrackVisitTimestamp = now.addingTimeInterval(-2400)
         let oldTimestamp = manager.lastTrackVisitTimestamp
 
-        SessionTemporaryStorage.shared.expiredInappSession = "0.00:59:00.0000000"
+        SessionTemporaryStorage.shared.expiredConfigSession = "0.00:59:00.0000000"
 
         manager.checkInappSession()
 
@@ -123,7 +123,7 @@ final class InappSessionManagerTests: XCTestCase {
         manager.lastTrackVisitTimestamp = Date().addingTimeInterval(-2400)
         let oldTimestamp = manager.lastTrackVisitTimestamp
 
-        SessionTemporaryStorage.shared.expiredInappSession = "0.00:30:00.0000000"
+        SessionTemporaryStorage.shared.expiredConfigSession = "0.00:30:00.0000000"
 
         manager.checkInappSession()
 
@@ -140,7 +140,7 @@ final class InappSessionManagerTests: XCTestCase {
         manager.lastTrackVisitTimestamp = now.addingTimeInterval(-2400)
         let oldUserVisitCount = persistenceStorage.userVisitCount
 
-        SessionTemporaryStorage.shared.expiredInappSession = "0.00:59:00.0000000"
+        SessionTemporaryStorage.shared.expiredConfigSession = "0.00:59:00.0000000"
 
         manager.checkInappSession()
         XCTAssertEqual(persistenceStorage.userVisitCount, oldUserVisitCount)
@@ -151,7 +151,7 @@ final class InappSessionManagerTests: XCTestCase {
 
         let oldUserVisitCount = persistenceStorage.userVisitCount
 
-        SessionTemporaryStorage.shared.expiredInappSession = "0.00:30:00.0000000"
+        SessionTemporaryStorage.shared.expiredConfigSession = "0.00:30:00.0000000"
 
         manager.checkInappSession()
         XCTAssertNotEqual(persistenceStorage.userVisitCount, oldUserVisitCount)
@@ -162,7 +162,7 @@ final class InappSessionManagerTests: XCTestCase {
 
     func test_sessionUpdate_ResetStorages() {
         manager.lastTrackVisitTimestamp = Date().addingTimeInterval(-2400)
-        SessionTemporaryStorage.shared.expiredInappSession = "0.00:30:00.0000000"
+        SessionTemporaryStorage.shared.expiredConfigSession = "0.00:30:00.0000000"
 
         SessionTemporaryStorage.shared.observedCustomOperations = ["Test"]
         SessionTemporaryStorage.shared.operationsFromSettings = ["Test2"]