refactor: encapsulate parse and execute in command

Author: ovitrif

app/src/debug/java/to/bitkit/dev/DevToolsProvider.kt

@@ -22,32 +22,17 @@ class DevToolsProvider : ContentProvider() {
         fun lightningRepo(): LightningRepo
     }
 
-    private val lightningRepo: LightningRepo by lazy {
-        EntryPointAccessors.fromApplication(context!!, Dependencies::class.java).lightningRepo()
+    private val deps: Dependencies by lazy {
+        EntryPointAccessors.fromApplication(context!!, Dependencies::class.java)
     }
 
-    override fun call(method: String, arg: String?, extras: Bundle?): Bundle {
-        val command = DevCommand.parse(method, arg)
-            ?: return DevResult.Error("Unknown method: '$method'").toBundle()
-        return execute { handle(command) }
-    }
-
-    private fun execute(block: suspend () -> DevResult): Bundle = runCatching {
-        ServiceQueue.LDK.blocking { block() }
+    override fun call(method: String, arg: String?, extras: Bundle?): Bundle = runCatching {
+        val command = requireNotNull(DevCommand.parse(method, arg))
+        ServiceQueue.LDK.blocking { command.execute(deps) }
     }.getOrElse {
         DevResult.Error(it.message)
     }.toBundle()
 
-    private suspend fun handle(command: DevCommand): DevResult = when (command) {
-        is DevCommand.CreateInvoice -> lightningRepo.createInvoice(
-            command.args.amount,
-            command.args.description,
-        ).fold(
-            onSuccess = { DevResult.Invoice(it) },
-            onFailure = { DevResult.Error(it.message) },
-        )
-    }
-
     override fun onCreate() = true
     override fun getType(uri: Uri): String? = null
     override fun insert(uri: Uri, values: ContentValues?): Uri? = null
@@ -58,22 +43,27 @@ class DevToolsProvider : ContentProvider() {
 
 private sealed interface DevCommand {
 
-    val method: String
+    suspend fun execute(deps: DevToolsProvider.Dependencies): DevResult
 
     data class CreateInvoice(val args: Args) : DevCommand {
+        @Serializable
+        data class Args(val amount: ULong? = null, val description: String = "dev-invoice")
+
+        override suspend fun execute(deps: DevToolsProvider.Dependencies) =
+            deps.lightningRepo().createInvoice(args.amount, args.description).fold(
+                onSuccess = { DevResult.Invoice(it) },
+                onFailure = { DevResult.Error(it.message) },
+            )
+
         companion object {
             const val METHOD = "createInvoice"
+            fun parse(arg: String?) = CreateInvoice(arg.deserialize<Args>())
         }
-
-        override val method get() = METHOD
-
-        @Serializable
-        data class Args(val amount: ULong? = null, val description: String = "dev-invoice")
     }
 
     companion object {
         fun parse(method: String, arg: String?): DevCommand? = when (method) {
-            CreateInvoice.METHOD -> CreateInvoice(arg.deserialize<CreateInvoice.Args>())
+            CreateInvoice.METHOD -> CreateInvoice.parse(arg)
             else -> null
         }
     }