diff --git a/.sqlx/query-c9437ff0c3014b269dcb21304fbad12237b9cb69ea6aa4686df6d5262065faa2.json b/.sqlx/query-2b5ac2227f48be1483f4097da6f890be8091daa97b0af548b6ebf60cdc03dfba.json similarity index 70% rename from .sqlx/query-c9437ff0c3014b269dcb21304fbad12237b9cb69ea6aa4686df6d5262065faa2.json rename to .sqlx/query-2b5ac2227f48be1483f4097da6f890be8091daa97b0af548b6ebf60cdc03dfba.json index 10fe1a3..5b01214 100644 Binary files a/.sqlx/query-c9437ff0c3014b269dcb21304fbad12237b9cb69ea6aa4686df6d5262065faa2.json and b/.sqlx/query-2b5ac2227f48be1483f4097da6f890be8091daa97b0af548b6ebf60cdc03dfba.json differ diff --git a/.sqlx/query-2551c285e3e223311cff8e32022d8b11e95d56b2f166326301a0b6722fc1fd44.json b/.sqlx/query-493ad91be9ce523e9d0f03f5caa9b3255a5426d54901f4f3aa96ad152b05ffd0.json similarity index 63% rename from .sqlx/query-2551c285e3e223311cff8e32022d8b11e95d56b2f166326301a0b6722fc1fd44.json rename to .sqlx/query-493ad91be9ce523e9d0f03f5caa9b3255a5426d54901f4f3aa96ad152b05ffd0.json index f6f2724..a480728 100644 Binary files a/.sqlx/query-2551c285e3e223311cff8e32022d8b11e95d56b2f166326301a0b6722fc1fd44.json and b/.sqlx/query-493ad91be9ce523e9d0f03f5caa9b3255a5426d54901f4f3aa96ad152b05ffd0.json differ diff --git a/.sqlx/query-e94ef5bc8b267d493375bb371dcfb7b09f6355ecbc8b6e1085d5f2f9a08cac3f.json b/.sqlx/query-4a99db9678cf8d1bdb082c4a13a1f5cdd699bfe7600389e37ca980b6fad12bb5.json similarity index 68% rename from .sqlx/query-e94ef5bc8b267d493375bb371dcfb7b09f6355ecbc8b6e1085d5f2f9a08cac3f.json rename to .sqlx/query-4a99db9678cf8d1bdb082c4a13a1f5cdd699bfe7600389e37ca980b6fad12bb5.json index 391ca72..8776c67 100644 Binary files a/.sqlx/query-e94ef5bc8b267d493375bb371dcfb7b09f6355ecbc8b6e1085d5f2f9a08cac3f.json and b/.sqlx/query-4a99db9678cf8d1bdb082c4a13a1f5cdd699bfe7600389e37ca980b6fad12bb5.json differ diff --git a/.sqlx/query-ee7da56331bece2efe21b55dbd5f420d3abb08358a1abe301dc7e08693fbef4d.json b/.sqlx/query-5056b625241d9cbe63d98e00ac39085677c09be8be903804120c2d52579afdbb.json similarity index 71% rename from .sqlx/query-ee7da56331bece2efe21b55dbd5f420d3abb08358a1abe301dc7e08693fbef4d.json rename to .sqlx/query-5056b625241d9cbe63d98e00ac39085677c09be8be903804120c2d52579afdbb.json index c4ec08d..fa990c6 100644 Binary files a/.sqlx/query-ee7da56331bece2efe21b55dbd5f420d3abb08358a1abe301dc7e08693fbef4d.json and b/.sqlx/query-5056b625241d9cbe63d98e00ac39085677c09be8be903804120c2d52579afdbb.json differ diff --git a/.sqlx/query-5865f27b97487b6dfd956a3d260b9bbb0e6c203b721d29cf9149f60bfdd93465.json b/.sqlx/query-5865f27b97487b6dfd956a3d260b9bbb0e6c203b721d29cf9149f60bfdd93465.json deleted file mode 100644 index 67ea7e8..0000000 Binary files a/.sqlx/query-5865f27b97487b6dfd956a3d260b9bbb0e6c203b721d29cf9149f60bfdd93465.json and /dev/null differ diff --git a/.sqlx/query-b41855e635ac409559fa63cba4c1285034c573b86e3193da3995606dee412153.json b/.sqlx/query-9224ad423f2c86f3d95f2b0b7d99a27f690020f89958dfc8dd6044a31afdb31d.json similarity index 66% rename from .sqlx/query-b41855e635ac409559fa63cba4c1285034c573b86e3193da3995606dee412153.json rename to .sqlx/query-9224ad423f2c86f3d95f2b0b7d99a27f690020f89958dfc8dd6044a31afdb31d.json index 94419bd..80fbca7 100644 Binary files a/.sqlx/query-b41855e635ac409559fa63cba4c1285034c573b86e3193da3995606dee412153.json and b/.sqlx/query-9224ad423f2c86f3d95f2b0b7d99a27f690020f89958dfc8dd6044a31afdb31d.json differ diff --git a/.sqlx/query-adbce2c94ac0b54d0826b28f99fe63322d3bb1579e52d0f053307e24bd039ef9.json b/.sqlx/query-adbce2c94ac0b54d0826b28f99fe63322d3bb1579e52d0f053307e24bd039ef9.json new file mode 100644 index 0000000..a91e2ae Binary files /dev/null and b/.sqlx/query-adbce2c94ac0b54d0826b28f99fe63322d3bb1579e52d0f053307e24bd039ef9.json differ diff --git a/.sqlx/query-4f5408e64f5e6a8dd923c3b147f993ce9e4cafc90204b06977481130ec06d111.json b/.sqlx/query-d57c388bf6c26fe6cadad35d0f254ca2ef93958f9975c585c6de3c437782995d.json similarity index 69% rename from .sqlx/query-4f5408e64f5e6a8dd923c3b147f993ce9e4cafc90204b06977481130ec06d111.json rename to .sqlx/query-d57c388bf6c26fe6cadad35d0f254ca2ef93958f9975c585c6de3c437782995d.json index 78e4867..00d044d 100644 Binary files a/.sqlx/query-4f5408e64f5e6a8dd923c3b147f993ce9e4cafc90204b06977481130ec06d111.json and b/.sqlx/query-d57c388bf6c26fe6cadad35d0f254ca2ef93958f9975c585c6de3c437782995d.json differ diff --git a/.sqlx/query-f85f0a96bb98d20e47677b0679d552812362c3141738b60bc63d673a7f552506.json b/.sqlx/query-f85f0a96bb98d20e47677b0679d552812362c3141738b60bc63d673a7f552506.json new file mode 100644 index 0000000..cc26013 Binary files /dev/null and b/.sqlx/query-f85f0a96bb98d20e47677b0679d552812362c3141738b60bc63d673a7f552506.json differ diff --git a/migrations/20240611000000_add_relays_view.down.sql b/migrations/20240611000000_add_relays_view.down.sql new file mode 100644 index 0000000..093f473 --- /dev/null +++ b/migrations/20240611000000_add_relays_view.down.sql @@ -0,0 +1 @@ +DROP VIEW v_relays; \ No newline at end of file diff --git a/migrations/20240611000000_add_relays_view.up.sql b/migrations/20240611000000_add_relays_view.up.sql new file mode 100644 index 0000000..b8fab88 --- /dev/null +++ b/migrations/20240611000000_add_relays_view.up.sql @@ -0,0 +1,8 @@ +CREATE VIEW v_relays +AS +SELECT + relays.*, + controllers.uid AS controller_uid +FROM + relays +INNER JOIN controllers ON controllers.id = relays.controller_id; diff --git a/src/db/controllers.rs b/src/db/controllers.rs index bf0a1f0..ade379e 100644 --- a/src/db/controllers.rs +++ b/src/db/controllers.rs @@ -158,7 +158,7 @@ impl DbController { ) -> Result, DatabaseError> { sqlx::query_as!( DbRelay, - "SELECT * FROM relays WHERE controller_id = ?", + "SELECT * FROM v_relays WHERE v_relays.controller_id = ?", self.id ) .fetch_all(conn.deref_mut()) diff --git a/src/db/junction_relay_schedule.rs b/src/db/junction_relay_schedule.rs index b8e0611..74dc98e 100644 --- a/src/db/junction_relay_schedule.rs +++ b/src/db/junction_relay_schedule.rs @@ -50,8 +50,8 @@ impl DbJunctionRelaySchedule { ) -> Result, DatabaseError> { sqlx::query_as!( DbRelay, - r#"SELECT relays.* FROM relays INNER JOIN junction_relay_schedule - ON junction_relay_schedule.relay_id = relays.id + r#"SELECT v_relays.* FROM v_relays INNER JOIN junction_relay_schedule + ON junction_relay_schedule.relay_id = v_relays.id WHERE junction_relay_schedule.schedule_id = ? ORDER BY junction_relay_schedule.weekday"#, schedule.id diff --git a/src/db/relays.rs b/src/db/relays.rs index 8fe39e6..ef62382 100644 --- a/src/db/relays.rs +++ b/src/db/relays.rs @@ -6,6 +6,7 @@ use sqlx::Sqlite; use crate::db::{DbController, DbJunctionTag, DbTag}; use crate::errors::DatabaseError; +use crate::types::EmgauwaUid; #[derive(Debug, Clone, Serialize, Deserialize)] pub struct DbRelay { @@ -13,13 +14,15 @@ pub struct DbRelay { pub id: i64, pub name: String, pub number: i64, + #[serde(rename = "controller_id")] + pub controller_uid: EmgauwaUid, #[serde(skip)] pub controller_id: i64, } impl DbRelay { pub async fn get_all(conn: &mut PoolConnection) -> Result, DatabaseError> { - sqlx::query_as!(DbRelay, "SELECT * FROM relays") + sqlx::query_as!(DbRelay, "SELECT * FROM v_relays") .fetch_all(conn.deref_mut()) .await .map_err(DatabaseError::from) @@ -29,7 +32,7 @@ impl DbRelay { conn: &mut PoolConnection, id: i64, ) -> Result, DatabaseError> { - sqlx::query_as!(DbRelay, "SELECT * FROM relays WHERE id = ?", id) + sqlx::query_as!(DbRelay, "SELECT * FROM v_relays WHERE v_relays.id = ?", id) .fetch_optional(conn.deref_mut()) .await .map_err(DatabaseError::from) @@ -42,7 +45,7 @@ impl DbRelay { ) -> Result, DatabaseError> { sqlx::query_as!( DbRelay, - "SELECT * FROM relays WHERE controller_id = ? AND number = ?", + "SELECT * FROM v_relays WHERE v_relays.controller_id = ? AND v_relays.number = ?", controller.id, number ) @@ -70,7 +73,7 @@ impl DbRelay { conn: &mut PoolConnection, tag: &DbTag, ) -> Result, DatabaseError> { - sqlx::query_as!(DbRelay, "SELECT relay.* FROM relays AS relay INNER JOIN junction_tag ON junction_tag.relay_id = relay.id WHERE junction_tag.tag_id = ?", tag.id) + sqlx::query_as!(DbRelay, "SELECT v_relays.* FROM v_relays INNER JOIN junction_tag ON junction_tag.relay_id = v_relays.id WHERE junction_tag.tag_id = ?", tag.id) .fetch_all(conn.deref_mut()) .await .map_err(DatabaseError::from) @@ -82,16 +85,25 @@ impl DbRelay { new_number: i64, new_controller: &DbController, ) -> Result { - sqlx::query_as!( - DbRelay, - "INSERT INTO relays (name, number, controller_id) VALUES (?, ?, ?) RETURNING *", + let result = sqlx::query!( + "INSERT INTO relays (name, number, controller_id) VALUES (?, ?, ?)", new_name, new_number, new_controller.id, ) - .fetch_optional(conn.deref_mut()) - .await? - .ok_or(DatabaseError::InsertGetError) + .execute(conn.deref_mut()) + .await?; + + let last_insert_id = result.last_insert_rowid(); + + sqlx::query_as!( + DbRelay, + "SELECT * FROM v_relays WHERE id = ?", + last_insert_id + ) + .fetch_one(conn.deref_mut()) + .await + .map_err(DatabaseError::from) } pub async fn delete(&self, conn: &mut PoolConnection) -> Result<(), DatabaseError> { diff --git a/src/models/controller.rs b/src/models/controller.rs index 6bb04e3..753749a 100644 --- a/src/models/controller.rs +++ b/src/models/controller.rs @@ -9,7 +9,7 @@ use sqlx::Sqlite; use crate::db::DbController; use crate::errors::{DatabaseError, EmgauwaError}; -use crate::models::{convert_db_list_cache, FromDbModel, Relay}; +use crate::models::{convert_db_list, FromDbModel, Relay}; use crate::types::{EmgauwaNow, RelayState, RelayStates}; #[derive(Serialize, Deserialize, Debug, Clone, MessageResponse)] @@ -28,7 +28,7 @@ impl FromDbModel for Controller { db_model: Self::DbModel, ) -> Result { let relays_db = block_on(db_model.get_relays(conn))?; - let cache = convert_db_list_cache(conn, relays_db, db_model.clone())?; + let cache = convert_db_list(conn, relays_db)?; Self::from_db_model_cache(conn, db_model, cache) } diff --git a/src/models/relay.rs b/src/models/relay.rs index b67c4d3..5cb97d1 100644 --- a/src/models/relay.rs +++ b/src/models/relay.rs @@ -6,18 +6,16 @@ use serde_derive::{Deserialize, Serialize}; use sqlx::pool::PoolConnection; use sqlx::Sqlite; -use crate::db::{DbController, DbJunctionRelaySchedule, DbRelay, DbSchedule}; +use crate::db::{DbJunctionRelaySchedule, DbRelay, DbSchedule}; use crate::errors::DatabaseError; use crate::models::FromDbModel; -use crate::types::{EmgauwaUid, RelayState}; +use crate::types::RelayState; use crate::utils; #[derive(Serialize, Deserialize, Debug, Clone)] pub struct Relay { #[serde(flatten)] pub r: DbRelay, - pub controller: DbController, - pub controller_id: EmgauwaUid, pub schedules: Vec, pub active_schedule: Option, pub override_schedule: Option, @@ -27,32 +25,27 @@ pub struct Relay { // for internal use only. #[serde(skip)] pub pulsing: Option, - #[serde( - skip, - default = "utils::default_weekday", - )] + #[serde(skip, default = "utils::default_weekday")] pub override_schedule_weekday: Weekday, } impl FromDbModel for Relay { type DbModel = DbRelay; - type DbModelCache = DbController; + type DbModelCache = (); fn from_db_model( conn: &mut PoolConnection, db_model: Self::DbModel, ) -> Result { - let cache = block_on(db_model.get_controller(conn))?; - Self::from_db_model_cache(conn, db_model, cache) + Self::from_db_model_cache(conn, db_model, ()) } fn from_db_model_cache( conn: &mut PoolConnection, db_model: Self::DbModel, - cache: Self::DbModelCache, + _cache: Self::DbModelCache, ) -> Result { let tags = block_on(db_model.get_tags(conn))?; - let controller_id = cache.uid.clone(); let schedules = block_on(DbJunctionRelaySchedule::get_schedules(conn, &db_model))?; @@ -60,8 +53,6 @@ impl FromDbModel for Relay { Ok(Relay { r: db_model, - controller: cache, - controller_id, schedules, active_schedule: None, override_schedule: None, @@ -136,5 +127,4 @@ impl Relay { self.apply_state(&stated_relay.into()); } } - }