Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix multiple signal types in one configuration #16

Merged
merged 1 commit into from
Nov 1, 2024
Merged

fix multiple signal types in one configuration #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion ...kotlin/com/flipperdevices/ifrmvp/backend/route/signal/presentation/SignalRouteRegistry.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand All @@ -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)
Expand Down
Loading