Merge pull request #26 from piotrpdev/OKO-104-User-Camera-Settings

feat: OKO-104 User Camera Settings

Author: piotrpdev

.gitignore

@@ -33,3 +33,4 @@ static/
 backend/rust-toolchain.toml
 
 .embuild
+backend/.env

backend/.sqlx/query-b9ef03d8a1a2475dfb3af53e75d603a8466480240a7deed6cd375197c0084b22.json

@@ -5,6 +5,7 @@ pub use camera_permission::CameraPermission;
 pub use camera_permission_user_view::CameraPermissionUserView;
 pub use camera_permission_view::CameraPermissionView;
 pub use camera_setting::CameraSetting;
+pub use camera_setting::CameraSettingNoMeta;
 pub use user::User;
 pub use video::Video;
 pub use video_camera_view::VideoCameraView;

backend/src/db.rs

@@ -15,6 +15,15 @@ pub struct CameraSetting {
     pub modified_by: Option<i64>,
 }
 
+// TODO: Add from trait for CameraSetting -> CameraSettingNoMeta
+// TODO: Use single shared definition for both camera and backend
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CameraSettingNoMeta {
+    pub flashlight_enabled: bool,
+    pub resolution: String,
+    pub framerate: i64,
+}
+
 pub struct Default {
     pub setting_id: i64,
     pub flashlight_enabled: bool,
@@ -111,6 +120,22 @@ impl Model for CameraSetting {
     }
 }
 
+impl CameraSetting {
+    pub async fn get_for_camera(pool: &SqlitePool, camera_id: i64) -> Result<Self> {
+        sqlx::query_as!(
+            CameraSetting,
+            r#"
+            SELECT *
+            FROM camera_settings
+            WHERE camera_id = ?
+            "#,
+            camera_id
+        )
+        .fetch_one(pool)
+        .await
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -230,4 +255,19 @@ mod tests {
 
         Ok(())
     }
+
+    #[sqlx::test(fixtures(
+        path = "../../fixtures",
+        scripts("users", "cameras", "camera_settings")
+    ))]
+    async fn get_for_camera(pool: SqlitePool) -> Result<()> {
+        let camera_id = 1;
+
+        let returned_settings = CameraSetting::get_for_camera(&pool, camera_id).await?;
+
+        assert_eq!(returned_settings.setting_id, 1);
+        assert_eq!(returned_settings.camera_id, camera_id);
+
+        Ok(())
+    }
 }

backend/src/db/camera_setting.rs

@@ -1,14 +1,15 @@
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 
-pub use crate::web::{App, ImageContainer};
+pub use crate::web::{ApiChannelMessage, App, ImageContainer};
 
 mod db;
 mod users;
 mod web;
 
 pub use {
     db::Camera, db::CameraPermission, db::CameraPermissionUserView, db::CameraPermissionView,
-    db::CameraSetting, db::Model, db::User, db::Video, db::VideoCameraView,
+    db::CameraSetting, db::CameraSettingNoMeta, db::Model, db::User, db::Video,
+    db::VideoCameraView,
 };
 
 pub async fn run() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {

backend/src/lib.rs

@@ -15,7 +15,7 @@ pub struct Credentials {
     pub password: String,
 }
 
-// TODO: Make db private again and pass db state to Router as layer
+// TODO: Make db private again and pass db state to Router as layer/state
 #[derive(Debug, Clone)]
 pub struct Backend {
     pub db: SqlitePool,

backend/src/users.rs

@@ -1,5 +1,25 @@
 pub use app::App;
 pub use app::ImageContainer;
+use serde::Deserialize;
+use serde::Serialize;
+
+use crate::CameraSettingNoMeta;
+
+// TODO: Use single shared definition for both camera and backend
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub enum CameraMessage {
+    SettingChanged(CameraSettingNoMeta),
+    Restart,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub enum ApiChannelMessage {
+    CameraRelated {
+        camera_id: i64,
+        message: CameraMessage,
+    },
+    Initial,
+}
 
 mod app;
 mod auth;