From 7c8a65b8d1ae8a049bf67260acb6fafbd95adac9 Mon Sep 17 00:00:00 2001
From: Isidro Henoch <imhenoch@protonmail.com>
Date: Tue, 21 Dec 2021 14:21:16 -0600
Subject: Implements the commands list

- Shows command details
- Sends a selected command to a device
---
 .../TrackerMap/client/apis/CommandsApi.kt          |  9 ++++++-
 .../trackermap/TrackerMap/client/models/Command.kt |  8 +++---
 .../TrackerMap/controllers/CommandsController.kt   | 29 ----------------------
 3 files changed, 12 insertions(+), 34 deletions(-)
 delete mode 100644 shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/CommandsController.kt

(limited to 'shared')

diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/apis/CommandsApi.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/apis/CommandsApi.kt
index 8f60153..e840888 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/apis/CommandsApi.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/apis/CommandsApi.kt
@@ -30,7 +30,14 @@ class CommandsApi(basePath: kotlin.String = "https://demo.traccar.org/api") : Ap
      */
     @Suppress("UNCHECKED_CAST")
     suspend fun commandsGet(all: kotlin.Boolean? = null, userId: kotlin.Int? = null, deviceId: kotlin.Int? = null, groupId: kotlin.Int? = null, refresh: kotlin.Boolean? = null): kotlin.Array<Command> {
-        val localVariableQuery: MultiValueMap = mapOf("all" to listOf("$all"), "userId" to listOf("$userId"), "deviceId" to listOf("$deviceId"), "groupId" to listOf("$groupId"), "refresh" to listOf("$refresh"))
+        val query: MutableMap<String, List<String>> = mutableMapOf()
+        all?.let { query["all"] = listOf("$it") }
+        userId?.let { query["userId"] = listOf("$it") }
+        deviceId?.let { query["deviceId"] = listOf("$it") }
+        groupId?.let { query["groupId"] = listOf("$it") }
+        refresh?.let { query["refresh"] = listOf("$it") }
+        val localVariableQuery: MultiValueMap = query
+
         val localVariableConfig = RequestConfig(
                 RequestMethod.GET,
                 "/commands", query = localVariableQuery
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Command.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Command.kt
index c1c6a5d..37b22d4 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Command.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Command.kt
@@ -11,6 +11,7 @@
  */
 package mx.trackermap.TrackerMap.client.models
 
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonPrimitive
 
 
@@ -22,12 +23,11 @@ import kotlinx.serialization.json.JsonPrimitive
  * @param type 
  * @param attributes 
  */
+@Serializable
 data class Command (
-
     val id: Int? = null,
-    val deviceId: Int? = null,
+    var deviceId: Int? = null,
     val description: String? = null,
     val type: String? = null,
     val attributes: Map<String, JsonPrimitive> = mapOf()
-) {
-}
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/CommandsController.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/CommandsController.kt
deleted file mode 100644
index b710763..0000000
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/CommandsController.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package mx.trackermap.TrackerMap.controllers
-
-import mx.trackermap.TrackerMap.client.apis.CommandsApi
-import mx.trackermap.TrackerMap.client.models.Command
-import mx.trackermap.TrackerMap.client.models.Device
-
-class CommandsController(
-    val commandsApi: CommandsApi,
-    val sessionController: SessionController)
-{
-    var commands = emptyArray<Command>()
-    val deviceCommands = mutableMapOf<Int, Array<Command>>()
-
-    suspend fun getAllCommands () {
-        sessionController.user?.id?.let {
-            commands = commandsApi.commandsGet(userId = it)
-        }
-    }
-
-    suspend fun getDeviceCommands (device: Device) {
-        device.id?.let {
-            deviceCommands[it] = commandsApi.commandsSendGet (deviceId = device.id)
-        }
-    }
-
-    suspend fun sendCommand (command: Command) {
-        commandsApi.commandsSendPost(command)
-    }
-}
\ No newline at end of file
-- 
cgit v1.2.3