Move request models

emgauwa-lib/src/types/mod.rs

@@ -1,8 +1,10 @@
 mod controller_uid;
+mod request;
 mod schedule_uid;
 
 use actix::Message;
 pub use controller_uid::ControllerUid;
+pub use request::*;
 pub use schedule_uid::ScheduleUid;
 use serde_derive::{Deserialize, Serialize};
 

emgauwa-lib/src/types/request.rs

@@ -0,0 +1,29 @@
+use serde_derive::{Deserialize, Serialize};
+
+use crate::db::DbPeriods;
+use crate::types::ScheduleUid;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct RequestSchedule {
+	pub name: String,
+	pub periods: DbPeriods,
+	pub tags: Vec<String>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct RequestRelay {
+	pub name: String,
+	pub active_schedule: Option<RequestScheduleId>,
+	pub schedules: Vec<RequestScheduleId>,
+	pub tags: Vec<String>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct RequestScheduleId {
+	pub id: ScheduleUid,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct RequestController {
+	pub name: String,
+}

emgauwa-lib/src/utils.rs

@@ -27,15 +27,13 @@ where
 
 pub fn init_logging(level: &str) -> Result<(), EmgauwaError> {
 	let log_level: LevelFilter = LevelFilter::from_str(level)
-		.map_err(|_| EmgauwaError::Other(format!("Invalid log level: {}", level.to_string())))?;
+		.map_err(|_| EmgauwaError::Other(format!("Invalid log level: {}", level)))?;
 	log::trace!("Log level set to {:?}", log_level);
 
 	SimpleLogger::new()
 		.with_level(log_level)
 		.init()
-		.map_err(|err| {
-			EmgauwaError::Other(format!("Failed to initialize logger: {}", err.to_string()))
-		})?;
+		.map_err(|err| EmgauwaError::Other(format!("Failed to initialize logger: {}", err)))?;
 
 	Ok(())
 }