refactor: move code watch code to repository

Author: jvsena42

app/src/main/java/to/bitkit/repositories/BlocktankRepo.kt

@@ -1,5 +1,7 @@
 package to.bitkit.repositories
 
+import androidx.lifecycle.viewModelScope
+import com.synonym.bitkitcore.BtOrderState2
 import com.synonym.bitkitcore.CreateCjitOptions
 import com.synonym.bitkitcore.CreateOrderOptions
 import com.synonym.bitkitcore.IBtEstimateFeeResponse2
@@ -26,13 +28,15 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import to.bitkit.data.CacheStore
+import to.bitkit.data.SettingsStore
 import to.bitkit.di.BgDispatcher
 import to.bitkit.env.Env
 import to.bitkit.ext.nowTimestamp
 import to.bitkit.services.CoreService
 import to.bitkit.services.LightningService
 import to.bitkit.utils.Logger
 import to.bitkit.utils.ServiceError
+import to.bitkit.viewmodels.TransferViewModel
 import java.math.BigDecimal
 import javax.inject.Inject
 import javax.inject.Named
@@ -47,6 +51,7 @@ class BlocktankRepo @Inject constructor(
     private val lightningService: LightningService,
     private val currencyRepo: CurrencyRepo,
     private val cacheStore: CacheStore,
+    private val settingsStore: SettingsStore,
     @Named("enablePolling") private val enablePolling: Boolean,
 ) {
     private val repoScope = CoroutineScope(bgDispatcher + SupervisorJob())
@@ -287,6 +292,75 @@ class BlocktankRepo @Inject constructor(
         }
     }
 
+    suspend fun watchOrder(orderId: String, frequencyMs: Long = 2_500) = withContext(bgDispatcher) {
+        var isSettled = false
+        var error: Throwable? = null
+
+        Logger.debug("Started to watch order '$orderId'", context = TAG)
+
+        while (!isSettled && error == null) {
+            try {
+                Logger.debug("Refreshing order '$orderId'")
+                val order = getOrder(orderId, refresh = true).getOrNull()
+                if (order == null) {
+                    error = Exception("Order not found '$orderId'")
+                    Logger.error("Order not found '$orderId'", context = TAG)
+                    break
+                }
+
+                val step = updateOrder(order)
+                settingsStore.update { it.copy(lightningSetupStep = step) }
+                Logger.debug("LN setup step: $step")
+
+                if (order.state2 == BtOrderState2.EXPIRED) {
+                    error = Exception("Order expired '$orderId'")
+                    Logger.error("Order expired '$orderId'", context = TAG)
+                    break
+                }
+                if (step > 2) {
+                    Logger.debug(
+                        "Order settled, stopping watch order '$orderId'",
+                        context = TAG
+                    )
+                    isSettled = true
+                    break
+                }
+            } catch (e: Throwable) {
+                Logger.error("Failed to watch order '$orderId'", e, context = TAG)
+                error = e
+                break
+            }
+            delay(frequencyMs)
+        }
+        Logger.debug("Stopped watching order '$orderId'", context = TAG)
+
+    }
+
+    private suspend fun updateOrder(order: IBtOrder): Int {
+        var currentStep = 0
+        if (order.channel != null) {
+            return 3
+        }
+
+        when (order.state2) {
+            BtOrderState2.CREATED -> {
+                currentStep = 0
+            }
+
+            BtOrderState2.PAID -> {
+                currentStep = 1
+                openChannel(order.id)
+            }
+
+            BtOrderState2.EXECUTED -> {
+                currentStep = 2
+            }
+
+            else -> Unit
+        }
+        return currentStep
+    }
+
     private suspend fun defaultCreateOrderOptions(clientBalanceSat: ULong): CreateOrderOptions {
         val nodeId = lightningService.nodeId ?: throw ServiceError.NodeNotStarted
         val timestamp = nowTimestamp().toString()

app/src/main/java/to/bitkit/viewmodels/TransferViewModel.kt

@@ -193,56 +193,14 @@ class TransferViewModel @Inject constructor(
                 .onSuccess { txId ->
                     cacheStore.addPaidOrder(orderId = order.id, txId = txId)
                     settingsStore.update { it.copy(lightningSetupStep = 0) }
-                    watchOrder(order.id)
+                    blocktankRepo.watchOrder(order.id)
                 }
                 .onFailure { error ->
                     ToastEventBus.send(error)
                 }
         }
     }
 
-    private fun watchOrder(orderId: String, frequencyMs: Long = 2_500) {
-        var isSettled = false
-        var error: Throwable? = null
-
-        viewModelScope.launch {
-            Logger.debug("Started to watch order '$orderId'", context = TAG)
-
-            while (!isSettled && error == null) {
-                try {
-                    Logger.debug("Refreshing order '$orderId'")
-                    val order = blocktankRepo.getOrder(orderId, refresh = true).getOrNull()
-                    if (order == null) {
-                        error = Exception("Order not found '$orderId'")
-                        Logger.error("Order not found '$orderId'", context = TAG)
-                        break
-                    }
-
-                    val step = updateOrder(order)
-                    settingsStore.update { it.copy(lightningSetupStep = step) }
-                    Logger.debug("LN setup step: $step")
-
-                    if (order.state2 == BtOrderState2.EXPIRED) {
-                        error = Exception("Order expired '$orderId'")
-                        Logger.error("Order expired '$orderId'", context = TAG)
-                        break
-                    }
-                    if (step > 2) {
-                        Logger.debug("Order settled, stopping watch order '$orderId'", context = TAG)
-                        isSettled = true
-                        break
-                    }
-                } catch (e: Throwable) {
-                    Logger.error("Failed to watch order '$orderId'", e, context = TAG)
-                    error = e
-                    break
-                }
-                delay(frequencyMs)
-            }
-            Logger.debug("Stopped watching order '$orderId'", context = TAG)
-        }
-    }
-
     private suspend fun getMinAmountToPurchase(): Long {
         val fee = lightningRepo.calculateTotalFee(_spendingUiState.value.satsAmount.toULong()).getOrNull() ?: 0u
         return max((fee + maxLspFee).toLong(), Env.TransactionDefaults.dustLimit.toLong())
@@ -298,31 +256,6 @@ class TransferViewModel @Inject constructor(
         }
     }
 
-    private suspend fun updateOrder(order: IBtOrder): Int {
-        var currentStep = 0
-        if (order.channel != null) {
-            return 3
-        }
-
-        when (order.state2) {
-            BtOrderState2.CREATED -> {
-                currentStep = 0
-            }
-
-            BtOrderState2.PAID -> {
-                currentStep = 1
-                blocktankRepo.openChannel(order.id)
-            }
-
-            BtOrderState2.EXECUTED -> {
-                currentStep = 2
-            }
-
-            else -> Unit
-        }
-        return currentStep
-    }
-
     fun onUseDefaultLspBalanceClick() {
         val defaultOrder = _spendingUiState.value.defaultOrder
         _spendingUiState.update { it.copy(order = defaultOrder, defaultOrder = null, isAdvanced = false) }