Fix "expiry" values

While using .seconds case an object never be with expired date and expiry values will be different for memory and disk storages when coped to memory for hybrid storage.

Author: Lug4rd

Source/Shared/Storage/HybridStorage.swift

@@ -18,7 +18,7 @@ extension HybridStorage: StorageAware {
     } catch {
       let entry = try diskStorage.entry(ofType: type, forKey: key)
       // set back to memoryStorage
-      memoryStorage.setObject(entry.object, forKey: key)
+      memoryStorage.setObject(entry.object, forKey: key, expiry: entry.expiry)
       return entry
     }
   }

Source/Shared/Storage/MemoryStorage.swift

@@ -37,7 +37,7 @@ extension MemoryStorage: StorageAware {
   }
 
   func setObject<T: Codable>(_ object: T, forKey key: String, expiry: Expiry? = nil) {
-    let capsule = MemoryCapsule(value: object, expiry: expiry ?? config.expiry)
+    let capsule = MemoryCapsule(value: object, expiry: .date(expiry?.date ?? config.expiry.date))
     cache.setObject(capsule, forKey: NSString(string: key))
     keys.insert(key)
   }

Tests/iOS/Tests/Storage/HybridStorageTests.swift

@@ -61,6 +61,26 @@ final class HybridStorageTests: XCTestCase {
       XCTAssertEqual(inMemoryCachedObject, testObject)
     }
   }
+  
+  func testEntityExpiryForObjectCopyToMemory() throws {
+    let date = Date().addingTimeInterval(3)
+    try when("set to disk only") {
+      try storage.diskStorage.setObject(testObject, forKey: key, expiry: .seconds(3))
+      let entry = try storage.entry(ofType: User.self, forKey: key)
+      //accuracy for slow disk processes
+      XCTAssertEqual(entry.expiry.date.timeIntervalSinceReferenceDate,
+                     date.timeIntervalSinceReferenceDate,
+                     accuracy: 1.0)
+    }
+    
+    try then("there is no object in memory") {
+      let entry = try storage.memoryStorage.entry(ofType: User.self, forKey: key)
+      //accuracy for slow disk processes
+      XCTAssertEqual(entry.expiry.date.timeIntervalSinceReferenceDate,
+                     date.timeIntervalSinceReferenceDate,
+                     accuracy: 1.0)
+    }
+  }
 
   /// Removes cached object from memory and disk
   func testRemoveObject() throws {

Tests/iOS/Tests/Storage/MemoryStorageTests.swift

@@ -39,6 +39,21 @@ final class MemoryStorageTests: XCTestCase {
     XCTAssertEqual(entry?.object.lastName, testObject.lastName)
     XCTAssertEqual(entry?.expiry.date, config.expiry.date)
   }
+  
+  func testSetObjectWithExpiry() {
+    let date = Date().addingTimeInterval(1)
+    storage.setObject(testObject, forKey: key, expiry: .seconds(1))
+    var entry = try! storage.entry(ofType: User.self, forKey: key)
+    XCTAssertEqual(entry.expiry.date.timeIntervalSinceReferenceDate,
+                   date.timeIntervalSinceReferenceDate,
+                   accuracy: 0.1)
+    //Timer vs sleep: do not complicate
+    sleep(1)
+    entry = try! storage.entry(ofType: User.self, forKey: key)
+    XCTAssertEqual(entry.expiry.date.timeIntervalSinceReferenceDate,
+                   date.timeIntervalSinceReferenceDate,
+                   accuracy: 0.1)
+  }
 
   /// Test that it removes cached object
   func testRemoveObject() {