add refactoring

Author: maltsev-dev

backend/src/db/db.rs

@@ -1,71 +1,3 @@
-// // src/db/db.rs
-// use anyhow::Result;
-// use dotenv::dotenv;
-// use sqlx::{sqlite::SqlitePool, Pool, Sqlite};
-// use std::env;
-
-// #[derive(Clone)]
-// pub struct Databases {
-//     pub mcu_pool: Pool<Sqlite>,
-//     pub devices_pool: Pool<Sqlite>,
-// }
-
-// pub async fn init_dbs() -> Databases {
-//     dotenv().ok();
-
-//     let database_url = env::var("DATABASE_URL")
-//         .expect("DATABASE_URL must be set in .env (e.g. sqlite://./db.sqlite)");
-
-//     let pool = SqlitePool::connect(&database_url)
-//         .await
-//         .expect("Failed to create database pool.");
-
-//     // Применяем миграции (папка ./migrations)
-//     sqlx::migrate!("./migrations")
-//         .run(&pool)
-//         .await
-//         .expect("Failed to run database migrations.");
-
-//     Databases {
-//         mcu_pool: pool.clone(),
-//         devices_pool: pool,
-//     }
-// }
-
-// /// Вставка предсказания в БД (создаёт устройство, если ещё не существует).
-// /// person / not_person — вероятности (0.0..1.0).
-// pub async fn insert_prediction(
-//     pool: &Pool<Sqlite>,
-//     device_id: &str,
-//     person: f64,
-//     not_person: f64,
-// ) -> Result<()> {
-//     // Ensure device exists (INSERT OR IGNORE)
-//     sqlx::query(
-//         r#"
-//         INSERT OR IGNORE INTO devices(device_id, created_at) VALUES (?1, CURRENT_TIMESTAMP)
-//         "#,
-//     )
-//     .bind(device_id)
-//     .execute(pool)
-//     .await?;
-
-//     // insert into mcu_data; timestamp uses CURRENT_TIMESTAMP
-//     sqlx::query(
-//         r#"
-//         INSERT INTO mcu_data(device_id, person, not_person, timestamp)
-//         VALUES (?1, ?2, ?3, CURRENT_TIMESTAMP)
-//         "#,
-//     )
-//     .bind(device_id)
-//     .bind(person)
-//     .bind(not_person)
-//     .execute(pool)
-//     .await?;
-
-//     Ok(())
-// }
-
 use anyhow::Result;
 use dotenv::dotenv;
 use sqlx::{postgres::PgPoolOptions, Pool, Postgres};

backend/src/main.rs

@@ -5,7 +5,6 @@ use actix_web::{middleware::Logger, web, App, HttpResponse, HttpServer};
 use dotenv::dotenv;
 use env_logger::Env;
 use std::env;
-use tokio::task;
 
 mod db;
 mod handlers;
@@ -37,7 +36,7 @@ async fn main() -> std::io::Result<()> {
     });
     let frontend_index = format!("{}/index.html", frontend_dist);
 
-    // ✅ подключаемся к PostgreSQL
+    // подключаемся к PostgreSQL
     let dbs: Databases = init_dbs().await;
 
     // MQTT listener
@@ -70,7 +69,12 @@ async fn main() -> std::io::Result<()> {
             .wrap(cors)
             .app_data(Data::new(dbs.clone()))
             // Auth routes
-            .service(web::scope("/api/auth").service(handlers::auth::login).service(handlers::auth::me).service(handlers::auth::update_profile))
+            .service(
+                web::scope("/api/auth")
+                    .service(handlers::auth::login)
+                    .service(handlers::auth::me)
+                    .service(handlers::auth::update_profile),
+            )
             // Predictions routes
             .service(
                 web::scope("/api/predictions")

backend/src/routes/server_routes.rs

@@ -2,9 +2,5 @@ use crate::handlers;
 use actix_web::web;
 
 pub fn init_predictions(cfg: &mut web::ServiceConfig) {
-    cfg.service(handlers::get_data::get_predictions) // GET /api/predictions
-        .service(handlers::get_data_by_device::get_prediction_by_device) // GET /api/predictions/device/{device_id}
-        .service(handlers::add_data_by_id::add_prediction);
-        // .service(handlers::delete_data_by_id::delete_prediction_by_id)
-        // .service(handlers::update_data_by_id::update_prediction_by_id);
+    cfg.service(handlers::get_data::get_predictions); // GET /api/predictions
 }

backend/src/services/mqtt_listener.rs

@@ -1,4 +1,4 @@
-use chrono::{Datelike, NaiveDate, NaiveDateTime, NaiveTime, Utc};
+use chrono::{Datelike, NaiveDate, Utc};
 use log::{error, info, warn};
 use regex::Regex;
 use rumqttc::{AsyncClient, Event, Incoming, MqttOptions, QoS};