v0.9.6

src/engine/tests.rs

@@ -17,7 +17,7 @@ mod tests {
         let item = Schedule {
             id: "1".into(), zone_id: "z".into(), name: "night".into(), enabled: true,
             weekdays: vec![1], start_time: "22:00".into(), end_time: "06:00".into(), preset: "custom".into(), setpoint: 20.0,
-            created_at: Utc::now(), updated_at: Utc::now(),
+            created_at: Utc::now(), updated_at: Utc::now(), flow_id: None, flow_node_id: None,
         };
         assert!(schedule_active(&item, now));
     }
@@ -26,7 +26,7 @@ mod tests {
         Schedule {
             id: id.into(), zone_id: "z".into(), name: id.into(), enabled: true,
             weekdays, start_time: start.into(), end_time: end.into(), preset: "comfort".into(), setpoint: 21.0,
-            created_at: Utc::now(), updated_at: Utc::now(),
+            created_at: Utc::now(), updated_at: Utc::now(), flow_id: None, flow_node_id: None,
         }
     }
 
@@ -94,7 +94,7 @@ mod tests {
             trigger_device_id: None, threshold: None, at_time: Some("10:15".into()),
             action_device_id: "d".into(), action_group_id: None, action_preset: None,
             action: DeviceCommand { power: Some(true), ..Default::default() }, cooldown_seconds: 30,
-            last_fired_at: None, created_at: Utc::now(), updated_at: Utc::now(),
+            last_fired_at: None, action_zone_id: None, action_zone_preset: None, flow_conditions: vec![], flow_id: None, flow_node_id: None, created_at: Utc::now(), updated_at: Utc::now(),
         };
         assert!(time_automation_due(&item, now.clone()));
         item.last_fired_at = Some((now.clone() - chrono::Duration::seconds(35)).with_timezone(&Utc));
@@ -173,6 +173,9 @@ mod tests {
         assert!(!automation_action_conflicts_with_thermostat(&DeviceCommand { target_temperature: Some(22.0), ..Default::default() }));
         assert!(automation_action_conflicts_with_thermostat(&DeviceCommand { fan_speed: Some(3), ..Default::default() }));
         assert!(automation_action_conflicts_with_thermostat(&DeviceCommand { quiet: Some(true), ..Default::default() }));
+        assert!(automation_action_conflicts_with_thermostat(&DeviceCommand { mode: Some("fan".into()), ..Default::default() }));
+        assert!(automation_action_conflicts_with_thermostat(&DeviceCommand { mode: Some("dry".into()), ..Default::default() }));
+        assert!(!automation_action_conflicts_with_thermostat(&DeviceCommand { mode: Some("heat".into()), ..Default::default() }));
         assert!(!automation_action_conflicts_with_thermostat(&DeviceCommand { light: Some(false), turbo: Some(true), ..Default::default() }));
     }
 
@@ -195,6 +198,14 @@ mod tests {
         ));
     }
 
+    #[test]
+    fn active_temporary_thermostat_blocks_direct_automation() {
+        let now = Utc::now();
+        let mut zone = test_zone("device");
+        zone.temporary_quick_thermostat = Some(temporary_session(now));
+        assert!(device_blocked_by_temporary_thermostat(&zone.device_id, std::slice::from_ref(&zone)));
+    }
+
     #[test]
     fn local_thermostat_resume_clears_only_local_quick_control_state() {
         let mut zone = test_zone("device");