fix pill not bug

Author: antazoey

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.2.2
+
+Fixed
+
+- Issue where pill notifications would re-schedule correctly.
+
 ## 3.2.1
 
 Fixed

Sources/PatchData/PatchDataObjects/Pill.swift

@@ -124,6 +124,8 @@ public class Pill: Swallowable {
         lastTaken = attributes.lastTaken ?? lastTaken
         expirationInterval = attributes.expirationInterval ?? expirationInterval
         pillData.attributes.times = attributes.times ?? pillData.attributes.times
+        pillData.attributes.timesTakenToday = attributes.timesTakenToday
+            ?? pillData.attributes.timesTakenToday
     }
 
     public func swallow() {

Sources/PatchDay/AppDelegate.swift

@@ -38,7 +38,7 @@ import WidgetKit
                 if let hormone = sdk.hormones[0] {
                     notifications.requestExpiredHormoneNotification(for: hormone)
                 }
-                if let pill = sdk.pills[0] {
+                for pill in sdk.pills.all where pill.name == "Notification Test" {
                     notifications.requestDuePillNotification(pill)
                 }
             }

Sources/PatchDay/Notifications/Notifications/DuePillNotification.swift

@@ -34,9 +34,12 @@ public class DuePillNotification: Notification, PDNotificationProtocol {
 
     public func request() {
         super.content.categoryIdentifier = DuePillNotification.categoryId
-        if let interval = pill.due?.timeIntervalSince(Date()), interval > 0 {
-            PDLog<DuePillNotification>().info("Pill notification in \(interval)")
-            super.request(when: interval, requestId: pill.id.uuidString)
-        }
+        guard let dueDate = pill.due else { return }
+        let interval = dueDate.timeIntervalSince(Date())
+        guard interval > 0 else { return }
+        let dueDateString = PDDateFormatter.formatDate(dueDate)
+        let logMessage =  "Pill notification in \(interval), due: \(dueDateString)"
+        PDLog<DuePillNotification>().info(logMessage)
+        super.request(when: interval, requestId: pill.id.uuidString)
     }
 }