From f4e7e116aba203d60c27115c60fec25faab79a19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bj=C3=B6rkert?= Date: Thu, 19 Nov 2026 19:41:04 +0100 Subject: [PATCH] Report a remote bolus that the pump refuses as failed enactBolus rethrows the pump's error for doses with a remote origin, including uncertain delivery, so the remote command reports the failure to its sender and sends the remote bolus failure notification. --- Loop/Managers/DeviceDataManager.swift | 11 +++++++- .../Managers/DeviceDataManagerTests.swift | 25 +++++++++++++++++++ LoopTests/Mocks/MockPumpManager.swift | 4 ++- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift index 4728ea9532..5e4e481496 100644 --- a/Loop/Managers/DeviceDataManager.swift +++ b/Loop/Managers/DeviceDataManager.swift @@ -828,18 +828,27 @@ extension DeviceDataManager { metadata.activationType = activationType let doseId = await newDoseId(for: metadata) + // A remote command reports the pump's error to its sender and sends its own failure notification + let rethrowsErrors = metadata.origin == .remote + do { try await pumpManager.enactBolus(doseId: doseId, units: units, activationType: activationType) } catch PumpManagerError.uncertainDelivery { // Do not generate notification on uncertain delivery error + if rethrowsErrors { + throw PumpManagerError.uncertainDelivery + } } catch { - if !activationType.isAutomatic, let error = error as? PumpManagerError { + if !activationType.isAutomatic, !rethrowsErrors, let error = error as? PumpManagerError { do { try await NotificationManager.sendBolusFailureNotification(for: error, units: units, at: Date(), decisionId: metadata.decisionId, activationType: activationType) } catch { log.error("Error sending bolus failure notification %{public}@", String(describing: error)) } } + if rethrowsErrors { + throw error + } } } diff --git a/LoopTests/Managers/DeviceDataManagerTests.swift b/LoopTests/Managers/DeviceDataManagerTests.swift index 1dbba29dfd..ec1c9bf8d8 100644 --- a/LoopTests/Managers/DeviceDataManagerTests.swift +++ b/LoopTests/Managers/DeviceDataManagerTests.swift @@ -118,6 +118,31 @@ final class DeviceDataManagerTests: XCTestCase { XCTAssertEqual(metadata, DoseMetadata(origin: .user, device: .watch, decisionId: decisionId, activationType: .manualRecommendationAccepted)) } + func testEnactBolusRethrowsPumpErrorsForRemoteOrigin() async throws { + pumpManager.enactBolusError = .uncertainDelivery + do { + try await deviceDataManager.enactBolus(units: 1, metadata: DoseMetadata(origin: .remote), activationType: .manualNoRecommendation) + XCTFail("Expected the pump error") + } catch PumpManagerError.uncertainDelivery { + } + + pumpManager.enactBolusError = .deviceState(nil) + do { + try await deviceDataManager.enactBolus(units: 1, metadata: DoseMetadata(origin: .remote), activationType: .manualNoRecommendation) + XCTFail("Expected the pump error") + } catch PumpManagerError.deviceState { + } + pumpManager.enactBolusError = nil + } + + func testEnactBolusDoesNotThrowPumpErrorsForOtherOrigins() async throws { + pumpManager.enactBolusError = .uncertainDelivery + try await deviceDataManager.enactBolus(units: 1, metadata: DoseMetadata(origin: .user), activationType: .manualRecommendationAccepted) + pumpManager.enactBolusError = .deviceState(nil) + try await deviceDataManager.enactBolus(units: 1, metadata: DoseMetadata(origin: .user), activationType: .manualRecommendationAccepted) + pumpManager.enactBolusError = nil + } + func testAutomaticDosesStoreMetadataWithTheDecision() async throws { let decisionId = UUID() pumpManager.enactedDoseIds = [] diff --git a/LoopTests/Mocks/MockPumpManager.swift b/LoopTests/Mocks/MockPumpManager.swift index 2f62593be5..cccadb6dcd 100644 --- a/LoopTests/Mocks/MockPumpManager.swift +++ b/LoopTests/Mocks/MockPumpManager.swift @@ -23,6 +23,8 @@ class MockPumpManager: PumpManager { var enactTempBasalError: PumpManagerError? + var enactBolusError: PumpManagerError? + init() { } @@ -87,7 +89,7 @@ class MockPumpManager: PumpManager { func enactBolus(doseId: UUID, units: Double, activationType: BolusActivationType, completion: @escaping (PumpManagerError?) -> Void) { enactedDoseIds.append(doseId) enactBolusCalled?(units, activationType) - completion(nil) + completion(enactBolusError) } func cancelBolus(completion: @escaping (PumpManagerResult) -> Void) {