From 93b27c72050a3ea947f874b8b7bb757893de64c5 Mon Sep 17 00:00:00 2001 From: rzuasti Date: Wed, 18 Feb 2026 09:35:05 -0500 Subject: [PATCH] About to change clap usage to builder (instead of derive) --- backend/src/db/notifications.rs | 16 ++++++++++++++-- backend/src/settings.rs | 11 ++++++++--- backend/src/tests_common.rs | 7 ++++++- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/backend/src/db/notifications.rs b/backend/src/db/notifications.rs index a108551..e8003b1 100644 --- a/backend/src/db/notifications.rs +++ b/backend/src/db/notifications.rs @@ -1,7 +1,19 @@ -use crate::model; +use chrono::Local; + +use crate::model::{self, notifications::Notification}; pub fn list() -> Vec { - unimplemented!("Not ready yet"); + let mut result = Vec::new(); + result.push(Notification { + id: 1, + created_on: Local::now().to_utc(), + is_new: true, + notification_type: model::notifications::NotificationType::NewDeviceFound, + title: "title".to_string(), + body: "body".to_string(), + }); + + result } #[cfg(test)] diff --git a/backend/src/settings.rs b/backend/src/settings.rs index 17983aa..f81313d 100644 --- a/backend/src/settings.rs +++ b/backend/src/settings.rs @@ -2,7 +2,7 @@ use clap::Parser; use config::{Config, ConfigError, File}; use duration_string::DurationString; use lazy_static::lazy_static; -use log::{error, info}; +use log::{debug, error, info}; use serde::Deserialize; // ----------------------------------------------------------- @@ -67,9 +67,14 @@ const DEFAULT_CONFIG_FILE_PATH: &str = "./oott.toml"; impl Settings { pub fn new() -> Result { - let args = Args::parse(); + debug!("Starting configuration"); - let config_path = args.config.unwrap_or(DEFAULT_CONFIG_FILE_PATH.to_string()); + let args_result = Args::try_parse(); + + let config_path = match args_result { + Ok(value) => value.config.unwrap_or(DEFAULT_CONFIG_FILE_PATH.to_string()), + Err(_) => DEFAULT_CONFIG_FILE_PATH.to_string(), + }; info!("Reading configuration from {}", config_path); diff --git a/backend/src/tests_common.rs b/backend/src/tests_common.rs index b4f02e5..3e84607 100644 --- a/backend/src/tests_common.rs +++ b/backend/src/tests_common.rs @@ -1,5 +1,6 @@ use crate::db; use include_dir::{Dir, include_dir}; +use log::{debug, info}; use rusqlite_migration::Migrations; use std::sync::LazyLock; use tokio::sync::Mutex; @@ -13,13 +14,17 @@ static TEST_MIGRATIONS: LazyLock> = static INITIALISED: Mutex = Mutex::const_new(false); pub async fn setup_database() { + debug!("About to setup database for testing."); let mut initialised = INITIALISED.lock().await; if *initialised { + debug!("Database was already initialised, nothing to do."); return; } db::init_db().await.unwrap(); + info!("Initializing database for testing."); let mut conn = db::get_db_connection(); + debug!("Running migrations for testing."); TEST_MIGRATIONS.to_latest(&mut conn).unwrap(); - + debug!("Testing migrations run on database."); *initialised = true; }