daysSinceLast query excludes the triggering event

If the triggering event name matches the daysSinceLast... rule event, it'll look for the first event that occurred before the triggering event.
superwall · Jun 28, 2023 · 9f6d280 · 9f6d280
1 parent e532922
commit 9f6d280
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/...perwallKit/Paywall/Presentation/Rule Logic/Expression Evaluator/ExpressionEvaluator.swift b/...perwallKit/Paywall/Presentation/Rule Logic/Expression Evaluator/ExpressionEvaluator.swift
@@ -90,6 +90,7 @@ struct ExpressionEvaluator {
 
     await ruleAttributes.addDaysSinceLastAttributes(
       given: rule,
+      triggerEvent: eventData,
       coreDataManager: storage.coreDataManager
     )
 

diff --git a/Sources/SuperwallKit/Paywall/Presentation/Rule Logic/RuleAttributes.swift b/Sources/SuperwallKit/Paywall/Presentation/Rule Logic/RuleAttributes.swift
@@ -13,6 +13,7 @@ struct RuleAttributes {
 
   mutating func addDaysSinceLastAttributes(
     given rule: TriggerRule,
+    triggerEvent event: EventData,
     coreDataManager: CoreDataManager
   ) async {
     let expression = rule.expressionJs ?? rule.expression ?? ""
@@ -33,7 +34,10 @@ struct RuleAttributes {
     }
 
     for name in eventNames {
-      if let daysSinceLastEvent = await coreDataManager.getDaysSinceLastEvent(name: name) {
+      if let daysSinceLastEvent = await coreDataManager.getDaysSinceEvent(
+        name: name,
+        before: event.name == name ? event.createdAt : nil
+      ) {
         let attribute = eventPrefix + name
         device[attribute] = daysSinceLastEvent
       }

diff --git a/Sources/SuperwallKit/Storage/Core Data/CoreDataManager.swift b/Sources/SuperwallKit/Storage/Core Data/CoreDataManager.swift
@@ -101,22 +101,28 @@ class CoreDataManager {
     }
   }
 
-  func getDaysSinceLastEvent(name: String) async -> Int? {
+  func getDaysSinceEvent(
+    name: String,
+    before date: Date?
+  ) async -> Int? {
     return await withCheckedContinuation { continuation in
-      coreDataStack.getLastSavedEvent(name: name) { event in
+      coreDataStack.getLastSavedEvent(
+        name: name,
+        before: date
+      ) { event in
         guard let event = event else {
           return continuation.resume(returning: nil)
         }
         let createdAt = event.createdAt
         let calendar = Calendar.current
         let currentDate = Date()
         let components = calendar.dateComponents(
-          [.day],
+          [.minute],
           from: createdAt,
           to: currentDate
         )
 
-        continuation.resume(returning: components.day)
+        continuation.resume(returning: components.minute)
       }
     }
   }

diff --git a/Sources/SuperwallKit/Storage/Core Data/CoreDataStack.swift b/Sources/SuperwallKit/Storage/Core Data/CoreDataStack.swift
@@ -131,6 +131,7 @@ class CoreDataStack {
 
   func getLastSavedEvent(
     name: String,
+    before date: Date?,
     completion: @escaping ((ManagedEventData?) -> Void)
   ) {
     guard let backgroundContext = backgroundContext else {
@@ -139,7 +140,11 @@ class CoreDataStack {
 
     backgroundContext.perform {
       let fetchRequest = ManagedEventData.fetchRequest()
-      fetchRequest.predicate = NSPredicate(format: "name == %@", name)
+      if let date = date {
+        fetchRequest.predicate = NSPredicate(format: "name == %@ AND createdAt < %@", name, date as NSDate)
+      } else {
+        fetchRequest.predicate = NSPredicate(format: "name == %@", name)
+      }
       fetchRequest.sortDescriptors = [NSSortDescriptor(key: "createdAt", ascending: false)]
       fetchRequest.fetchLimit = 1