V2 prepare

- Fix category configuration read
flipperdevices · Jul 24, 2024 · dcd7b86 · dcd7b86
1 parent 848338b
commit dcd7b86
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 27 deletions.
diff --git a/...in/kotlin/com/flipperdevices/ifrmvp/backend/route/signal/data/DeviceKeyNamesRepository.kt b/...in/kotlin/com/flipperdevices/ifrmvp/backend/route/signal/data/DeviceKeyNamesRepository.kt
diff --git a/...in/com/flipperdevices/ifrmvp/backend/route/signal/data/InstantCategoryConfigRepository.kt b/...in/com/flipperdevices/ifrmvp/backend/route/signal/data/InstantCategoryConfigRepository.kt
@@ -2,19 +2,16 @@ package com.flipperdevices.ifrmvp.backend.route.signal.data
 
 import com.flipperdevices.ifrmvp.backend.model.CategoryConfiguration
 import com.flipperdevices.ifrmvp.backend.model.CategoryType
-import com.flipperdevices.ifrmvp.generator.config.category.api.AllCategoryConfigGenerator
+import com.flipperdevices.ifrmvp.parser.util.ParserPathResolver
 
 interface CategoryConfigRepository {
     fun getOrNull(categoryType: CategoryType, index: Int): CategoryConfiguration.OrderModel?
 }
 
-object InstantCategoryConfigRepository : CategoryConfigRepository {
-    override fun getOrNull(
-        categoryType: CategoryType,
-        index: Int
-    ): CategoryConfiguration.OrderModel? {
-        return AllCategoryConfigGenerator
-            .generate(categoryType)
+object IRDBCategoryConfigRepository : CategoryConfigRepository {
+    override fun getOrNull(categoryType: CategoryType, index: Int): CategoryConfiguration.OrderModel? {
+        return ParserPathResolver
+            .categoryConfiguration(categoryType.folderName)
             .orders
             .getOrNull(index)
     }

diff --git a/...kotlin/com/flipperdevices/ifrmvp/backend/route/signal/presentation/SignalRouteRegistry.kt b/...kotlin/com/flipperdevices/ifrmvp/backend/route/signal/presentation/SignalRouteRegistry.kt
@@ -15,9 +15,7 @@ import com.flipperdevices.ifrmvp.backend.model.SignalRequestModel
 import com.flipperdevices.ifrmvp.backend.model.SignalResponse
 import com.flipperdevices.ifrmvp.backend.model.SignalResponseModel
 import com.flipperdevices.ifrmvp.backend.route.signal.data.CategoryConfigRepository
-import com.flipperdevices.ifrmvp.backend.route.signal.data.DeviceKeyNamesRepository
-import com.flipperdevices.ifrmvp.backend.route.signal.data.InstantCategoryConfigRepository
-import com.flipperdevices.ifrmvp.backend.route.signal.data.InstantDeviceKeyNamesRepository
+import com.flipperdevices.ifrmvp.backend.route.signal.data.IRDBCategoryConfigRepository
 import io.github.smiley4.ktorswaggerui.dsl.routing.post
 import io.ktor.server.request.receive
 import io.ktor.server.response.respond
@@ -36,8 +34,7 @@ import org.jetbrains.exposed.sql.wrapAsExpression
 internal class SignalRouteRegistry(
     private val database: Database,
     private val tableDao: TableDao,
-    private val categoryConfigRepository: CategoryConfigRepository = InstantCategoryConfigRepository,
-    private val deviceKeyNamesRepository: DeviceKeyNamesRepository = InstantDeviceKeyNamesRepository
+    private val categoryConfigRepository: CategoryConfigRepository = IRDBCategoryConfigRepository,
 ) : RouteRegistry {
 
     // Keep only those files, in which signals have been successfully passed