emgauwa/controller
2
0
Fork 0
Code Issues Pull requests Projects Releases1 Packages Wiki Activity

Improve handling of override_schedule

Browse source
This commit is contained in:
Tobias Reisinger 2024-05-28 21:17:25 +02:00
parent 8244a1d837
commit 2eb38ec11e
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
4 changed files with 19 additions and 39 deletions

25
src/ws/handlers.rs
View file

@ -1,12 +1,13 @@
use actix::Addr;
use sqlx::{Pool, Sqlite};
use sqlx::pool::PoolConnection;
use tokio_tungstenite::tungstenite;
use tokio_tungstenite::tungstenite::Message;
use emgauwa_common::db::{DbController, DbJunctionRelaySchedule, DbRelay, DbSchedule};
use emgauwa_common::errors::{DatabaseError, EmgauwaError};
use emgauwa_common::models::{Controller, Relay};
use emgauwa_common::types::{ControllerWsAction, ScheduleUid};
use sqlx::pool::PoolConnection;
use sqlx::{Pool, Sqlite};
use tokio_tungstenite::tungstenite;
use tokio_tungstenite::tungstenite::Message;
use crate::app_state::AppState;
use crate::utils;
@ -153,15 +154,13 @@ async fn handle_relays(
);
}
if let Some((override_schedule, weekday)) = relay.unwrap_override_schedule() {
utils::app_state_relay_override_schedule(
app_state,
relay.r.number,
override_schedule.clone(),
weekday,
)
.await?;
}
utils::app_state_relay_override_schedule(
app_state,
relay.r.number,
relay.override_schedule.clone(),
relay.override_schedule_weekday,
)
.await?;
DbJunctionRelaySchedule::set_schedules(conn, &db_relay, schedules.iter().collect()).await?;
}