feat: backup & restore activity tags

Author: ovitrif

app/src/main/java/to/bitkit/ext/TagMetadata.kt

@@ -13,7 +13,7 @@ fun TagMetadataEntity.toActivityTagsMetadata() = ActivityTagsMetadata(
     createdAt.toULong(),
 )
 
-fun ActivityTagsMetadata.TagMetadataEntity() = TagMetadataEntity(
+fun ActivityTagsMetadata.toTagMetadataEntity() = TagMetadataEntity(
     id,
     paymentHash,
     txId,

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.ActivityTags
 import com.synonym.bitkitcore.ActivityTagsMetadata
 import com.synonym.bitkitcore.ClosedChannelDetails
 import com.synonym.bitkitcore.IBtInfo
@@ -39,5 +40,6 @@ data class ActivityBackupV1(
     val version: Int = 1,
     val createdAt: Long,
     val activities: List<Activity>,
+    val activityTags: List<ActivityTags>,
     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.ActivityTags
 import com.synonym.bitkitcore.ClosedChannelDetails
 import com.synonym.bitkitcore.IcJitEntry
 import com.synonym.bitkitcore.LightningActivity
@@ -622,6 +623,17 @@ class ActivityRepo @Inject constructor(
         }
     }
 
+    /**
+     * Get all [ActivityTags] for backup
+     */
+    suspend fun getAllActivityTags(): Result<List<ActivityTags>> = withContext(bgDispatcher) {
+        return@withContext runCatching {
+            coreService.activity.getAllActivityTags()
+        }.onFailure { e ->
+            Logger.error("getAllActivityTags error", e, context = TAG)
+        }
+    }
+
     suspend fun saveTagsMetadata(
         id: String,
         paymentHash: String? = null,
@@ -652,6 +664,7 @@ class ActivityRepo @Inject constructor(
     suspend fun restoreFromBackup(backup: ActivityBackupV1): Result<Unit> = withContext(bgDispatcher) {
         return@withContext runCatching {
             coreService.activity.upsertList(backup.activities)
+            coreService.activity.upsertTags(backup.activityTags)
             coreService.activity.upsertClosedChannelList(backup.closedChannels)
         }
     }

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

@@ -32,7 +32,7 @@ import to.bitkit.di.json
 import to.bitkit.ext.formatPlural
 import to.bitkit.ext.nowMillis
 import to.bitkit.ext.toActivityTagsMetadata
-import to.bitkit.ext.TagMetadataEntity
+import to.bitkit.ext.toTagMetadataEntity
 import to.bitkit.models.ActivityBackupV1
 import to.bitkit.models.BackupCategory
 import to.bitkit.models.BackupItemStatus
@@ -396,10 +396,12 @@ class BackupRepo @Inject constructor(
         BackupCategory.ACTIVITY -> {
             val activities = activityRepo.getActivities().getOrDefault(emptyList())
             val closedChannels = activityRepo.getClosedChannels().getOrDefault(emptyList())
+            val activityTags = activityRepo.getAllActivityTags().getOrDefault(emptyList())
 
             val payload = ActivityBackupV1(
                 createdAt = currentTimeMillis(),
                 activities = activities,
+                activityTags = activityTags,
                 closedChannels = closedChannels,
             )
 
@@ -424,7 +426,7 @@ class BackupRepo @Inject constructor(
                 }
                 Logger.debug("Restored caches: ${jsonLogOf(parsed.cache.copy(cachedRates = emptyList()))}", TAG)
                 onCacheRestored()
-                val tagMetadata = parsed.tagMetadata.map { it.TagMetadataEntity() }
+                val tagMetadata = parsed.tagMetadata.map { it.toTagMetadataEntity() }
                 db.tagMetadataDao().upsert(tagMetadata)
                 Logger.debug("Restored caches and ${tagMetadata.size} tags metadata records", TAG)
             }
@@ -452,7 +454,8 @@ class BackupRepo @Inject constructor(
                 val parsed = json.decodeFromString<ActivityBackupV1>(String(dataBytes))
                 activityRepo.restoreFromBackup(parsed).onSuccess {
                     Logger.debug(
-                        "Restored ${parsed.activities.size} activities, ${parsed.closedChannels.size} closed channels",
+                        "Restored ${parsed.activities.size} activities, ${parsed.activityTags.size} activity tags, " +
+                            "${parsed.closedChannels.size} closed channels",
                         context = TAG,
                     )
                 }

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

@@ -2,6 +2,8 @@ package to.bitkit.services
 
 import com.synonym.bitkitcore.Activity
 import com.synonym.bitkitcore.ActivityFilter
+import com.synonym.bitkitcore.ActivityTags
+import com.synonym.bitkitcore.ActivityTagsMetadata
 import com.synonym.bitkitcore.BtOrderState2
 import com.synonym.bitkitcore.CJitStateEnum
 import com.synonym.bitkitcore.ClosedChannelDetails
@@ -28,6 +30,7 @@ import com.synonym.bitkitcore.estimateOrderFeeFull
 import com.synonym.bitkitcore.getActivities
 import com.synonym.bitkitcore.getActivityById
 import com.synonym.bitkitcore.getAllClosedChannels
+import com.synonym.bitkitcore.getAllTagMetadata
 import com.synonym.bitkitcore.getAllUniqueTags
 import com.synonym.bitkitcore.getCjitEntries
 import com.synonym.bitkitcore.getInfo
@@ -44,7 +47,6 @@ import com.synonym.bitkitcore.updateBlocktankUrl
 import com.synonym.bitkitcore.upsertActivities
 import com.synonym.bitkitcore.upsertActivity
 import com.synonym.bitkitcore.upsertCjitEntries
-import com.synonym.bitkitcore.upsertClosedChannel
 import com.synonym.bitkitcore.upsertClosedChannels
 import com.synonym.bitkitcore.upsertInfo
 import com.synonym.bitkitcore.upsertOrders
@@ -215,14 +217,6 @@ class ActivityService(
         upsertActivities(activities)
     }
 
-    suspend fun upsertClosedChannelItem(closedChannel: ClosedChannelDetails) = ServiceQueue.CORE.background {
-        upsertClosedChannel(closedChannel)
-    }
-
-    suspend fun upsertClosedChannelList(closedChannels: List<ClosedChannelDetails>) = ServiceQueue.CORE.background {
-        upsertClosedChannels(closedChannels)
-    }
-
     suspend fun getActivity(id: String): Activity? {
         return ServiceQueue.CORE.background {
             getActivityById(id)
@@ -285,6 +279,18 @@ class ActivityService(
         }
     }
 
+    suspend fun upsertTags(activityTags: List<ActivityTags>) = ServiceQueue.CORE.background {
+        com.synonym.bitkitcore.upsertTags(activityTags)
+    }
+
+    suspend fun getAllActivityTags(): List<ActivityTags> = ServiceQueue.CORE.background {
+        getAllTagMetadata().map { ActivityTags(it.id, tags = it.tags) }
+    }
+
+    suspend fun upsertClosedChannelList(closedChannels: List<ClosedChannelDetails>) = ServiceQueue.CORE.background {
+        upsertClosedChannels(closedChannels)
+    }
+
     suspend fun closedChannels(
         sortDirection: SortDirection,
     ): List<ClosedChannelDetails> = ServiceQueue.CORE.background {