[COASTAL-1291] plugin identifier is no longer class property (#599)

Common/Models/PumpManager.swift

@@ -12,13 +12,13 @@ import MockKit
 import MockKitUI
 
 let staticPumpManagersByIdentifier: [String: PumpManagerUI.Type] = [
-    MockPumpManager.pluginIdentifier : MockPumpManager.self
+    MockPumpManager.managerIdentifier : MockPumpManager.self
 ]
 
 var availableStaticPumpManagers: [PumpManagerDescriptor] {
     if FeatureFlags.allowSimulators {
         return [
-            PumpManagerDescriptor(identifier: MockPumpManager.pluginIdentifier, localizedTitle: MockPumpManager.localizedTitle)
+            PumpManagerDescriptor(identifier: MockPumpManager.managerIdentifier, localizedTitle: MockPumpManager.localizedTitle)
         ]
     } else {
         return []

Loop/Managers/CGMManager.swift

@@ -10,13 +10,13 @@ import LoopKitUI
 import MockKit
 
 let staticCGMManagersByIdentifier: [String: CGMManager.Type] = [
-    MockCGMManager.pluginIdentifier: MockCGMManager.self
+    MockCGMManager.managerIdentifier: MockCGMManager.self
 ]
 
 var availableStaticCGMManagers: [CGMManagerDescriptor] {
     if FeatureFlags.allowSimulators {
         return [
-            CGMManagerDescriptor(identifier: MockCGMManager.pluginIdentifier, localizedTitle: MockCGMManager.localizedTitle)
+            CGMManagerDescriptor(identifier: MockCGMManager.managerIdentifier, localizedTitle: MockCGMManager.localizedTitle)
         ]
     } else {
         return []

Loop/Managers/Service.swift

@@ -12,21 +12,10 @@ import MockKit
 
 let staticServices: [Service.Type] = [MockService.self]
 
-let staticServicesByIdentifier: [String: Service.Type] = staticServices.reduce(into: [:]) { (map, Type) in
-    map[Type.pluginIdentifier] = Type
-}
+let staticServicesByIdentifier: [String: Service.Type] = [
+    MockService.serviceIdentifier: MockService.self
+]
 
-let availableStaticServices = staticServices.map { (Type) -> ServiceDescriptor in
-    return ServiceDescriptor(identifier: Type.pluginIdentifier, localizedTitle: Type.localizedTitle)
-}
-
-func ServiceFromRawValue(_ rawValue: [String: Any]) -> Service? {
-    guard let serviceIdentifier = rawValue["statefulPluginIdentifier"] as? String,
-        let rawState = rawValue["state"] as? Service.RawStateValue,
-        let ServiceType = staticServicesByIdentifier[serviceIdentifier]
-    else {
-        return nil
-    }
-
-    return ServiceType.init(rawState: rawState)
-}
+let availableStaticServices: [ServiceDescriptor] = [
+    ServiceDescriptor(identifier: MockService.serviceIdentifier, localizedTitle: MockService.localizedTitle)
+]

Loop/Managers/ServicesManager.swift

@@ -100,7 +100,7 @@ class ServicesManager {
     }
 
     private func serviceTypeFromRawValue(_ rawValue: Service.RawStateValue) -> Service.Type? {
-        guard let identifier = rawValue["statefulPluginIdentifier"] as? String else {
+        guard let identifier = rawValue["serviceIdentifier"] as? String else {
             return nil
         }
 
@@ -400,3 +400,15 @@ extension ServicesManager: ServiceOnboardingDelegate {
 extension ServicesManager {
     var availableSupports: [SupportUI] { activeServices.compactMap { $0 as? SupportUI } }
 }
+
+// Service extension for rawValue
+extension Service {
+    typealias RawValue = [String: Any]
+
+    var rawValue: RawValue {
+        return [
+            "serviceIdentifier": pluginIdentifier,
+            "state": rawState
+        ]
+    }
+}

Loop/Managers/StatefulPluginManager.swift

@@ -62,7 +62,7 @@ class StatefulPluginManager: StatefulPluggableProvider {
     }
 
     private func statefulPluginTypeFromRawValue(_ rawValue: StatefulPluggable.RawStateValue) -> StatefulPluggable.Type? {
-        guard let identifier = rawValue["statefulPluginIdentifier"] as? String else {
+        guard let identifier = rawValue["serviceIdentifier"] as? String else {
             return nil
         }
 

Loop/Managers/SupportManager.swift

@@ -38,24 +38,17 @@ public final class SupportManager {
     private let alertIssuer: AlertIssuer
     private let deviceSupportDelegate: DeviceSupportDelegate
     private let pluginManager: PluginManager
-    private let staticSupportTypes: [SupportUI.Type]
-    private let staticSupportTypesByIdentifier: [String: SupportUI.Type]
 
     lazy private var cancellables = Set<AnyCancellable>()
 
     init(pluginManager: PluginManager,
          deviceSupportDelegate: DeviceSupportDelegate,
          servicesManager: ServicesManager? = nil,
-         staticSupportTypes: [SupportUI.Type]? = nil,
          alertIssuer: AlertIssuer) {
 
         self.alertIssuer = alertIssuer
         self.deviceSupportDelegate = deviceSupportDelegate
         self.pluginManager = pluginManager
-        self.staticSupportTypes = []
-        staticSupportTypesByIdentifier = self.staticSupportTypes.reduce(into: [:]) { (map, type) in
-            map[type.pluginIdentifier] = type
-        }
 
         restoreState()
 
@@ -86,8 +79,7 @@ public final class SupportManager {
         let availablePluginSupports = [SupportUI]()
         let availableDeviceSupports = deviceSupportDelegate.availableSupports
         let availableServiceSupports = servicesManager?.availableSupports ?? [SupportUI]()
-        let staticSupports = self.staticSupportTypes.map { $0.init(rawState: [:]) }.compactMap { $0 }
-        let allSupports = availablePluginSupports + availableDeviceSupports + availableServiceSupports + staticSupports
+        let allSupports = availablePluginSupports + availableDeviceSupports + availableServiceSupports
         allSupports.forEach {
             addSupport($0)
         }
@@ -283,7 +275,7 @@ extension SupportManager {
 
     private func supportTypeFromRawValue(_ rawValue: [String: Any]) -> SupportUI.Type? {
         guard let supportIdentifier = rawValue["supportIdentifier"] as? String,
-              let supportType = pluginManager.getSupportUITypeByIdentifier(supportIdentifier) ?? staticSupportTypesByIdentifier[supportIdentifier]
+              let supportType = pluginManager.getSupportUITypeByIdentifier(supportIdentifier)
         else {
             return nil
         }
@@ -331,11 +323,10 @@ fileprivate extension UserDefaults {
 extension SupportUI {
     var rawValue: RawStateValue {
         return [
-            "supportIdentifier": Self.pluginIdentifier,
+            "supportIdentifier": pluginIdentifier,
             "state": rawState
         ]
     }
-
 }
 
 extension Bundle {

Loop/Managers/TestingScenariosManager.swift

@@ -126,7 +126,7 @@ extension TestingScenariosManagerRequirements {
                 load(scenario) { error in
                     if error == nil {
                         self.activeScenarioURL = url
-                        self.log.debug("@{public}%", successLogMessage)
+                        self.log.debug("%{public}@", successLogMessage)
                     }
                     completion(error)
                 }

Loop/View Models/ServicesViewModel.swift

@@ -54,7 +54,7 @@ public class ServicesViewModel: ObservableObject {
 extension ServicesViewModel {
     fileprivate class FakeService1: Service {
         static var localizedTitle: String = "Service 1"
-        static var pluginIdentifier: String = "FakeService1"
+        var pluginIdentifier: String = "FakeService1"
         var stateDelegate: StatefulPluggableDelegate?
         var serviceDelegate: ServiceDelegate?
         var rawState: RawStateValue = [:]
@@ -65,7 +65,7 @@ extension ServicesViewModel {
     }
     fileprivate class FakeService2: Service {
         static var localizedTitle: String = "Service 2"
-        static var pluginIdentifier: String = "FakeService2"
+        var pluginIdentifier: String = "FakeService2"
         var stateDelegate: StatefulPluggableDelegate?
         var serviceDelegate: ServiceDelegate?
         var rawState: RawStateValue = [:]

LoopTests/Managers/DoseEnactorTests.swift

@@ -121,7 +121,7 @@ class MockPumpManager: PumpManager {
         .minutes(units / deliveryUnitsPerMinute)
     }
 
-    static var pluginIdentifier: String = "MockPumpManager"
+    var pluginIdentifier: String = "MockPumpManager"
 
     var localizedTitle: String = "MockPumpManager"
 

LoopTests/Managers/SupportManagerTests.swift

@@ -34,7 +34,7 @@ class SupportManagerTests: XCTestCase {
         weak var delegate: SupportUIDelegate?
     }
     class MockSupport: Mixin, SupportUI {
-        static var pluginIdentifier: String { "SupportManagerTestsMockSupport" }
+        var pluginIdentifier: String { "SupportManagerTestsMockSupport" }
         override init() { super.init() }
         required init?(rawState: RawStateValue) { super.init() }
         var rawState: RawStateValue = [:]
@@ -46,7 +46,7 @@ class SupportManagerTests: XCTestCase {
     }
 
     class AnotherMockSupport: Mixin, SupportUI {
-        static var pluginIdentifier: String { "SupportManagerTestsAnotherMockSupport" }
+        var pluginIdentifier: String { "SupportManagerTestsAnotherMockSupport" }
         override init() { super.init() }
         required init?(rawState: RawStateValue) { super.init() }
         var rawState: RawStateValue = [:]
@@ -86,7 +86,7 @@ class SupportManagerTests: XCTestCase {
 
     override func setUp() {
         mockAlertIssuer = MockAlertIssuer()
-        supportManager = SupportManager(pluginManager: pluginManager, deviceSupportDelegate: mocKDeviceSupportDelegate,  staticSupportTypes: [], alertIssuer: mockAlertIssuer)
+        supportManager = SupportManager(pluginManager: pluginManager, deviceSupportDelegate: mocKDeviceSupportDelegate, alertIssuer: mockAlertIssuer)
         mockSupport = SupportManagerTests.MockSupport()
         supportManager.addSupport(mockSupport)
     }