refactor Store

Author: dsay

UserReport/UserReport/Session/Session.swift

@@ -29,19 +29,32 @@ public class Session: NSObject {
     @objc public private(set) var screenView: Int = 0
 
     /// Number of screen viewed in all session
-    @objc public private(set) var totalScreenView: Int = Store.totalScreenView {
-        didSet { Store.totalScreenView = self.totalScreenView }
+    @objc public private(set) var totalScreenView: Int {
+        get {
+            localStore.totalScreenView
+        }
+        set {
+            localStore.totalScreenView = newValue
+        }
     }
-    
+
     /// Number of seconds spent in the application for all time
-    @objc public private(set) var totalSecondsInApp: TimeInterval = Store.totalSecondsInApp {
-        didSet { Store.totalSecondsInApp = self.totalSecondsInApp }
+    @objc public private(set) var totalSecondsInApp: TimeInterval {
+        get {
+            localStore.totalSecondsInApp
+        }
+        set {
+            localStore.totalSecondsInApp = newValue
+        }
     }
 
     /// Date when the survey will be appear again
-    @objc public var localQuarantineDate: Date {
+    @objc public internal(set) var localQuarantineDate: Date {
         get {
-            return Store.localQuarantineDate
+            localStore.localQuarantineDate
+        }
+        set {
+             localStore.localQuarantineDate = newValue
         }
     }
 
@@ -57,23 +70,28 @@ public class Session: NSObject {
     /// The timer with which the parameters `sessionSeconds` and `totalSecondsInApp` will be updated
     private var sessionUpdateTimer: Timer?
 
+    /// Store used for the store current session
+    private var localStore: Store!
+    
     // MARK: Init
 
     /**
      * Creates an instance with the specified object `settings` (options) and closure `rulesPassed`.
      *
      * - parameter settings:    Settings used for the current session
+     * - parameter store:    Store used for the store current session
      * - parameter rulesPassed: A closure executed when all rules pass
      *
      * - returns: The new `Session` instance.
      */
-    internal convenience init(settings: UserReportSettings? = nil, rulesPassed: @escaping SessionRulesPassedHandler) {
+    internal convenience init(settings: UserReportSettings? = nil, store: Store, rulesPassed: @escaping SessionRulesPassedHandler) {
         self.init()
 
         // DI
         self.settings = settings
         self.rulesPassed = rulesPassed
-        
+        self.localStore = store
+
         self.startTimer()
 
         // Observe UIApplication enter background/foreground
@@ -100,13 +118,6 @@ public class Session: NSObject {
         self.lastViewScreenDate = Date()
     }
 
-    /**
-     * Update local quarantine date to current date
-     */
-    internal func updateLocalQuarantineDate(_ localQuarantine: Date) {
-        Store.localQuarantineDate = localQuarantine
-    }
-    
     /**
      * Set new settings.
      */
@@ -163,7 +174,7 @@ public class Session: NSObject {
         guard self.totalScreenView >= settings.inviteAfterTotalScreensViewed else { return }
         guard self.sessionSeconds >= settings.sessionNSecondsLength else { return }
         guard self.totalSecondsInApp >= settings.inviteAfterNSecondsInApp else { return }
-        guard Date() >= Store.localQuarantineDate  else { return }
+        guard Date() >= localStore.localQuarantineDate  else { return }
 
         self.rulesPassed?()
     }

UserReport/UserReport/Session/Store.swift

@@ -18,39 +18,36 @@ internal class Store {
 
     // MARK: Values
 
-    static var totalScreenView: Int {
+    var totalScreenView: Int {
         get {
-            return self.shared.data?[Keys.totalScreenView] as? Int ?? 0
+            data?[Keys.totalScreenView] as? Int ?? 0
         }
         set {
-            self.shared.data?[Keys.totalScreenView] = newValue
-            self.shared.save()
+            data?[Keys.totalScreenView] = newValue
+            save()
         }
     }
 
-    static var totalSecondsInApp: TimeInterval {
+    var totalSecondsInApp: TimeInterval {
         get {
-            return self.shared.data?[Keys.totalSecondsInApp] as? TimeInterval ?? 0
+            data?[Keys.totalSecondsInApp] as? TimeInterval ?? 0
         }
         set {
-            self.shared.data?[Keys.totalSecondsInApp] = newValue
-            self.shared.save()
+            data?[Keys.totalSecondsInApp] = newValue
+            save()
         }
     }
 
-    static var localQuarantineDate: Date {
+    var localQuarantineDate: Date {
         get {
-            return self.shared.data?[Keys.localQuarantineDate] as! Date
+            data?[Keys.localQuarantineDate] as! Date
         }
         set {
-            self.shared.data?[Keys.localQuarantineDate] = newValue
-            self.shared.save()
+            data?[Keys.localQuarantineDate] = newValue
+            save()
         }
     }
 
-    /// Singleton instance
-    private static let shared = Store()
-    
     /// Name of the file stored in documents
     private static let fileName = "userreport_store.plist"
 
@@ -63,7 +60,7 @@ internal class Store {
 
     // MARK: Init
 
-    private init() {
+    init() {
         self.load()
         if self.data?[Keys.localQuarantineDate] == nil {
             self.data?[Keys.localQuarantineDate] = Date()

UserReport/UserReport/UserReport.swift

@@ -233,7 +233,7 @@ private var sharedInstance: UserReport?
         self.logger = Logger(info: self.info)
         self.logger.log("Initialize SDK version: \(UserReport.sdkVersion) (sakID:\(sakId) mediaID:\(mediaId))", level: .info)
 
-        self.session = Session(rulesPassed: { [weak self] in
+        self.session = Session(store: Store(), rulesPassed: { [weak self] in
             self?.tryInvite(force: false)
         })
 
@@ -344,7 +344,7 @@ private var sharedInstance: UserReport?
         self.surveyStatus = .requestInvite
 
         /// Set local quarantine for reason some internal troubles
-        self.getLocalQuarantineDate().map(self.session.updateLocalQuarantineDate)
+        self.getLocalQuarantineDate().flatMap { self.session.localQuarantineDate = $0 }
 
         self.network.invitation(info: self.info) { [weak self] result in
             guard let self = self else { return }
@@ -485,9 +485,7 @@ private var sharedInstance: UserReport?
 
             switch result {
             case .success(let value):
-                
-                let date = value.inLocalTill.flatMap(self.dateFormatter.date)
-                date.map(self.session.updateLocalQuarantineDate)
+                value.inLocalTill.flatMap(self.dateFormatter.date).flatMap { self.session.localQuarantineDate = $0 }
 
             case .failure(let error):