Skip to content

Commit da11ae9

Browse files
ps2ps2
committed
StoredCarbEntry constructor signature change
1 parent 9c323d3 commit da11ae9

File tree

4 files changed

+34
-12
lines changed

4 files changed

+34
-12
lines changed

‎Loop/Extensions/DosingDecisionStore+SimulatedCoreData.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,23 +103,23 @@ fileprivate extension StoredDosingDecision {
103103
historicalGlucose.append(HistoricalGlucoseValue(startDate: date.addingTimeInterval(.minutes(minutes)),
104104
quantity: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: 125 + minutes / 5)))
105105
}
106-
let originalCarbEntry = StoredCarbEntry(uuid: UUID(uuidString: "C86DEB61-68E9-464E-9DD5-96A9CB445FD3")!,
106+
let originalCarbEntry = StoredCarbEntry(startDate: date.addingTimeInterval(-.minutes(15)),
107+
quantity: HKQuantity(unit: .gram(), doubleValue: 15),
108+
uuid: UUID(uuidString: "C86DEB61-68E9-464E-9DD5-96A9CB445FD3")!,
107109
provenanceIdentifier: Bundle.main.bundleIdentifier!,
108110
syncIdentifier: "2B03D96C-6F5D-4140-99CD-80C3E64D6010",
109111
syncVersion: 1,
110-
startDate: date.addingTimeInterval(-.minutes(15)),
111-
quantity: HKQuantity(unit: .gram(), doubleValue: 15),
112112
foodType: "Simulated",
113113
absorptionTime: .hours(3),
114114
createdByCurrentApp: true,
115115
userCreatedDate: date.addingTimeInterval(-.minutes(15)),
116116
userUpdatedDate: date.addingTimeInterval(-.minutes(1)))
117-
let carbEntry = StoredCarbEntry(uuid: UUID(uuidString: "71B699D7-0E8F-4B13-B7A1-E7751EB78E74")!,
117+
let carbEntry = StoredCarbEntry(startDate: date.addingTimeInterval(-.minutes(1)),
118+
quantity: HKQuantity(unit: .gram(), doubleValue: 25),
119+
uuid: UUID(uuidString: "71B699D7-0E8F-4B13-B7A1-E7751EB78E74")!,
118120
provenanceIdentifier: Bundle.main.bundleIdentifier!,
119121
syncIdentifier: "2B03D96C-6F5D-4140-99CD-80C3E64D6010",
120122
syncVersion: 2,
121-
startDate: date.addingTimeInterval(-.minutes(1)),
122-
quantity: HKQuantity(unit: .gram(), doubleValue: 25),
123123
foodType: "Simulated",
124124
absorptionTime: .hours(5),
125125
createdByCurrentApp: true,

‎Loop/Views/SimpleBolusView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,12 +369,12 @@ struct SimpleBolusCalculatorView_Previews: PreviewProvider {
369369
func addCarbEntry(_ carbEntry: NewCarbEntry, replacing replacingEntry: StoredCarbEntry?, completion: @escaping (Result<StoredCarbEntry>) -> Void) {
370370

371371
let storedCarbEntry = StoredCarbEntry(
372+
startDate: carbEntry.startDate,
373+
quantity: carbEntry.quantity,
372374
uuid: UUID(),
373375
provenanceIdentifier: UUID().uuidString,
374376
syncIdentifier: UUID().uuidString,
375377
syncVersion: 1,
376-
startDate: carbEntry.startDate,
377-
quantity: carbEntry.quantity,
378378
foodType: carbEntry.foodType,
379379
absorptionTime: carbEntry.absorptionTime,
380380
createdByCurrentApp: true,

‎LoopTests/ViewModels/BolusEntryViewModelTests.swift

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,31 @@ class BolusEntryViewModelTests: XCTestCase {
5858
fileprivate var delegate: MockBolusEntryViewModelDelegate!
5959
var now: Date = BolusEntryViewModelTests.now
6060

61-
let mockOriginalCarbEntry = StoredCarbEntry(uuid: UUID(), provenanceIdentifier: "provenanceIdentifier", syncIdentifier: "syncIdentifier", syncVersion: 0, startDate: BolusEntryViewModelTests.exampleStartDate, quantity: BolusEntryViewModelTests.exampleCarbQuantity, foodType: "foodType", absorptionTime: 1, createdByCurrentApp: true, userCreatedDate: BolusEntryViewModelTests.now, userUpdatedDate: BolusEntryViewModelTests.now)
61+
let mockOriginalCarbEntry = StoredCarbEntry(
62+
startDate: BolusEntryViewModelTests.exampleStartDate,
63+
quantity: BolusEntryViewModelTests.exampleCarbQuantity,
64+
uuid: UUID(),
65+
provenanceIdentifier: "provenanceIdentifier",
66+
syncIdentifier: "syncIdentifier",
67+
syncVersion: 0,
68+
foodType: "foodType",
69+
absorptionTime: 1,
70+
createdByCurrentApp: true,
71+
userCreatedDate: BolusEntryViewModelTests.now,
72+
userUpdatedDate: BolusEntryViewModelTests.now)
6273
let mockPotentialCarbEntry = NewCarbEntry(quantity: BolusEntryViewModelTests.exampleCarbQuantity, startDate: BolusEntryViewModelTests.exampleStartDate, foodType: "foodType", absorptionTime: 1)
63-
let mockFinalCarbEntry = StoredCarbEntry(uuid: UUID(), provenanceIdentifier: "provenanceIdentifier", syncIdentifier: "syncIdentifier", syncVersion: 1, startDate: BolusEntryViewModelTests.exampleStartDate, quantity: BolusEntryViewModelTests.exampleCarbQuantity, foodType: "foodType", absorptionTime: 1, createdByCurrentApp: true, userCreatedDate: BolusEntryViewModelTests.now, userUpdatedDate: BolusEntryViewModelTests.now)
74+
let mockFinalCarbEntry = StoredCarbEntry(
75+
startDate: BolusEntryViewModelTests.exampleStartDate,
76+
quantity: BolusEntryViewModelTests.exampleCarbQuantity,
77+
uuid: UUID(),
78+
provenanceIdentifier: "provenanceIdentifier",
79+
syncIdentifier: "syncIdentifier",
80+
syncVersion: 1,
81+
foodType: "foodType",
82+
absorptionTime: 1,
83+
createdByCurrentApp: true,
84+
userCreatedDate: BolusEntryViewModelTests.now,
85+
userUpdatedDate: BolusEntryViewModelTests.now)
6486
let mockUUID = BolusEntryViewModelTests.mockUUID.uuidString
6587
let queue = DispatchQueue(label: "BolusEntryViewModelTests")
6688
var saveAndDeliverSuccess = false

‎LoopTests/ViewModels/SimpleBolusViewModelTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,12 +294,12 @@ extension SimpleBolusViewModelTests: SimpleBolusViewModelDelegate {
294294

295295
addedCarbEntry = carbEntry
296296
let storedCarbEntry = StoredCarbEntry(
297+
startDate: carbEntry.startDate,
298+
quantity: carbEntry.quantity,
297299
uuid: UUID(),
298300
provenanceIdentifier: UUID().uuidString,
299301
syncIdentifier: UUID().uuidString,
300302
syncVersion: 1,
301-
startDate: carbEntry.startDate,
302-
quantity: carbEntry.quantity,
303303
foodType: carbEntry.foodType,
304304
absorptionTime: carbEntry.absorptionTime,
305305
createdByCurrentApp: true,

0 commit comments

Comments
 (0)