Ivan Valkou 5 лет назад
Родитель
Сommit
c68ee46ab6
2 измененных файлов с 5 добавлено и 3 удалено
  1. 1 1
      FreeAPS/Sources/APS/APSManager.swift
  2. 4 2
      FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift

+ 1 - 1
FreeAPS/Sources/APS/APSManager.swift

@@ -123,7 +123,7 @@ final class BaseAPSManager: APSManager, Injectable {
             .flatMap { _ in
                 self.openAPS.determineBasal(currentTemp: temp, clock: now)
             }
-            .map { true }
+            .map { $0 != nil }
             .eraseToAnyPublisher()
 
         if temp.duration == 0,

+ 4 - 2
FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift

@@ -12,7 +12,7 @@ final class OpenAPS {
         self.storage = storage
     }
 
-    func determineBasal(currentTemp: TempBasal, clock: Date = Date()) -> Future<Void, Never> {
+    func determineBasal(currentTemp: TempBasal, clock: Date = Date()) -> Future<Suggestion?, Never> {
         Future { promise in
             self.processQueue.async {
                 // clock
@@ -69,8 +69,10 @@ final class OpenAPS {
                 if var suggestion = Suggestion(from: suggested) {
                     suggestion.timestamp = clock
                     try? self.storage.save(suggestion, as: Enact.suggested)
+                    promise(.success(suggestion))
+                } else {
+                    promise(.success(nil))
                 }
-                promise(.success(()))
             }
         }
     }