Metro: Eopatch pump plugin, handed over by PumpLeaves

Author: MilosKozak

app/src/test/kotlin/app/aaps/di/metro/ContributedPluginsTest.kt

@@ -63,10 +63,10 @@ class ContributedPluginsTest {
     fun `only a build with pump drivers gets the pump plugins`() {
         // Nothing asserted this bucket until Insight, Dash and Diaconn moved into it. VirtualPump is
         // NOT here: it is contributed unqualified, on purpose - see the 1000 entry above.
-        // Still on Dagger and so absent: Eopatch 1110, whose plugin needs nine module-internal types
-        // (IPatchManager, IBleDevice, Alarms, ...) that the graph cannot reach yet.
+        // Every pump driver in the tree. Dagger builds them all - see PumpDriverBucketTest for why -
+        // and PumpLeaves hands each one over, so Metro never constructs a pump plugin itself.
         assertThat(testRoot().contributedPumpDriverPlugins.keys)
-            .containsExactly(1010, 1020, 1030, 1040, 1050, 1060, 1080, 1090, 1100, 1120, 1130)
+            .containsExactly(1010, 1020, 1030, 1040, 1050, 1060, 1080, 1090, 1100, 1110, 1120, 1130)
     }
 
     @Test

app/src/testFull/kotlin/app/aaps/di/metro/PumpDriverBucketTest.kt

@@ -6,6 +6,7 @@ import app.aaps.pump.danarkorean.DanaRKoreanPlugin
 import app.aaps.pump.danars.DanaRSPlugin
 import app.aaps.pump.danarv2.DanaRv2Plugin
 import app.aaps.pump.diaconn.DiaconnG8Plugin
+import app.aaps.pump.eopatch.EopatchPumpPlugin
 import app.aaps.pump.equil.EquilPumpPlugin
 import app.aaps.pump.insight.InsightPlugin
 import app.aaps.pump.medtronic.MedtronicPumpPlugin
@@ -41,6 +42,7 @@ class PumpDriverBucketTest {
         assertThat(drivers[1080]).isInstanceOf(OmnipodDashPumpPlugin::class.java)
         assertThat(drivers[1090]).isInstanceOf(MedtronicPumpPlugin::class.java)
         assertThat(drivers[1100]).isInstanceOf(DiaconnG8Plugin::class.java)
+        assertThat(drivers[1110]).isInstanceOf(EopatchPumpPlugin::class.java)
         assertThat(drivers[1120]).isInstanceOf(MedtrumPlugin::class.java)
         assertThat(drivers[1130]).isInstanceOf(EquilPumpPlugin::class.java)
     }
@@ -71,6 +73,6 @@ class PumpDriverBucketTest {
         // would report it.
         val everyBuild = testRoot().contributedPlugins.keys
 
-        assertThat(everyBuild).containsNoneOf(1010, 1020, 1030, 1040, 1050, 1060, 1080, 1090, 1100, 1120, 1130)
+        assertThat(everyBuild).containsNoneOf(1010, 1020, 1030, 1040, 1050, 1060, 1080, 1090, 1100, 1110, 1120, 1130)
     }
 }

app/src/withPumps/kotlin/app/aaps/di/metro/PumpLeaves.kt

@@ -8,6 +8,7 @@ import app.aaps.pump.danarv2.DanaRv2Plugin
 import app.aaps.pump.insight.InsightPlugin
 import app.aaps.pump.medtronic.MedtronicPumpPlugin
 import app.aaps.pump.diaconn.DiaconnG8Plugin
+import app.aaps.pump.eopatch.EopatchPumpPlugin
 import app.aaps.pump.dana.DanaPump
 import app.aaps.pump.dana.database.DanaHistoryDatabase
 import app.aaps.pump.dana.database.DanaHistoryRecordDao
@@ -88,6 +89,7 @@ class PumpLeaves(
     private val insightPluginProvider: Provider<InsightPlugin>,
     private val medtronicPumpPluginProvider: Provider<MedtronicPumpPlugin>,
     private val diaconnG8PluginProvider: Provider<DiaconnG8Plugin>,
+    private val eopatchPumpPluginProvider: Provider<EopatchPumpPlugin>,
     private val omnipodDashPumpPluginProvider: Provider<OmnipodDashPumpPlugin>
 ) {
 
@@ -145,4 +147,5 @@ class PumpLeaves(
     @Provides fun insightPlugin(): InsightPlugin = insightPluginProvider.get()
     @Provides fun medtronicPumpPlugin(): MedtronicPumpPlugin = medtronicPumpPluginProvider.get()
     @Provides fun diaconnG8Plugin(): DiaconnG8Plugin = diaconnG8PluginProvider.get()
+    @Provides fun eopatchPumpPlugin(): EopatchPumpPlugin = eopatchPumpPluginProvider.get()
 }

app/src/withPumps/kotlin/app/aaps/di/metro/PumpLeavesModule.kt

@@ -8,6 +8,7 @@ import app.aaps.pump.danarv2.DanaRv2Plugin
 import app.aaps.pump.insight.InsightPlugin
 import app.aaps.pump.medtronic.MedtronicPumpPlugin
 import app.aaps.pump.diaconn.DiaconnG8Plugin
+import app.aaps.pump.eopatch.EopatchPumpPlugin
 import app.aaps.pump.dana.DanaPump
 import app.aaps.pump.dana.database.DanaHistoryDatabase
 import app.aaps.pump.dana.database.DanaHistoryRecordDao
@@ -83,6 +84,7 @@ class PumpLeavesModule {
         insightPlugin: Provider<InsightPlugin>,
         medtronicPumpPlugin: Provider<MedtronicPumpPlugin>,
         diaconnG8Plugin: Provider<DiaconnG8Plugin>,
+        eopatchPumpPlugin: Provider<EopatchPumpPlugin>,
         omnipodDashPumpPlugin: Provider<OmnipodDashPumpPlugin>
     ): PumpLeaves = PumpLeaves(
         bleTransport, rfcommTransport, danaHistoryRecordDao, diaconnHistoryRecordDao, diaconnHistoryDatabase,
@@ -91,6 +93,7 @@ class PumpLeavesModule {
         bleComm, comboV2Plugin, danaPump, danaRSPlugin, diaconnG8Pump, equilManager, equilPumpPlugin,
         medtrumPlugin, medtrumPump,
         danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, insightPlugin, medtronicPumpPlugin, diaconnG8Plugin,
+        eopatchPumpPlugin,
         omnipodDashPumpPlugin
     )
 }

pump/eopatch/src/main/kotlin/app/aaps/pump/eopatch/EopatchPumpPlugin.kt

@@ -9,9 +9,11 @@ import app.aaps.core.data.pump.defs.PumpType
 import app.aaps.core.data.pump.defs.TimeChangeType
 import app.aaps.core.data.time.T
 import app.aaps.core.interfaces.InterfacesStrings
+import app.aaps.core.interfaces.di.PumpDriver
 import app.aaps.core.interfaces.logging.AAPSLogger
 import app.aaps.core.interfaces.logging.LTag
 import app.aaps.core.interfaces.plugin.PermissionGroup
+import app.aaps.core.interfaces.plugin.PluginBase
 import app.aaps.core.interfaces.plugin.PluginDescription
 import app.aaps.core.interfaces.protection.ProtectionCheck
 import app.aaps.core.interfaces.pump.BlePreCheck
@@ -68,12 +70,19 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.runBlocking
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesIntoMap
+import dev.zacsweers.metro.IntKey as MetroIntKey
+import dev.zacsweers.metro.binding
 import javax.inject.Inject
 import javax.inject.Provider
 import javax.inject.Singleton
 import kotlin.math.abs
 import app.aaps.core.ui.R as CoreUiR
 
+@ContributesIntoMap(AppScope::class, binding = binding<PluginBase>())
+@PumpDriver
+@MetroIntKey(1110)
 @Singleton
 class EopatchPumpPlugin @Inject constructor(
     aapsLogger: AAPSLogger,

pump/eopatch/src/main/kotlin/app/aaps/pump/eopatch/di/EopatchModule.kt

@@ -43,9 +43,4 @@ abstract class EopatchModule {
     abstract fun bindPreferenceManager(preferenceManager: PreferenceManagerImpl): PreferenceManager
 
     // Pump plugin registration — @IntKey range 1000–1200, see PluginsListModule for overview
-    @Binds
-    @PumpDriver
-    @IntoMap
-    @IntKey(1110)
-    abstract fun bindEopatchPumpPlugin(plugin: EopatchPumpPlugin): PluginBase
 }