[LOOP-4470] correctly round recommended bolus (LoopKit#546)

* correctly round recommended bolus * fixed unit tests
PiotrP13 · Jan 13, 2023 · 0b7c628 · 0b7c628
1 parent 56ceced
commit 0b7c628
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/Loop/View Models/BolusEntryViewModel.swift b/Loop/View Models/BolusEntryViewModel.swift
@@ -687,18 +687,23 @@ final class BolusEntryViewModel: ObservableObject {
     private func updateRecommendedBolusAndNotice(from state: LoopState, isUpdatingFromUserInput: Bool) {
         dispatchPrecondition(condition: .notOnQueue(.main))
 
+        guard let delegate = delegate else {
+            assertionFailure("Missing BolusEntryViewModelDelegate")
+            return
+        }
+
         let now = Date()
         var recommendation: ManualBolusRecommendation?
         let recommendedBolus: HKQuantity?
         let notice: Notice?
         do {
             recommendation = try computeBolusRecommendation(from: state)
             if let recommendation = recommendation {
-                recommendedBolus = HKQuantity(unit: .internationalUnit(), doubleValue: recommendation.amount)
+                recommendedBolus = HKQuantity(unit: .internationalUnit(), doubleValue: delegate.roundBolusVolume(units: recommendation.amount))
 
                 switch recommendation.notice {
                 case .glucoseBelowSuspendThreshold:
-                    if let suspendThreshold = delegate?.settings.suspendThreshold {
+                    if let suspendThreshold = delegate.settings.suspendThreshold {
                         notice = .predictedGlucoseBelowSuspendThreshold(suspendThreshold: suspendThreshold.quantity)
                     } else {
                         notice = nil

diff --git a/Loop/Views/BolusEntryView.swift b/Loop/Views/BolusEntryView.swift
@@ -273,6 +273,7 @@ struct BolusEntryView: View {
     private static let doseAmountFormatter: NumberFormatter = {
         let quantityFormatter = QuantityFormatter()
         quantityFormatter.setPreferredNumberFormatter(for: .internationalUnit())
+        quantityFormatter.numberFormatter.roundingMode = .down
         return quantityFormatter.numberFormatter
     }()
 

diff --git a/LoopTests/ViewModels/BolusEntryViewModelTests.swift b/LoopTests/ViewModels/BolusEntryViewModelTests.swift
@@ -299,7 +299,7 @@ class BolusEntryViewModelTests: XCTestCase {
         XCTAssertTrue(bolusEntryViewModel.isBolusRecommended)
         let recommendedBolus = bolusEntryViewModel.recommendedBolus
         XCTAssertNotNil(recommendedBolus)
-        XCTAssertEqual(mockState.bolusRecommendationResult?.amount, recommendedBolus?.doubleValue(for: .internationalUnit()))
+        XCTAssertEqual(delegate.roundBolusVolume(units: mockState.bolusRecommendationResult!.amount), recommendedBolus?.doubleValue(for: .internationalUnit()))
         let consideringPotentialCarbEntryPassed = try XCTUnwrap(mockState.consideringPotentialCarbEntryPassed)
         XCTAssertEqual(mockPotentialCarbEntry, consideringPotentialCarbEntryPassed)
         let replacingCarbEntryPassed = try XCTUnwrap(mockState.replacingCarbEntryPassed)
@@ -316,7 +316,7 @@ class BolusEntryViewModelTests: XCTestCase {
         XCTAssertTrue(bolusEntryViewModel.isBolusRecommended)
         let recommendedBolus = bolusEntryViewModel.recommendedBolus
         XCTAssertNotNil(recommendedBolus)
-        XCTAssertEqual(mockState.bolusRecommendationResult?.amount, recommendedBolus?.doubleValue(for: .internationalUnit()))
+        XCTAssertEqual(delegate.roundBolusVolume(units: mockState.bolusRecommendationResult!.amount), recommendedBolus!.doubleValue(for: .internationalUnit()))
         XCTAssertEqual(BolusEntryViewModel.Notice.predictedGlucoseBelowSuspendThreshold(suspendThreshold: Self.exampleCGMGlucoseQuantity), bolusEntryViewModel.activeNotice)
     }
 
@@ -329,7 +329,7 @@ class BolusEntryViewModelTests: XCTestCase {
         XCTAssertTrue(bolusEntryViewModel.isBolusRecommended)
         let recommendedBolus = bolusEntryViewModel.recommendedBolus
         XCTAssertNotNil(recommendedBolus)
-        XCTAssertEqual(mockState.bolusRecommendationResult?.amount, recommendedBolus?.doubleValue(for: .internationalUnit()))
+        XCTAssertEqual(delegate.roundBolusVolume(units: mockState.bolusRecommendationResult!.amount), recommendedBolus!.doubleValue(for: .internationalUnit()))
         XCTAssertNil(bolusEntryViewModel.activeNotice)
     }
 
@@ -341,7 +341,7 @@ class BolusEntryViewModelTests: XCTestCase {
         XCTAssertTrue(bolusEntryViewModel.isBolusRecommended)
         let recommendedBolus = bolusEntryViewModel.recommendedBolus
         XCTAssertNotNil(recommendedBolus)
-        XCTAssertEqual(mockState.bolusRecommendationResult?.amount, recommendedBolus?.doubleValue(for: .internationalUnit()))
+        XCTAssertEqual(delegate.roundBolusVolume(units: mockState.bolusRecommendationResult!.amount), recommendedBolus!.doubleValue(for: .internationalUnit()))
         XCTAssertNil(bolusEntryViewModel.activeNotice)
     }
 
@@ -388,7 +388,7 @@ class BolusEntryViewModelTests: XCTestCase {
         XCTAssertTrue(bolusEntryViewModel.isBolusRecommended)
         let recommendedBolus = bolusEntryViewModel.recommendedBolus
         XCTAssertNotNil(recommendedBolus)
-        XCTAssertEqual(mockState.bolusRecommendationResult?.amount, recommendedBolus?.doubleValue(for: .internationalUnit()))
+        XCTAssertEqual(delegate.roundBolusVolume(units: mockState.bolusRecommendationResult!.amount), recommendedBolus!.doubleValue(for: .internationalUnit()))
         let consideringPotentialCarbEntryPassed = try XCTUnwrap(mockState.consideringPotentialCarbEntryPassed)
         XCTAssertEqual(mockPotentialCarbEntry, consideringPotentialCarbEntryPassed)
         let replacingCarbEntryPassed = try XCTUnwrap(mockState.replacingCarbEntryPassed)