CarbValue struct update

ps2 · ps2 · commit 687c055021d0 · 2023-09-05T07:56:18.000-05:00
diff --git a/Loop/Extensions/DosingDecisionStore+SimulatedCoreData.swift b/Loop/Extensions/DosingDecisionStore+SimulatedCoreData.swift
@@ -147,7 +147,7 @@ fileprivate extension StoredDosingDecision {
                                                       healthKitEligibleDate: nil)
         let carbsOnBoard = CarbValue(startDate: date,
                                      endDate: date.addingTimeInterval(.minutes(5)),
-                                     quantity: HKQuantity(unit: .gram(), doubleValue: 45.5))
+                                     value: 45.5)
         let insulinOnBoard = InsulinValue(startDate: date, value: 1.5)
         let glucoseTargetRangeSchedule = GlucoseRangeSchedule(rangeSchedule: DailyQuantitySchedule(unit: .milligramsPerDeciliter,
                                                                                                    dailyItems: [RepeatingScheduleValue(startTime: .hours(0), value: DoubleRange(minValue: 100.0, maxValue: 110.0)),
diff --git a/Loop/Managers/LoopDataManager.swift b/Loop/Managers/LoopDataManager.swift
@@ -1101,7 +1101,7 @@ extension LoopDataManager {
                     switch error {
                     case .noData:
                         // when there is no data, carbs on board is set to 0
-                        self.carbsOnBoard = CarbValue(startDate: Date(), quantity: HKQuantity(unit: .gram(), doubleValue: 0))
+                        self.carbsOnBoard = CarbValue(startDate: Date(), value: 0)
                     default:
                         self.carbsOnBoard = nil
                         warnings.append(.fetchDataWarning(.carbsOnBoard(error: error)))
diff --git a/LoopTests/Managers/LoopAlgorithmTests.swift b/LoopTests/Managers/LoopAlgorithmTests.swift
@@ -71,5 +71,4 @@ final class LoopAlgorithmTests: XCTestCase {
             XCTAssertEqual(expected.quantity.doubleValue(for: .milligramsPerDeciliter), calculated.quantity.doubleValue(for: .milligramsPerDeciliter), accuracy: defaultAccuracy)
         }
     }
-
 }
diff --git a/LoopTests/ViewModels/BolusEntryViewModelTests.swift b/LoopTests/ViewModels/BolusEntryViewModelTests.swift
@@ -283,7 +283,7 @@ class BolusEntryViewModelTests: XCTestCase {
     }
     
     func testUpdateCarbsOnBoard() async throws {
-        delegate.carbsOnBoardResult = .success(CarbValue(startDate: Self.exampleStartDate, endDate: Self.exampleEndDate, quantity: Self.exampleCarbQuantity))
+        delegate.carbsOnBoardResult = .success(CarbValue(startDate: Self.exampleStartDate, endDate: Self.exampleEndDate, value: Self.exampleCarbQuantity.doubleValue(for: .gram())))
         XCTAssertNil(bolusEntryViewModel.activeCarbs)
         await bolusEntryViewModel.update()
         XCTAssertEqual(Self.exampleCarbQuantity, bolusEntryViewModel.activeCarbs)

Original file line number	Diff line number	Diff line change
`@@ -71,5 +71,4 @@ final class LoopAlgorithmTests: XCTestCase {`
`71`	`71`	`XCTAssertEqual(expected.quantity.doubleValue(for: .milligramsPerDeciliter), calculated.quantity.doubleValue(for: .milligramsPerDeciliter), accuracy: defaultAccuracy)`
`72`	`72`	`}`
`73`	`73`	`}`
`74`		`-`
`75`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ class BolusEntryViewModelTests: XCTestCase {`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`func testUpdateCarbsOnBoard() async throws {`
`286`		`- delegate.carbsOnBoardResult = .success(CarbValue(startDate: Self.exampleStartDate, endDate: Self.exampleEndDate, quantity: Self.exampleCarbQuantity))`
	`286`	`+ delegate.carbsOnBoardResult = .success(CarbValue(startDate: Self.exampleStartDate, endDate: Self.exampleEndDate, value: Self.exampleCarbQuantity.doubleValue(for: .gram())))`
`287`	`287`	`XCTAssertNil(bolusEntryViewModel.activeCarbs)`
`288`	`288`	`await bolusEntryViewModel.update()`
`289`	`289`	`XCTAssertEqual(Self.exampleCarbQuantity, bolusEntryViewModel.activeCarbs)`