Merge pull request #116 from synonymdev/feat/tags-edit-invoice

Implement tag feature in the EditInvoiceScreen

Author: ovitrif

app/schemas/to.bitkit.data.AppDb/1.json

@@ -31,4 +31,4 @@
       "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ea0d5b36d92a5a3fb1523c3064686f7d')"
     ]
   }
-}
+}

app/schemas/to.bitkit.data.AppDb/2.json

@@ -0,0 +1,66 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 2,
+    "identityHash": "548162ed64d13ae0bed807c23709b850",
+    "entities": [
+      {
+        "tableName": "config",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`walletIndex` INTEGER NOT NULL, PRIMARY KEY(`walletIndex`))",
+        "fields": [
+          {
+            "fieldPath": "walletIndex",
+            "columnName": "walletIndex",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "walletIndex"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "invoice_tag",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`paymentHash` TEXT NOT NULL, `tags` TEXT NOT NULL, `createdAt` INTEGER NOT NULL, PRIMARY KEY(`paymentHash`))",
+        "fields": [
+          {
+            "fieldPath": "paymentHash",
+            "columnName": "paymentHash",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tags",
+            "columnName": "tags",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "paymentHash"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '548162ed64d13ae0bed807c23709b850')"
+    ]
+  }
+}

app/src/main/java/to/bitkit/data/AppDb.kt

@@ -6,6 +6,7 @@ import androidx.room.Database
 import androidx.room.Query
 import androidx.room.Room
 import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
 import androidx.room.Upsert
 import androidx.sqlite.db.SupportSQLiteDatabase
 import androidx.work.CoroutineWorker
@@ -15,17 +16,24 @@ import androidx.work.WorkerParameters
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
 import to.bitkit.BuildConfig
+import to.bitkit.data.dao.InvoiceTagDao
 import to.bitkit.data.entities.ConfigEntity
+import to.bitkit.data.entities.InvoiceTagEntity
+import to.bitkit.data.typeConverters.StringListConverter
 import to.bitkit.env.Env
 
 @Database(
     entities = [
         ConfigEntity::class,
+        InvoiceTagEntity::class
     ],
-    version = 1,
+    version = 2,
 )
+
+@TypeConverters(StringListConverter::class)
 abstract class AppDb : RoomDatabase() {
     abstract fun configDao(): ConfigDao
+    abstract fun invoiceTagDao(): InvoiceTagDao
 
     companion object {
         private val DB_NAME = "${BuildConfig.APPLICATION_ID}.${Env.network.name.lowercase()}.sqlite"

app/src/main/java/to/bitkit/data/dao/InvoiceTagDao.kt

@@ -0,0 +1,30 @@
+package to.bitkit.data.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import to.bitkit.data.entities.InvoiceTagEntity
+
+@Dao
+interface InvoiceTagDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun saveInvoice(invoiceTag: InvoiceTagEntity)
+
+    @Query("SELECT * FROM invoice_tag WHERE paymentHash = :paymentHash LIMIT 1")
+    suspend fun searchInvoice(paymentHash: String) : InvoiceTagEntity?
+
+    @Delete
+    suspend fun deleteInvoice(invoiceTag: InvoiceTagEntity)
+
+    @Query("DELETE FROM invoice_tag WHERE paymentHash = :paymentHash")
+    suspend fun deleteInvoiceByPaymentHash(paymentHash: String)
+
+    @Query("DELETE FROM invoice_tag")
+    suspend fun deleteAllInvoices()
+
+    @Query("DELETE FROM invoice_tag WHERE createdAt < :expirationTimeStamp")
+    suspend fun deleteExpiredInvoices(expirationTimeStamp: Long)
+}

app/src/main/java/to/bitkit/data/entities/InvoiceTagEntity.kt

@@ -0,0 +1,11 @@
+package to.bitkit.data.entities
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "invoice_tag")
+data class InvoiceTagEntity(
+    @PrimaryKey val paymentHash: String,
+    val tags: List<String>,
+    val createdAt: Long
+)

app/src/main/java/to/bitkit/data/typeConverters/StringListConverter.kt

@@ -0,0 +1,15 @@
+package to.bitkit.data.typeConverters
+
+import androidx.room.TypeConverter
+
+class StringListConverter {
+    @TypeConverter
+    fun fromString(value: String): List<String> {
+        return value.split(",").map { it.trim() }
+    }
+
+    @TypeConverter
+    fun fromList(list: List<String>): String {
+        return list.joinToString(",")
+    }
+}

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

@@ -12,6 +12,7 @@ sealed class NodeLifecycleState {
     fun isRunningOrStarting() = this is Running || this is Starting
     fun isStarting() = this is Starting
     fun isRunning() = this is Running
+    fun canRun() = this.isRunningOrStarting() || this is Initializing
 
     val displayState: String
         get() = when (this) {