Avoid double saving

Artificial-Pancreas · Jun 7, 2023 · ce6081e · ce6081e
1 parent f574da1
commit ce6081e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/FreeAPS/Sources/APS/Storage/GlucoseStorage.swift b/FreeAPS/Sources/APS/Storage/GlucoseStorage.swift
@@ -71,11 +71,9 @@ final class BaseGlucoseStorage: GlucoseStorage, Injectable {
                 if bg_ != 0 {
                     self.coredataContext.perform {
                         let dataForForStats = Readings(context: self.coredataContext)
-
                         dataForForStats.date = bgDate
                         dataForForStats.glucose = Int16(bg_)
                         dataForForStats.id = id
-
                         try? self.coredataContext.save()
                     }
                 }

diff --git a/FreeAPS/Sources/Modules/Bolus/BolusStateModel.swift b/FreeAPS/Sources/Modules/Bolus/BolusStateModel.swift
@@ -76,11 +76,11 @@ extension Bolus {
 
         func setupInsulinRequired() {
             DispatchQueue.main.async {
-                //Manual Bolus recommondentations screen after a carb entry (normally) yields a higher amount than the insulinReq amount computed for SMBs (auto boluses). Carbs combined with a manual bolus uses the Eventual BG for glucose prediction, whereas the insulinReg for SMBs and for manual boluses not combined with a carb entry uses the minPredBG for glucose prediction (typically lower than Eventual BG).
-                
+                // Manual Bolus recommondentations screen after a carb entry (normally) yields a higher amount than the insulinReq amount computed for SMBs (auto boluses). Carbs combined with a manual bolus uses the Eventual BG for glucose prediction, whereas the insulinReg for SMBs and for manual boluses not combined with a carb entry uses the minPredBG for glucose prediction (typically lower than Eventual BG).
+
                 if self.manual {
                     self.insulinRequired = self.provider.suggestion?.insulinForManualBolus ?? 0
-                    
+
                     if self.settingsManager.settings.insulinReqPercentage != 100 {
                         self.insulinRecommended = self
                             .insulinRequired * (self.settingsManager.settings.insulinReqPercentage / 100)

diff --git a/FreeAPS/Sources/Modules/DataTable/DataTableStateModel.swift b/FreeAPS/Sources/Modules/DataTable/DataTableStateModel.swift
@@ -142,7 +142,6 @@ extension DataTable {
             let fetchRequest: NSFetchRequest<NSFetchRequestResult>
             fetchRequest = NSFetchRequest(entityName: "Readings")
             fetchRequest.predicate = NSPredicate(format: "id == %@", id)
-
             let deleteRequest = NSBatchDeleteRequest(
                 fetchRequest: fetchRequest
             )
@@ -158,7 +157,7 @@ extension DataTable {
             } catch {
                 // To do: handle any thrown errors.
             }
-            try? coredataContext.save()
+            // try? coredataContext.save()
         }
 
         func addManualGlucose() {
@@ -179,15 +178,6 @@ extension DataTable {
             )
             provider.glucoseStorage.storeGlucose([saveToJSON])
             debug(.default, "Manual Glucose saved to glucose.json")
-
-            coredataContext.perform {
-                let saveToCoreData = Readings(context: self.coredataContext)
-                saveToCoreData.date = now
-                saveToCoreData.glucose = Int16(Int(glucose))
-                saveToCoreData.id = id
-                try? self.coredataContext.save()
-                debug(.default, "Manual Glucose saved to CoreData")
-            }
         }
     }
 }