Skip to content

Add carbs to healthkit #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dyjaks wants to merge 9 commits into from
Closed

Add carbs to healthkit #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
28586cc
Add carbs to health kit
dyjaks Dec 31, 2021
0311c5a
Refactor and properly fetch glucose
dyjaks Dec 31, 2021
3401783
Create process queue for carbs instead of overloading glucose queue.
dyjaks Jan 2, 2022
14e4354
Split out carb/bg observers
dyjaks Jan 7, 2022
dd0c30b
Fix delete.
dyjaks Jan 11, 2022
af9ec3c
Add carbs from FAPX to health
dyjaks Jan 19, 2022
40a8d2f
PR Feedback
dyjaks Jan 28, 2022
dae8954
Put in nightscout carb filter
dyjaks Jan 28, 2022
6a9598a
Merge branch 'ivalkou:dev' into dev
dyjaks May 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions FreeAPS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
1D845DF2E3324130E1D95E67 /* DataTableProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60744C3E9BB3652895C908CC /* DataTableProvider.swift */; };
23888883D4EA091C88480FF2 /* BolusProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = C19984D62EFC0035A9E9644D /* BolusProvider.swift */; };
28089E07169488CF6DCC2A31 /* AddCarbsRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86FC1CFD647CF34508AF9A3B /* AddCarbsRootView.swift */; };
29AC4F68277F8A2100766404 /* CarbSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29AC4F67277F8A2100766404 /* CarbSource.swift */; };
2BE9A6FA20875F6F4F9CD461 /* PumpSettingsEditorProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D97F14812C1AFED3621165A5 /* PumpSettingsEditorProvider.swift */; };
3083261C4B268E353F36CD0B /* AutotuneConfigDataFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DCCCCE633F5E98E41B0CD3C /* AutotuneConfigDataFlow.swift */; };
3171D2818C7C72CD1584BB5E /* NotificationsConfigStateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC2C6489D29ECCCAD78E0721 /* NotificationsConfigStateModel.swift */; };
Expand Down Expand Up @@ -439,6 +440,8 @@
212E8BFE6D66EE65AA26A114 /* CalibrationsProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CalibrationsProvider.swift; sourceTree = "<group>"; };
223EC0494F55A91E3EA69EF4 /* BolusStateModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BolusStateModel.swift; sourceTree = "<group>"; };
22963BD06A9C83959D4914E4 /* NotificationsConfigRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NotificationsConfigRootView.swift; sourceTree = "<group>"; };
29AC4F65277F48C100766404 /* ConfigOverride.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigOverride.xcconfig; sourceTree = "<group>"; };
29AC4F67277F8A2100766404 /* CarbSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarbSource.swift; sourceTree = "<group>"; };
2AD22C985B79A2F0D2EA3D9D /* PumpConfigRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PumpConfigRootView.swift; sourceTree = "<group>"; };
2F2A13DF0EDEEEDC4106AA2A /* NightscoutConfigDataFlow.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NightscoutConfigDataFlow.swift; sourceTree = "<group>"; };
3260468377DA9DB4DEE9AF6D /* NotificationsConfigDataFlow.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = NotificationsConfigDataFlow.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -480,7 +483,6 @@
3811DEE725CA063400A708ED /* PersistedProperty.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PersistedProperty.swift; sourceTree = "<group>"; };
3811DF0125CA9FEA00A708ED /* Credentials.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Credentials.swift; sourceTree = "<group>"; };
3811DF0F25CAAAE200A708ED /* APSManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APSManager.swift; sourceTree = "<group>"; };
3818AA42274BBC1100843DB3 /* ConfigOverride.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigOverride.xcconfig; sourceTree = "<group>"; };
Copy link
Copy Markdown
Collaborator

@DobbyWanKenoby DobbyWanKenoby Jan 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had same problem in past, when Ivan added ConfigOverride.xcconfig file.
You deleted wrong copy of the file.

Previous version of PR you have 2 files ConfigOverride.xcconfig, one was old (original), and second - new (your).
We need only old file, but now you deleted original.

See checksum (left side) and compare it with original in FreeAPS.xcodeproj/project.pbxproj

freeaps/FreeAPS.xcodeproj/project.pbxproj

Line 483 in b8a0956

3818AA42274BBC1100843DB3 /* ConfigOverride.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigOverride.xcconfig; sourceTree = "<group>"; };

You have to return this file, and delete next with checksum '29AC4F65277F48C100766404'

3818AA45274C229000843DB3 /* LibreTransmitter */ = {isa = PBXFileReference; lastKnownFileType = folder; name = LibreTransmitter; path = Dependencies/LibreTransmitter; sourceTree = "<group>"; };
3818AA49274C267000843DB3 /* CGMBLEKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CGMBLEKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3818AA4C274C26A300843DB3 /* LoopKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LoopKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -1200,7 +1202,7 @@
isa = PBXGroup;
children = (
38F3783A2613555C009DB701 /* Config.xcconfig */,
3818AA42274BBC1100843DB3 /* ConfigOverride.xcconfig */,
Copy link
Copy Markdown
Collaborator

@DobbyWanKenoby DobbyWanKenoby Jan 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again

29AC4F65277F48C100766404 /* ConfigOverride.xcconfig */,
388E595A25AD948C0019842D /* FreeAPS */,
38FCF3EE25E9028E0078B0D1 /* FreeAPSTests */,
3818AA44274C229000843DB3 /* Packages */,
Expand Down Expand Up @@ -1310,6 +1312,7 @@
38A0363A25ECF07E00FCBB52 /* GlucoseStorage.swift */,
38FCF3FC25E997A80078B0D1 /* PumpHistoryStorage.swift */,
38F3B2EE25ED8E2A005C48AA /* TempTargetsStorage.swift */,
29AC4F67277F8A2100766404 /* CarbSource.swift */,
);
path = Storage;
sourceTree = "<group>";
Expand Down Expand Up @@ -2182,6 +2185,7 @@
38E98A2525F52C9300C0CED0 /* IssueReporter.swift in Sources */,
3811DEB025C9D88300A708ED /* BaseKeychain.swift in Sources */,
3811DE4325C9D4A100A708ED /* SettingsProvider.swift in Sources */,
29AC4F68277F8A2100766404 /* CarbSource.swift in Sources */,
45252C95D220E796FDB3B022 /* ConfigEditorDataFlow.swift in Sources */,
3871F38725ED661C0013ECB5 /* Suggestion.swift in Sources */,
38C4D33A25E9A1ED00D30B77 /* NSObject+AssociatedValues.swift in Sources */,
Expand Down Expand Up @@ -2553,7 +2557,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = "${DEVELOPER_TEAM}";
DEVELOPMENT_TEAM = 4W28235M63;
Copy link
Copy Markdown
Collaborator

@DobbyWanKenoby DobbyWanKenoby Jan 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please return back "${DEVELOPER_TEAM}"
This change automatically with ConfigOverride.xcconfig

ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = FreeAPS/Resources/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
Expand Down Expand Up @@ -2589,7 +2593,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = "${DEVELOPER_TEAM}";
DEVELOPMENT_TEAM = 4W28235M63;
Copy link
Copy Markdown
Collaborator

@DobbyWanKenoby DobbyWanKenoby Jan 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again

ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = FreeAPS/Resources/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
Expand Down Expand Up @@ -2625,7 +2629,7 @@
CODE_SIGN_ENTITLEMENTS = FreeAPSWatch/FreeAPSWatch.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(BUILD_VERSION)";
DEVELOPMENT_TEAM = "${DEVELOPER_TEAM}";
DEVELOPMENT_TEAM = 4W28235M63;
Copy link
Copy Markdown
Collaborator

@DobbyWanKenoby DobbyWanKenoby Jan 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again

GENERATE_INFOPLIST_FILE = YES;
IBSC_MODULE = FreeAPSWatch_WatchKit_Extension;
INFOPLIST_KEY_CFBundleDisplayName = "$(APP_DISPLAY_NAME)";
Expand Down Expand Up @@ -2655,7 +2659,7 @@
CODE_SIGN_ENTITLEMENTS = FreeAPSWatch/FreeAPSWatch.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(BUILD_VERSION)";
DEVELOPMENT_TEAM = "${DEVELOPER_TEAM}";
DEVELOPMENT_TEAM = 4W28235M63;
Copy link
Copy Markdown
Collaborator

@DobbyWanKenoby DobbyWanKenoby Jan 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again

GENERATE_INFOPLIST_FILE = YES;
IBSC_MODULE = FreeAPSWatch_WatchKit_Extension;
INFOPLIST_KEY_CFBundleDisplayName = "$(APP_DISPLAY_NAME)";
Expand Down Expand Up @@ -2684,7 +2688,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(BUILD_VERSION)";
DEVELOPMENT_ASSET_PATHS = "\"FreeAPSWatch WatchKit Extension/Preview Content\"";
DEVELOPMENT_TEAM = "${DEVELOPER_TEAM}";
DEVELOPMENT_TEAM = 4W28235M63;
Copy link
Copy Markdown
Collaborator

@DobbyWanKenoby DobbyWanKenoby Jan 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again

ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "FreeAPSWatch WatchKit Extension/Info.plist";
Expand Down Expand Up @@ -2720,7 +2724,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(BUILD_VERSION)";
DEVELOPMENT_ASSET_PATHS = "\"FreeAPSWatch WatchKit Extension/Preview Content\"";
DEVELOPMENT_TEAM = "${DEVELOPER_TEAM}";
DEVELOPMENT_TEAM = 4W28235M63;
Copy link
Copy Markdown
Collaborator

@DobbyWanKenoby DobbyWanKenoby Jan 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again

ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "FreeAPSWatch WatchKit Extension/Info.plist";
Expand Down Expand Up @@ -2750,7 +2754,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "$(DEVELOPER_TEAM)";
DEVELOPMENT_TEAM = 4W28235M63;
Copy link
Copy Markdown
Collaborator

@DobbyWanKenoby DobbyWanKenoby Jan 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again

INFOPLIST_FILE = FreeAPSTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.4;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -2771,7 +2775,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "$(DEVELOPER_TEAM)";
DEVELOPMENT_TEAM = 4W28235M63;
Copy link
Copy Markdown
Collaborator

@DobbyWanKenoby DobbyWanKenoby Jan 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again

INFOPLIST_FILE = FreeAPSTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.4;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down
21 changes: 16 additions & 5 deletions FreeAPS/Sources/APS/FetchTreatmentsManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ final class BaseFetchTreatmentsManager: FetchTreatmentsManager, Injectable {
@Injected() var nightscoutManager: NightscoutManager!
@Injected() var tempTargetsStorage: TempTargetsStorage!
@Injected() var carbsStorage: CarbsStorage!
@Injected() var healthKitManager: HealthKitManager!

private var lifetime = Lifetime()
private let timer = DispatchTimer(timeInterval: 1.minutes.timeInterval)
Expand All @@ -22,19 +23,29 @@ final class BaseFetchTreatmentsManager: FetchTreatmentsManager, Injectable {
private func subscribe() {
timer.publisher
.receive(on: processQueue)
.flatMap { _ -> AnyPublisher<([CarbsEntry], [TempTarget]), Never> in
.flatMap { _ -> AnyPublisher<([CarbsEntry], [TempTarget], [CarbsEntry]), Never> in
debug(.nightscout, "FetchTreatmentsManager heartbeat")
debug(.nightscout, "Start fetching carbs and temptargets")
return Publishers.CombineLatest(
return Publishers.CombineLatest3(
self.nightscoutManager.fetchCarbs(),
self.nightscoutManager.fetchTempTargets()
self.nightscoutManager.fetchTempTargets(),
self.healthKitManager.fetchCarbs()
).eraseToAnyPublisher()
}
.sink { carbs, targets in
let filteredCarbs = carbs.filter { !($0.enteredBy?.contains(CarbsEntry.manual) ?? false) }
.sink { carbs, targets, carbsFromHealth in
let since = self.carbsStorage.syncDate()
let nsCarbs = carbs.filter { !($0.enteredBy?.contains(CarbsEntry.manual) ?? false) }

let allCarbs = nsCarbs + carbsFromHealth
let filteredCarbs = allCarbs.filter { $0.createdAt > since }
let carbsForHealth = allCarbs.filter { !carbsFromHealth.contains($0) }
Copy link
Copy Markdown
Collaborator

@DobbyWanKenoby DobbyWanKenoby Jan 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please read my comment about CarbObserver.
This code doesn't work correct at situation, when we load carbs from NS, that exists in FAX, but don't exists in Health (first run such as example).

Replace 36-48 rows to

let nsCarbs = carbs.filter { !($0.enteredBy?.contains(CarbsEntry.manual) ?? false) }

let allCarbs = nsCarbs + carbsFromHealth

if allCarbs.isNotEmpty {
    self.carbsStorage.storeCarbs(allCarbs)
}


if filteredCarbs.isNotEmpty {
self.carbsStorage.storeCarbs(filteredCarbs)
}
if carbsForHealth.isNotEmpty {
self.healthKitManager.saveIfNeeded(carbs: filteredCarbs)
}
let filteredTargets = targets.filter { !($0.enteredBy?.contains(TempTarget.manual) ?? false) }
if filteredTargets.isNotEmpty {
self.tempTargetsStorage.storeTempTargets(filteredTargets)
Expand Down
5 changes: 5 additions & 0 deletions FreeAPS/Sources/APS/Storage/CarbSource.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import Combine

protocol CarbSource {
func fetchCarbs() -> AnyPublisher<[CarbsEntry], Never>
}
11 changes: 9 additions & 2 deletions FreeAPS/Sources/APS/Storage/CarbsStorage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,17 @@ final class BaseCarbsStorage: CarbsStorage, Injectable {
uniqEvents = storage.retrieve(file, as: [CarbsEntry].self)?
.filter { $0.createdAt.addingTimeInterval(1.days.timeInterval) > Date() }
.sorted { $0.createdAt > $1.createdAt } ?? []
debug(
.service,
"Storing file carbs: \(String(describing: uniqEvents))"
)
storage.save(Array(uniqEvents), as: file)
}
broadcaster.notify(CarbsObserver.self, on: processQueue) {
$0.carbsDidUpdate(uniqEvents)

DispatchQueue.main.async {
Copy link
Copy Markdown
Collaborator

@DobbyWanKenoby DobbyWanKenoby Jan 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you fix this code?
I think it must be edit back

self.broadcaster.notify(CarbsObserver.self, on: .main) {
$0.carbsDidUpdate(uniqEvents)
}
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions FreeAPS/Sources/Models/CarbsEntry.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import Foundation

struct CarbsEntry: JSON, Equatable, Hashable {
let id: String
Copy link
Copy Markdown
Collaborator

@DobbyWanKenoby DobbyWanKenoby Jan 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

replace to var id = UUID().uuidString

But after adding new property (id) old carbs will not display, and it's a problem.
The reason is because old carbs entities (storing at carbs.json) don't contain id and cant decode.

In several days I will release new MigrationManager and resolve this problem

let createdAt: Date
let carbs: Decimal
let enteredBy: String?

static let manual = "freeaps-x"
static let healthKit = "healthkit"

static func == (lhs: CarbsEntry, rhs: CarbsEntry) -> Bool {
lhs.createdAt == rhs.createdAt
Expand All @@ -18,6 +20,7 @@ struct CarbsEntry: JSON, Equatable, Hashable {

extension CarbsEntry {
private enum CodingKeys: String, CodingKey {
case id
Copy link
Copy Markdown
Collaborator

@DobbyWanKenoby DobbyWanKenoby Jan 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Answer (JSON) from NS have _id field. This is reason because import from NS doesn't work now.
Replace to case id = "_id"

case createdAt = "created_at"
case carbs
case enteredBy
Expand Down
4 changes: 3 additions & 1 deletion FreeAPS/Sources/Models/HealthKitSample.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import Foundation
struct HealthKitSample: JSON, Hashable, Equatable {
var healthKitId: String
var date: Date
var glucose: Int
var glucose: Int?
var carb: Decimal?

static func == (lhs: HealthKitSample, rhs: HealthKitSample) -> Bool {
lhs.healthKitId == rhs.healthKitId
Expand All @@ -15,5 +16,6 @@ extension HealthKitSample {
case healthKitId = "healthkit_id"
case date
case glucose
case carb
}
}
10 changes: 7 additions & 3 deletions FreeAPS/Sources/Modules/AddCarbs/AddCarbsStateModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ extension AddCarbs {
final class StateModel: BaseStateModel<Provider> {
@Injected() var carbsStorage: CarbsStorage!
@Injected() var apsManager: APSManager!
@Injected() var healthKitManager: HealthKitManager!
@Published var ID: String = UUID().uuidString
Copy link
Copy Markdown
Collaborator

@DobbyWanKenoby DobbyWanKenoby Jan 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this row. ID shouldn't be @Publisher

@Published var carbs: Decimal = 0
@Published var date = Date()
@Published var carbsRequired: Decimal?
Expand All @@ -18,9 +20,11 @@ extension AddCarbs {
return
}

carbsStorage.storeCarbs([
CarbsEntry(createdAt: date, carbs: carbs, enteredBy: CarbsEntry.manual)
])
let carbArray = [
CarbsEntry(id: ID, createdAt: date, carbs: carbs, enteredBy: CarbsEntry.manual)
Copy link
Copy Markdown
Collaborator

@DobbyWanKenoby DobbyWanKenoby Jan 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

replace to CarbsEntry(createdAt: date, carbs: carbs, enteredBy: CarbsEntry.manual)

In CarbsEntry we added id property with initial value

]
carbsStorage.storeCarbs(carbArray)
healthKitManager.saveIfNeeded(carbs: carbArray)

if settingsManager.settings.skipBolusScreenAfterCarbs {
apsManager.determineBasalSync()
Expand Down
9 changes: 7 additions & 2 deletions FreeAPS/Sources/Modules/DataTable/DataTableProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,16 @@ extension DataTable {
}

func carbs() -> [CarbsEntry] {
carbsStorage.recent()
carbsStorage.recent().sorted { $0.createdAt > $1.createdAt }
}

func deleteCarbs(at date: Date) {
guard let healthCarb = carbsStorage.recent().first(where: { $0.createdAt == date }) else {
debug(.service, "Failed to delete carbs")
return
}
nightscoutManager.deleteCarbs(at: date)
healthkitManager.deleteCarb(syncID: healthCarb.id)
}

func glucose() -> [BloodGlucose] {
Expand All @@ -31,7 +36,7 @@ extension DataTable {

func deleteGlucose(id: String) {
glucoseStorage.removeGlucose(ids: [id])
healthkitManager.deleteGlucise(syncID: id)
healthkitManager.deleteGlucose(syncID: id)
}
}
}
4 changes: 2 additions & 2 deletions FreeAPS/Sources/Modules/DataTable/View/DataTableRootView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ extension DataTable {
private var glucoseList: some View {
List {
ForEach(state.glucose) { item in
gluciseView(item)
glucoseView(item)
}.onDelete(perform: deleteGlucose)
}
}
Expand Down Expand Up @@ -103,7 +103,7 @@ extension DataTable {
}
}

@ViewBuilder private func gluciseView(_ item: Glucose) -> some View {
@ViewBuilder private func glucoseView(_ item: Glucose) -> some View {
VStack(alignment: .leading, spacing: 4) {
HStack {
Text(dateFormatter.string(from: item.glucose.dateString))
Expand Down
10 changes: 7 additions & 3 deletions FreeAPS/Sources/Modules/HealthKit/HealthKitStateModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,21 @@ extension AppleHealthKit {

self.healthKitManager.requestPermission { ok, error in
DispatchQueue.main.async {
self.needShowInformationTextForSetPermissions = !self.healthKitManager.checkAvailabilitySaveBG()
self.needShowInformationTextForSetPermissions = !(
self.healthKitManager.checkAvailabilitySaveBG() && self
.healthKitManager.checkAvailabilitySaveCarb()
)
}

guard ok, error == nil else {
warning(.service, "Permission not granted for HealthKitManager", error: error)
return
}

debug(.service, "Permission granted HealthKitManager")
debug(.service, "Permission granted HealthKitManager")

self.healthKitManager.createObserver()
self.healthKitManager.createGlucoseObserver()
self.healthKitManager.createCarbObserver()
self.healthKitManager.enableBackgroundDelivery()
}
}
Expand Down
Loading