use CD pump history for autosense() and autotune() in openAPS

FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift

@@ -165,15 +165,9 @@ final class OpenAPS {
                 let tempBasal = currentTemp.rawJSON
                 self.storage.save(tempBasal, as: Monitor.tempBasal)
 
-                let a = self.loadFileFromStorage(name: OpenAPS.Monitor.pumpHistory)
-
                 let pumpHistory = self.fetchPumpHistory()
                 let pumpHistoryJSON = self.parsePumpHistory(pumpHistory ?? [])
 
-//                print("pump historyjson \(DebuggingIdentifiers.inProgress) \(pumpHistoryJSON)")
-//
-//                print("vorlage \(DebuggingIdentifiers.inProgress) \(a)")
-
                 // carbs
                 let carbs = self.fetchCarbs()
                 let carbsString = self.jsonConverter.convertToJSON(carbs)
@@ -453,7 +447,10 @@ final class OpenAPS {
         Future { promise in
             self.processQueue.async {
                 debug(.openAPS, "Start autosens")
-                let pumpHistory = self.loadFileFromStorage(name: OpenAPS.Monitor.pumpHistory)
+                
+                // pump history
+                let pumpHistory = self.fetchPumpHistory()
+                let pumpHistoryJSON = self.parsePumpHistory(pumpHistory ?? [])
 
                 // carbs
                 let carbs = self.fetchCarbs()
@@ -468,7 +465,7 @@ final class OpenAPS {
                 let tempTargets = self.loadFileFromStorage(name: Settings.tempTargets)
                 let autosensResult = self.autosense(
                     glucose: glucoseString,
-                    pumpHistory: pumpHistory,
+                    pumpHistory: pumpHistoryJSON,
                     basalprofile: basalProfile,
                     profile: profile,
                     carbs: carbsString,
@@ -491,7 +488,10 @@ final class OpenAPS {
         Future { promise in
             self.processQueue.async {
                 debug(.openAPS, "Start autotune")
-                let pumpHistory = self.loadFileFromStorage(name: OpenAPS.Monitor.pumpHistory)
+
+                // pump history
+                let pumpHistory = self.fetchPumpHistory()
+                let pumpHistoryJSON = self.parsePumpHistory(pumpHistory ?? [])
 
                 /// glucose
                 let glucose = self.fetchGlucose()
@@ -505,7 +505,7 @@ final class OpenAPS {
                 let carbsString = self.jsonConverter.convertToJSON(carbs)
 
                 let autotunePreppedGlucose = self.autotunePrepare(
-                    pumphistory: pumpHistory,
+                    pumphistory: pumpHistoryJSON,
                     profile: profile,
                     glucose: glucoseString,
                     pumpprofile: pumpProfile,

Model/Core_Data.xcdatamodeld/Core_Data.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22222" systemVersion="22G120" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22757" systemVersion="23E224" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
     <entity name="Autosens_" representedClassName="Autosens_" syncable="YES">
         <attribute name="newisf" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
         <attribute name="ratio" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
@@ -216,7 +216,7 @@
         <relationship name="bolus" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="BolusStored" inverseName="pumpEvent" inverseEntity="BolusStored"/>
         <relationship name="tempBasal" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="TempBasalStored" inverseName="pumpEvent" inverseEntity="TempBasalStored"/>
         <fetchIndex name="byTimestamp">
-            <fetchIndexElement property="timestamp" type="Binary" order="ascending"/>
+            <fetchIndexElement property="timestamp" type="Binary" order="descending"/>
         </fetchIndex>
         <uniquenessConstraints>
             <uniquenessConstraint>