Skip to content

Commit 6966a12

Browse files
nhammingnhamming
authored
[LOOP-4492] updates for device actions (LoopKit#495)
1 parent c31e440 commit 6966a12

File tree

8 files changed

+25
-44
lines changed

8 files changed

+25
-44
lines changed

‎LoopKit.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@
331331
4B67E2CB289B4EDB002D92AF /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4B67E2C9289B4EDB002D92AF /* InfoPlist.strings */; };
332332
4B67E2CE289B4EDB002D92AF /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4B67E2CC289B4EDB002D92AF /* Localizable.strings */; };
333333
7D68A9AE1FE0A3D000522C49 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7D68A9B01FE0A3D000522C49 /* Localizable.strings */; };
334-
7E0B007629E76ABA00211F33 /* DateRelativeDeviceAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E0B007529E76ABA00211F33 /* DateRelativeDeviceAction.swift */; };
335334
8907E35921A9D0EC00335852 /* GlucoseEntryTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8907E35821A9D0EC00335852 /* GlucoseEntryTableViewController.swift */; };
336335
89186C0524BEC9CA0003D0F3 /* SegmentedControlTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89186C0424BEC9CA0003D0F3 /* SegmentedControlTableViewCell.swift */; };
337336
89186C0724BF7FC70003D0F3 /* Guardrail+UI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89186C0624BF7FC70003D0F3 /* Guardrail+UI.swift */; };
@@ -694,6 +693,7 @@
694693
A9E675F5227140DD00E25293 /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9E675F4227140DD00E25293 /* HealthKit.framework */; };
695694
A9FD046F24E310D00040F203 /* HKObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9FD046E24E310D00040F203 /* HKObject.swift */; };
696695
A9FD047024E310DD0040F203 /* HKObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9FD046E24E310D00040F203 /* HKObject.swift */; };
696+
B400177929F0249D00532398 /* DeviceAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B400177829F0249D00532398 /* DeviceAction.swift */; };
697697
B4001CF028CBC200002FB414 /* SingleSelectionCheckList.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4001CEF28CBC200002FB414 /* SingleSelectionCheckList.swift */; };
698698
B40C43912707408400F5D86C /* DeliveryLimits.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DC64C7D24BF6EBC004A63A1 /* DeliveryLimits.swift */; };
699699
B40D07CA251BD89D00C1C6D7 /* DateAndDurationSteppableTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B40D07C8251BD89D00C1C6D7 /* DateAndDurationSteppableTableViewCell.xib */; };
@@ -1340,7 +1340,6 @@
13401340
7D68AAB91FE31A2800522C49 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InsulinKit.strings; sourceTree = "<group>"; };
13411341
7D68AABC1FE31BE700522C49 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
13421342
7D68AAC61FE31BE900522C49 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
1343-
7E0B007529E76ABA00211F33 /* DateRelativeDeviceAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateRelativeDeviceAction.swift; sourceTree = "<group>"; };
13441343
8907E35821A9D0EC00335852 /* GlucoseEntryTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlucoseEntryTableViewController.swift; sourceTree = "<group>"; };
13451344
8907E35A21A9D1B200335852 /* SineCurveParametersTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SineCurveParametersTableViewController.swift; sourceTree = "<group>"; };
13461345
89186C0424BEC9CA0003D0F3 /* SegmentedControlTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SegmentedControlTableViewCell.swift; sourceTree = "<group>"; };
@@ -1559,6 +1558,7 @@
15591558
A9E675F2227140D800E25293 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
15601559
A9E675F4227140DD00E25293 /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/HealthKit.framework; sourceTree = DEVELOPER_DIR; };
15611560
A9FD046E24E310D00040F203 /* HKObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HKObject.swift; sourceTree = "<group>"; };
1561+
B400177829F0249D00532398 /* DeviceAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceAction.swift; sourceTree = "<group>"; };
15621562
B4001CEF28CBC200002FB414 /* SingleSelectionCheckList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleSelectionCheckList.swift; sourceTree = "<group>"; };
15631563
B40D07C8251BD89D00C1C6D7 /* DateAndDurationSteppableTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DateAndDurationSteppableTableViewCell.xib; sourceTree = "<group>"; };
15641564
B40D07C9251BD89D00C1C6D7 /* DateAndDurationSteppableTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DateAndDurationSteppableTableViewCell.swift; sourceTree = "<group>"; };
@@ -2673,14 +2673,14 @@
26732673
892A5D35222F03CB008961AB /* LoopTestingKit */ = {
26742674
isa = PBXGroup;
26752675
children = (
2676-
7E0B007529E76ABA00211F33 /* DateRelativeDeviceAction.swift */,
26772676
89ADE12C226BDD190067222B /* DateRelativeBasalEntry.swift */,
26782677
89ADE12E226BDED40067222B /* DateRelativeBolusEntry.swift */,
26792678
89ADE12A226BDB730067222B /* DateRelativeCarbEntry.swift */,
26802679
89ADE135226BF0BE0067222B /* DateRelativeGlucoseSample.swift */,
26812680
89CA2B37226D4456004D9350 /* DateRelativeQuantity.swift */,
26822681
892A5D37222F03CB008961AB /* Info.plist */,
26832682
892A5D36222F03CB008961AB /* LoopTestingKit.h */,
2683+
B400177829F0249D00532398 /* DeviceAction.swift */,
26842684
892A5D55222F0414008961AB /* TestingCGMManager.swift */,
26852685
892A5D51222F03DB008961AB /* TestingDeviceManager.swift */,
26862686
892A5D53222F03F9008961AB /* TestingPumpManager.swift */,
@@ -4035,7 +4035,7 @@
40354035
892A5D54222F03F9008961AB /* TestingPumpManager.swift in Sources */,
40364036
89ADE12F226BDED40067222B /* DateRelativeBolusEntry.swift in Sources */,
40374037
89ADE132226BE0590067222B /* HKUnit.swift in Sources */,
4038-
7E0B007629E76ABA00211F33 /* DateRelativeDeviceAction.swift in Sources */,
4038+
B400177929F0249D00532398 /* DeviceAction.swift in Sources */,
40394039
89CA2B38226D4456004D9350 /* DateRelativeQuantity.swift in Sources */,
40404040
89ADE12D226BDD190067222B /* DateRelativeBasalEntry.swift in Sources */,
40414041
89ADE134226BF0490067222B /* TestingScenarioInstance.swift in Sources */,

‎LoopTestingKit/DateRelativeDeviceAction.swift‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎LoopTestingKit/DeviceAction.swift‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//
2+
// DeviceAction.swift
3+
// LoopTestingKit
4+
//
5+
// Created by Nathaniel Hamming on 2023-04-19.
6+
// Copyright © 2023 LoopKit Authors. All rights reserved.
7+
//
8+
9+
import Foundation
10+
11+
public struct DeviceAction: Equatable, Codable {
12+
public let managerIdentifier: String
13+
public let details: String
14+
}

‎LoopTestingKit/TestingDeviceManager.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ public protocol TestingDeviceManager: DeviceManager {
1414
var testingDevice: HKDevice { get }
1515

1616
func acceptDefaultsAndSkipOnboarding()
17-
func inject(action: NewDeviceAction)
17+
func trigger(action: DeviceAction)
1818
}

‎LoopTestingKit/TestingScenario.swift‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public struct TestingScenario {
1414
var dateRelativeBasalEntries: [DateRelativeBasalEntry]
1515
var dateRelativeBolusEntries: [DateRelativeBolusEntry]
1616
var dateRelativeCarbEntries: [DateRelativeCarbEntry]
17-
var dateRelativeDeviceActions: [DateRelativeDeviceAction]?
17+
var deviceActions: [DeviceAction]
1818

1919
public func instantiate(relativeTo referenceDate: Date = Date()) -> TestingScenarioInstance {
2020
let glucoseSamples = dateRelativeGlucoseSamples
@@ -29,8 +29,7 @@ public struct TestingScenario {
2929
let carbEntries = dateRelativeCarbEntries
3030
.filter { $0.enteredAt(relativeTo: referenceDate) <= referenceDate }
3131
.map { $0.newCarbEntry(relativeTo: referenceDate) }
32-
let deviceActions = dateRelativeDeviceActions?.compactMap { $0.newDeviceAction(relativeTo: referenceDate) }
33-
return TestingScenarioInstance(pastGlucoseSamples: pastGlucoseSamples, futureGlucoseSamples: futureGlucoseSamples, pumpEvents: pumpEvents, carbEntries: carbEntries, injectedActions: deviceActions ?? [])
32+
return TestingScenarioInstance(pastGlucoseSamples: pastGlucoseSamples, futureGlucoseSamples: futureGlucoseSamples, pumpEvents: pumpEvents, carbEntries: carbEntries, deviceActions: deviceActions)
3433
}
3534

3635
public mutating func stepBackward(by offset: TimeInterval) {
@@ -70,7 +69,7 @@ extension TestingScenario: Codable {
7069
case dateRelativeBasalEntries = "basalDoses"
7170
case dateRelativeBolusEntries = "bolusDoses"
7271
case dateRelativeCarbEntries = "carbEntries"
73-
case dateRelativeDeviceActions = "injectedActions"
72+
case deviceActions = "deviceActions"
7473
}
7574
}
7675

‎LoopTestingKit/TestingScenarioInstance.swift‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,12 @@
88

99
import LoopKit
1010

11-
public struct NewDeviceAction: Equatable {
12-
public let name: String
13-
public let date: Date
14-
}
15-
1611
public struct TestingScenarioInstance {
1712
public var pastGlucoseSamples: [NewGlucoseSample]
1813
public var futureGlucoseSamples: [NewGlucoseSample]
1914
public var pumpEvents: [NewPumpEvent]
2015
public var carbEntries: [NewCarbEntry]
21-
public var injectedActions: [NewDeviceAction]
16+
public var deviceActions: [DeviceAction]
2217

2318
public var hasCGMData: Bool {
2419
!(pastGlucoseSamples + futureGlucoseSamples).isEmpty

‎MockKit/MockCGMManager.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ public final class MockCGMManager: TestingCGMManager {
573573
sendCGMReadingResult(CGMReadingResult.newData(pastSamples.map { NewGlucoseSample($0, device: device) } ))
574574
}
575575

576-
public func inject(action: NewDeviceAction) {}
576+
public func trigger(action: DeviceAction) {}
577577

578578
public func acceptDefaultsAndSkipOnboarding() {
579579
// TODO: Unimplemented as it's not needed for HF. Ticket to complete below.

‎MockKit/MockPumpManager.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ public final class MockPumpManager: TestingPumpManager {
597597
}
598598
}
599599

600-
public func inject(action: NewDeviceAction) {}
600+
public func trigger(action: DeviceAction) {}
601601

602602
public func injectPumpEvents(_ pumpEvents: [NewPumpEvent]) {
603603
state.finalizedDoses += pumpEvents.compactMap { $0.unfinalizedDose }

0 commit comments

Comments
 (0)