feat: backup closed channels & restore activities using bulk upsert

Author: ovitrif

app/src/main/java/to/bitkit/models/BackupPayloads.kt

@@ -1,6 +1,7 @@
 package to.bitkit.models
 
 import com.synonym.bitkitcore.Activity
+import com.synonym.bitkitcore.ClosedChannelDetails
 import com.synonym.bitkitcore.IBtInfo
 import com.synonym.bitkitcore.IBtOrder
 import com.synonym.bitkitcore.IcJitEntry
@@ -38,4 +39,5 @@ data class ActivityBackupV1(
     val version: Int = 1,
     val createdAt: Long,
     val activities: List<Activity>,
+    val closedChannels: List<ClosedChannelDetails>,
 )

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

@@ -2,6 +2,7 @@ package to.bitkit.repositories
 
 import com.synonym.bitkitcore.Activity
 import com.synonym.bitkitcore.ActivityFilter
+import com.synonym.bitkitcore.ClosedChannelDetails
 import com.synonym.bitkitcore.IcJitEntry
 import com.synonym.bitkitcore.LightningActivity
 import com.synonym.bitkitcore.PaymentState
@@ -29,6 +30,7 @@ import to.bitkit.ext.amountOnClose
 import to.bitkit.ext.matchesPaymentId
 import to.bitkit.ext.nowTimestamp
 import to.bitkit.ext.rawId
+import to.bitkit.models.ActivityBackupV1
 import to.bitkit.services.CoreService
 import to.bitkit.utils.AddressChecker
 import to.bitkit.utils.Logger
@@ -166,9 +168,6 @@ class ActivityRepo @Inject constructor(
         }
     }
 
-    /**
-     * Gets activities with specified filters
-     */
     suspend fun getActivities(
         filter: ActivityFilter? = null,
         txType: PaymentType? = null,
@@ -198,9 +197,6 @@ class ActivityRepo @Inject constructor(
         }
     }
 
-    /**
-     * Gets a specific activity by ID
-     */
     suspend fun getActivity(id: String): Result<Activity?> = withContext(bgDispatcher) {
         return@withContext runCatching {
             coreService.activity.getActivity(id)
@@ -209,6 +205,16 @@ class ActivityRepo @Inject constructor(
         }
     }
 
+    suspend fun getClosedChannels(
+        sortDirection: SortDirection = SortDirection.ASC,
+    ): Result<List<ClosedChannelDetails>> = withContext(bgDispatcher) {
+        runCatching {
+            coreService.activity.closedChannels(sortDirection)
+        }.onFailure { e ->
+            Logger.error("Error getting closed channels (sortDirection=${SortDirection})", e, context = TAG)
+        }
+    }
+
     /**
      * Updates an activity
      * @param forceUpdate use it if you want update a deleted activity
@@ -643,6 +649,13 @@ class ActivityRepo @Inject constructor(
         }
     }
 
+    suspend fun restoreFromBackup(backup: ActivityBackupV1): Result<Unit> = withContext(bgDispatcher) {
+        return@withContext runCatching {
+            coreService.activity.upsert(backup.activities)
+            coreService.activity.upsert(backup.closedChannels)
+        }
+    }
+
     // MARK: - Development/Testing Methods
 
     /**

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

@@ -371,10 +371,12 @@ class BackupRepo @Inject constructor(
 
         BackupCategory.ACTIVITY -> {
             val activities = activityRepo.getActivities().getOrDefault(emptyList())
+            val closedChannels = activityRepo.getClosedChannels().getOrDefault(emptyList())
 
             val payload = ActivityBackupV1(
                 createdAt = currentTimeMillis(),
                 activities = activities,
+                closedChannels = closedChannels,
             )
 
             json.encodeToString(payload).toByteArray()
@@ -434,11 +436,16 @@ class BackupRepo @Inject constructor(
             performRestore(BackupCategory.ACTIVITY) { dataBytes ->
                 val parsed = json.decodeFromString<ActivityBackupV1>(String(dataBytes))
 
-                parsed.activities.forEach { activity ->
-                    activityRepo.upsertActivity(activity)
-                }
-
-                Logger.debug("Restored ${parsed.activities.size} activities", context = TAG)
+                activityRepo.restoreFromBackup(parsed)
+                    .onSuccess {
+                        Logger.debug(
+                            "Restored ${parsed.activities.size} activities and " +
+                                "${parsed.closedChannels.size} closed channels",
+                            context = TAG,
+                        )
+                    }.onFailure { e ->
+                        Logger.warn("Failed to restore activities and closed channels", e, context = TAG)
+                    }
             }
 
             Logger.info("Full restore success", context = TAG)

app/src/main/java/to/bitkit/services/CoreService.kt

@@ -27,6 +27,7 @@ import com.synonym.bitkitcore.deleteActivityById
 import com.synonym.bitkitcore.estimateOrderFeeFull
 import com.synonym.bitkitcore.getActivities
 import com.synonym.bitkitcore.getActivityById
+import com.synonym.bitkitcore.getAllClosedChannels
 import com.synonym.bitkitcore.getAllUniqueTags
 import com.synonym.bitkitcore.getCjitEntries
 import com.synonym.bitkitcore.getInfo
@@ -206,10 +207,8 @@ class ActivityService(
         }
     }
 
-    suspend fun upsert(activity: Activity) {
-        ServiceQueue.CORE.background {
-            upsertActivity(activity)
-        }
+    suspend fun upsert(activity: Activity) = ServiceQueue.CORE.background {
+        upsertActivity(activity)
     }
 
     suspend fun upsert(activities: List<Activity>) = ServiceQueue.CORE.background {
@@ -286,6 +285,12 @@ class ActivityService(
         }
     }
 
+    suspend fun closedChannels(
+        sortDirection: SortDirection,
+    ): List<ClosedChannelDetails> = ServiceQueue.CORE.background {
+        getAllClosedChannels(sortDirection)
+    }
+
     /**
      * Maps all `PaymentDetails` from LDK Node to bitkit-core [Activity] records.
      *