store rounded down contact date

DP-3T · Apr 28, 2020 · 4e18a17 · 4e18a17
1 parent 6e6c58f
commit 4e18a17
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Sources/DP3TSDK/Cryptography/DP3TCryptoModule.swift b/Sources/DP3TSDK/Cryptography/DP3TCryptoModule.swift
@@ -167,7 +167,8 @@ class DP3TCryptoModule {
             // generate all ephIDs for day
             let ephIDs = Set(try DP3TCryptoModule.createEphIDs(secretKey: secretKeyForDay))
             // check all handshakes if they match any of the ephIDs
-            for contact in contactsOnDay {
+            // make sure that all contact date is before bucket date
+            for contact in contactsOnDay where bucketDate >= contact.date {
                 if ephIDs.contains(contact.ephID) {
                     matchingContacts.append(contact)
                 }

diff --git a/Sources/DP3TSDK/Database/ContactsStorage.swift b/Sources/DP3TSDK/Database/ContactsStorage.swift
@@ -53,7 +53,7 @@ class ContactsStorage {
     /// - Parameter contact: the Contact to add
     func add(contact: Contact) {
         let insert = table.insert(
-            dateColumn <- Date(timeIntervalSince1970: contact.day.timestamp).millisecondsSince1970,
+            dateColumn <- contact.date.millisecondsSince1970,
             ephIDColumn <- contact.ephID,
             windowCountColumn <- contact.windowCount,
             associatedKnownCaseColumn <- contact.associatedKnownCase
@@ -104,7 +104,7 @@ class ContactsStorage {
             guard row[associatedKnownCaseColumn] == nil else { continue }
             let model = Contact(identifier: row[idColumn],
                                 ephID: row[ephIDColumn],
-                                day: DayDate(date: Date(milliseconds: row[dateColumn])),
+                                date: Date(milliseconds: row[dateColumn]),
                                 windowCount: row[windowCountColumn],
                                 associatedKnownCase: row[associatedKnownCaseColumn])
             contacts.append(model)

diff --git a/Sources/DP3TSDK/Models/Contact.swift b/Sources/DP3TSDK/Models/Contact.swift
@@ -10,7 +10,7 @@ import Foundation
 struct Contact {
     let identifier: Int?
     let ephID: EphID
-    let day: DayDate
+    let date: Date
     let windowCount: Int
     let associatedKnownCase: Int?
 }

diff --git a/Sources/DP3TSDK/utils/ContactFactory.swift b/Sources/DP3TSDK/utils/ContactFactory.swift
@@ -67,10 +67,11 @@ enum ContactFactory {
             }
 
             if numberOfMatchingWindows != 0 {
-                let day = DayDate(date: firstValue.0)
+                let timestamp = firstValue.0.timeIntervalSince1970
+                let bucketTimestamp = timestamp - timestamp.truncatingRemainder(dividingBy: NetworkingConstants.batchLength)
                 return Contact(identifier: nil,
                                ephID: ephID,
-                               day: day,
+                               date: Date(timeIntervalSince1970: bucketTimestamp),
                                windowCount: numberOfMatchingWindows,
                                associatedKnownCase: nil)
             }