Cancel cuttent temp target if get a new active one

ivalkou · Jan 19, 2022 · 012af03 · 012af03 · bjornoleh · Jan 19, 2022
1 parent 9104ae4
commit 012af03
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 98 deletions.
diff --git a/Dependencies/LoopKit/LoopKit.xcodeproj/xcshareddata/xcschemes/LoopKit Example.xcscheme b/Dependencies/LoopKit/LoopKit.xcodeproj/xcshareddata/xcschemes/LoopKit Example.xcscheme
diff --git a/FreeAPS/Sources/APS/Storage/TempTargetsStorage.swift b/FreeAPS/Sources/APS/Storage/TempTargetsStorage.swift
@@ -31,6 +31,17 @@ final class BaseTempTargetsStorage: TempTargetsStorage, Injectable {
 
     private func storeTempTargets(_ targets: [TempTarget], isPresets: Bool) {
         processQueue.sync {
+            var targets = targets
+            if !isPresets {
+                if current() != nil, let newActive = targets.last(where: {
+                    $0.createdAt.addingTimeInterval(Int($0.duration).minutes.timeInterval) > Date()
+                        && $0.createdAt <= Date()
+                }) {
+                    // cancel current
+                    targets += [TempTarget.cancel(at: newActive.createdAt.addingTimeInterval(-1))]
+                }
+            }
+
             let file = isPresets ? OpenAPS.FreeAPS.tempTargetsPresets : OpenAPS.Settings.tempTargets
             var uniqEvents: [TempTarget] = []
             self.storage.transaction { storage in

diff --git a/FreeAPS/Sources/Models/TempTarget.swift b/FreeAPS/Sources/Models/TempTarget.swift
@@ -25,6 +25,18 @@ struct TempTarget: JSON, Identifiable, Equatable, Hashable {
     func hash(into hasher: inout Hasher) {
         hasher.combine(createdAt)
     }
+
+    static func cancel(at date: Date) -> TempTarget {
+        TempTarget(
+            name: TempTarget.cancel,
+            createdAt: date,
+            targetTop: 0,
+            targetBottom: 0,
+            duration: 0,
+            enteredBy: TempTarget.manual,
+            reason: TempTarget.cancel
+        )
+    }
 }
 
 extension TempTarget {

diff --git a/FreeAPS/Sources/Modules/AddTempTarget/AddTempTargetStateModel.swift b/FreeAPS/Sources/Modules/AddTempTarget/AddTempTargetStateModel.swift
@@ -45,17 +45,7 @@ extension AddTempTarget {
         }
 
         func cancel() {
-            let entry = TempTarget(
-                name: TempTarget.cancel,
-                createdAt: Date(),
-                targetTop: 0,
-                targetBottom: 0,
-                duration: 0,
-                enteredBy: TempTarget.manual,
-                reason: TempTarget.cancel
-            )
-            storage.storeTempTargets([entry])
-
+            storage.storeTempTargets([TempTarget.cancel(at: Date())])
             showModal(for: nil)
         }