Allows timer trigger in cleanup schema (aka scheduled schema) (#4)

konqi · Feb 28, 2024 · 505067d · 505067d
1 parent c508777
commit 505067d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "de.konqi.roborock-bridge"
-version = "0.0.5-SNAPSHOT"
+version = "0.0.6-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17

diff --git a/src/main/kotlin/de/konqi/roborockbridge/remote/rest/dto/user/UserScenes.kt b/src/main/kotlin/de/konqi/roborockbridge/remote/rest/dto/user/UserScenes.kt
@@ -25,7 +25,7 @@ data class UserScenes(
 )
 
 data class UserSceneParam(
-    val triggers: List<String>,
+    val triggers: List<JsonNode>,
     val action: UserSceneAction,
     val matchType: String
 )

diff --git a/src/test/resources/de/konqi/roborockbridge/remote/rest/GetScenesResultTemplate.json.hbs b/src/test/resources/de/konqi/roborockbridge/remote/rest/GetScenesResultTemplate.json.hbs
@@ -22,7 +22,7 @@
       {
         "id": 611409,
         "name": "🍲🍽️",
-        "param": "{\"triggers\":[],\"action\":{\"type\":\"S\",\"items\":[{\"id\":1,\"type\":\"CMD\",\"name\":\"\",\"entityId\":\"deviceIdOfRobot\",\"param\":\"{\\\"id\\\":1,\\\"method\\\":\\\"do_scenes_zones\\\",\\\"params\\\":{\\\"data\\\":[{\\\"tid\\\":\\\"1682935078416\\\",\\\"zones\\\":[{\\\"zid\\\":0,\\\"repeat\\\":1}],\\\"map_flag\\\":0,\\\"fan_power\\\":103,\\\"water_box_mode\\\":200,\\\"mop_mode\\\":300,\\\"mop_template_id\\\":300,\\\"repeat\\\":1,\\\"clean_order_mode\\\":0}],\\\"source\\\":101}}\",\"finishDpIds\":[130]},{\"id\":2,\"type\":\"CMD\",\"name\":\"Kitchen\",\"entityId\":\"deviceIdOfRobot\",\"param\":\"{\\\"id\\\":2,\\\"method\\\":\\\"do_scenes_segments\\\",\\\"params\\\":{\\\"data\\\":[{\\\"tid\\\":\\\"1682935111902\\\",\\\"segs\\\":[{\\\"sid\\\":23}],\\\"map_flag\\\":0,\\\"fan_power\\\":103,\\\"water_box_mode\\\":200,\\\"mop_mode\\\":300,\\\"mop_template_id\\\":300,\\\"repeat\\\":1,\\\"clean_order_mode\\\":0}],\\\"source\\\":101}}\",\"finishDpIds\":[130]}]},\"matchType\":\"NONE\"}",
+        "param": "{\"triggers\":[{\"name\":\"TIMER\",\"type\":\"TIMER\",\"entityId\":\"TIMER\",\"param\":\"{\\\"cron\\\": \\\"6 20 * * 0,1,2,3,4,5,6\\\", \\\"enabled\\\": true, \\\"repeated\\\": true, \\\"timeZoneId\\\": \\\"Europe/Warsaw\\\"}\"}],\"action\":{\"type\":\"S\",\"items\":[{\"id\":1,\"type\":\"CMD\",\"name\":\"\",\"entityId\":\"deviceIdOfRobot\",\"param\":\"{\\\"id\\\":1,\\\"method\\\":\\\"do_scenes_zones\\\",\\\"params\\\":{\\\"data\\\":[{\\\"tid\\\":\\\"1682935078416\\\",\\\"zones\\\":[{\\\"zid\\\":0,\\\"repeat\\\":1}],\\\"map_flag\\\":0,\\\"fan_power\\\":103,\\\"water_box_mode\\\":200,\\\"mop_mode\\\":300,\\\"mop_template_id\\\":300,\\\"repeat\\\":1,\\\"clean_order_mode\\\":0}],\\\"source\\\":101}}\",\"finishDpIds\":[130]},{\"id\":2,\"type\":\"CMD\",\"name\":\"Kitchen\",\"entityId\":\"deviceIdOfRobot\",\"param\":\"{\\\"id\\\":2,\\\"method\\\":\\\"do_scenes_segments\\\",\\\"params\\\":{\\\"data\\\":[{\\\"tid\\\":\\\"1682935111902\\\",\\\"segs\\\":[{\\\"sid\\\":23}],\\\"map_flag\\\":0,\\\"fan_power\\\":103,\\\"water_box_mode\\\":200,\\\"mop_mode\\\":300,\\\"mop_template_id\\\":300,\\\"repeat\\\":1,\\\"clean_order_mode\\\":0}],\\\"source\\\":101}}\",\"finishDpIds\":[130]}]},\"matchType\":\"NONE\"}",
         "enabled": true,
         "extra": null,
         "type": "WORKFLOW"