fix multiple signal types in one configuration (#16)

flipperdevices · Nov 1, 2024 · 68490a5 · 68490a5
1 parent 5aae3c5
commit 68490a5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 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.7.0
+makeevrserg.project.version.string=0.7.1
 makeevrserg.project.description=Api for IfrSample
 makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
 # Java

diff --git a/...kotlin/com/flipperdevices/ifrmvp/backend/route/signal/presentation/SignalRouteRegistry.kt b/...kotlin/com/flipperdevices/ifrmvp/backend/route/signal/presentation/SignalRouteRegistry.kt
@@ -35,6 +35,7 @@ import org.jetbrains.exposed.sql.SortOrder
 import org.jetbrains.exposed.sql.andWhere
 import org.jetbrains.exposed.sql.count
 import org.jetbrains.exposed.sql.or
+import org.jetbrains.exposed.sql.orWhere
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.wrapAsExpression
@@ -217,7 +218,9 @@ internal class SignalRouteRegistry(
         includedFileIds: Query,
         brand: BrandModel,
         // Index of successful results
-        index: Int = signalRequestModel.successResults.size + signalRequestModel.skippedResults.size,
+        index: Int = signalRequestModel.successResults.size
+            .plus(signalRequestModel.skippedResults.size)
+            .plus(signalRequestModel.failedResults.size),
         categoryType: CategoryType,
         category: DeviceCategory
     ): SignalResponseModel {
@@ -242,6 +245,8 @@ internal class SignalRouteRegistry(
             SignalNameAliasTable
                 .selectAll()
                 .where { SignalNameAliasTable.id inList signalRequestModel.skippedResults.map(SignalRequestModel.SignalResultData::signalId) }
+                .orWhere { SignalNameAliasTable.id inList signalRequestModel.successResults.map(SignalRequestModel.SignalResultData::signalId) }
+                .orWhere { SignalNameAliasTable.id inList signalRequestModel.failedResults.map(SignalRequestModel.SignalResultData::signalId) }
                 .mapNotNull {
                     val keyName = it[SignalNameAliasTable.signalName]
                     AnyDeviceKeyNamesProvider.getKey(keyName)