fix find by name (#15)

* fix find by name * up version 0.7.0
flipperdevices · Sep 17, 2024 · 5aae3c5 · 5aae3c5
1 parent 0180598
commit 5aae3c5
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.parallel=true
 makeevrserg.project.name=IRDBBackend
 makeevrserg.project.url=https://github.com/flipperdevices/IRDB-Backend
 makeevrserg.project.group=com.flipperdevices.ifrmvp.backend
-makeevrserg.project.version.string=0.6.0
+makeevrserg.project.version.string=0.7.0
 makeevrserg.project.description=Api for IfrSample
 makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
 # Java

diff --git a/...in/kotlin/com/flipperdevices/ifrmvp/backend/db/signal/di/factory/SignalDatabaseFactory.kt b/...in/kotlin/com/flipperdevices/ifrmvp/backend/db/signal/di/factory/SignalDatabaseFactory.kt
@@ -7,6 +7,7 @@ import com.flipperdevices.ifrmvp.backend.db.signal.table.CategoryTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.InfraredFileTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.InfraredFileToSignalTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.SignalKeyTable
+import com.flipperdevices.ifrmvp.backend.db.signal.table.SignalNameAliasTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.SignalTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.UiPresetTable
 import com.flipperdevices.ifrmvp.backend.envkonfig.model.DBConnection
@@ -32,6 +33,7 @@ internal class SignalDatabaseFactory(
                     CategoryTable,
                     InfraredFileTable,
                     InfraredFileToSignalTable,
+                    SignalNameAliasTable,
                     SignalTable,
                     SignalKeyTable,
                     UiPresetTable,

diff --git a/...src/main/kotlin/com/flipperdevices/ifrmvp/backend/db/signal/table/SignalNameAliasTable.kt b/...src/main/kotlin/com/flipperdevices/ifrmvp/backend/db/signal/table/SignalNameAliasTable.kt
@@ -0,0 +1,12 @@
+package com.flipperdevices.ifrmvp.backend.db.signal.table
+
+import org.jetbrains.exposed.dao.id.LongIdTable
+
+object SignalNameAliasTable : LongIdTable("SIGNAL_NAME_ALIAS") {
+    val signalId = reference("signal_id", SignalTable)
+    val signalName = text("signal_name")
+
+    init {
+        uniqueIndex(signalId, signalName)
+    }
+}
diff --git a/...database/src/main/kotlin/com/flipperdevices/ifrmvp/backend/db/signal/table/SignalTable.kt b/...database/src/main/kotlin/com/flipperdevices/ifrmvp/backend/db/signal/table/SignalTable.kt
@@ -12,7 +12,6 @@ import org.jetbrains.exposed.dao.id.LongIdTable
 object SignalTable : LongIdTable("SIGNAL_TABLE") {
     val brandId = reference("brand_id", BrandTable)
 
-    val name = text("name")
     val type = text("type")
     val protocol = text("protocol").nullable()
     val address = text("address").nullable()

diff --git a/...tor/sql/src/main/kotlin/com/flipperdevices/ifrmvp/parser/presentation/FillerController.kt b/...tor/sql/src/main/kotlin/com/flipperdevices/ifrmvp/parser/presentation/FillerController.kt
@@ -8,6 +8,7 @@ import com.flipperdevices.ifrmvp.backend.db.signal.table.CategoryTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.InfraredFileTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.InfraredFileToSignalTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.SignalKeyTable
+import com.flipperdevices.ifrmvp.backend.db.signal.table.SignalNameAliasTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.SignalTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.UiPresetTable
 import com.flipperdevices.ifrmvp.model.IfrKeyIdentifier
@@ -17,7 +18,10 @@ import com.flipperdevices.infrared.editor.model.InfraredRemote
 import com.flipperdevices.infrared.editor.util.InfraredMapper
 import com.flipperdevices.infrared.editor.viewmodel.InfraredKeyParser
 import java.io.File
+import kotlin.math.sign
+import kotlin.time.measureTime
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.async
 import org.jetbrains.exposed.sql.Database
 import org.jetbrains.exposed.sql.JoinType
 import org.jetbrains.exposed.sql.andWhere
@@ -103,7 +107,6 @@ internal class FillerController(private val database: Database) : CoroutineScope
                                 val parsedRemote = remote as? InfraredRemote.Parsed
                                 val rawRemote = remote as? InfraredRemote.Raw
                                 this[SignalTable.brandId] = brandId
-                                this[SignalTable.name] = remote.name
                                 this[SignalTable.type] = remote.type
                                 this[SignalTable.protocol] = parsedRemote?.protocol
                                 this[SignalTable.address] = parsedRemote?.address
@@ -143,6 +146,12 @@ internal class FillerController(private val database: Database) : CoroutineScope
                                     """.trimIndent()
                                 )
                             }
+
+                            SignalNameAliasTable.batchInsert(signalIds.zip(signals), ignore = true) {
+                                this[SignalNameAliasTable.signalName] = it.second.name
+                                this[SignalNameAliasTable.signalId] = it.first.value
+                            }
+
                             InfraredFileToSignalTable.batchInsert(signalIds) {
                                 this[InfraredFileToSignalTable.infraredFileId] = irFileId
                                 this[InfraredFileToSignalTable.signalId] = it
@@ -164,7 +173,10 @@ internal class FillerController(private val database: Database) : CoroutineScope
                                         this[SignalKeyTable.type] = IfrKeyIdentifier.Empty.TYPE
                                     }
 
-                                    is IfrKeyIdentifier.Name -> error("Identifying by name is not possible!")
+                                    is IfrKeyIdentifier.Name -> {
+                                        this[SignalKeyTable.remoteKeyName] = keyIdentifier.name
+                                        this[SignalKeyTable.type] = IfrKeyIdentifier.Sha256.TYPE
+                                    }
 
                                     is IfrKeyIdentifier.Sha256 -> {
                                         this[SignalKeyTable.remoteKeyName] = keyIdentifier.name
@@ -180,6 +192,12 @@ internal class FillerController(private val database: Database) : CoroutineScope
                                         onColumn = SignalTable.id,
                                         otherColumn = InfraredFileToSignalTable.signalId
                                     )
+                                    .join(
+                                        otherTable = SignalNameAliasTable,
+                                        joinType = JoinType.LEFT,
+                                        onColumn = SignalTable.id,
+                                        otherColumn = SignalNameAliasTable.signalId
+                                    )
                                     .select(SignalTable.id)
                                     .where { SignalTable.brandId eq brandId }
                                     .andWhere { InfraredFileToSignalTable.infraredFileId eq irFileId }
@@ -191,7 +209,9 @@ internal class FillerController(private val database: Database) : CoroutineScope
                                                 andWhere { SignalTable.hash eq keyIdentifier.hash }
                                             }
 
-                                            is IfrKeyIdentifier.Name -> error("Identifying by name is not possible!")
+                                            is IfrKeyIdentifier.Name -> {
+                                                andWhere { SignalNameAliasTable.signalName eq keyIdentifier.name }
+                                            }
                                         }
                                     }
                                     .map { it[SignalTable.id] }

diff --git a/...kotlin/com/flipperdevices/ifrmvp/backend/route/signal/presentation/SignalRouteRegistry.kt b/...kotlin/com/flipperdevices/ifrmvp/backend/route/signal/presentation/SignalRouteRegistry.kt
@@ -6,6 +6,7 @@ import com.flipperdevices.ifrmvp.backend.db.signal.exception.TableDaoException
 import com.flipperdevices.ifrmvp.backend.db.signal.table.InfraredFileTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.InfraredFileToSignalTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.SignalKeyTable
+import com.flipperdevices.ifrmvp.backend.db.signal.table.SignalNameAliasTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.SignalTable
 import com.flipperdevices.ifrmvp.backend.model.BrandModel
 import com.flipperdevices.ifrmvp.backend.model.CategoryConfiguration
@@ -196,7 +197,7 @@ internal class SignalRouteRegistry(
                     SignalModel(
                         id = it[SignalTable.id].value,
                         remote = SignalModel.FlipperRemote(
-                            name = it[SignalTable.name],
+                            name = "empty",
                             type = it[SignalTable.type],
                             protocol = it[SignalTable.protocol],
                             address = it[SignalTable.address],
@@ -238,13 +239,13 @@ internal class SignalRouteRegistry(
         }
 
         val skippedKeys = transaction(database) {
-            SignalTable
+            SignalNameAliasTable
                 .selectAll()
-                .where { SignalTable.id inList signalRequestModel.skippedResults.map(SignalRequestModel.SignalResultData::signalId) }
+                .where { SignalNameAliasTable.id inList signalRequestModel.skippedResults.map(SignalRequestModel.SignalResultData::signalId) }
                 .mapNotNull {
-                    val keyName = it[SignalTable.name]
+                    val keyName = it[SignalNameAliasTable.signalName]
                     AnyDeviceKeyNamesProvider.getKey(keyName)
-                }
+                }.distinct()
         }
 
         val signalModel = getSignalModel(