refactor commands

Signed-off-by: simonsan <[email protected]>

Cargo.toml

@@ -116,7 +116,6 @@ pace_cli = { workspace = true }
 pace_core = { workspace = true, features = ["cli"] }
 pace_error = { workspace = true }
 pace_service = { workspace = true }
-pace_storage = { workspace = true }
 pace_time = { workspace = true, features = ["cli", "db"] }
 serde = { workspace = true }
 serde_derive = { workspace = true }
@@ -136,6 +135,7 @@ assert_cmd = { workspace = true }
 insta = { workspace = true, features = ["toml"] }
 insta-cmd = { workspace = true }
 once_cell = { workspace = true }
+pace_storage = { workspace = true }
 predicates = { workspace = true }
 rstest = { workspace = true }
 similar-asserts = { workspace = true }

crates/service/Cargo.toml

@@ -17,6 +17,7 @@ description = "pace-service - service support library for pace"
 getset = { workspace = true }
 pace_core = { workspace = true, features = ["db"] }
 pace_error = { workspace = true }
+pace_storage = { workspace = true }
 pace_time = { workspace = true, features = ["rusqlite"] }
 tracing = { workspace = true }
 typed-builder = { workspace = true }

crates/service/src/lib.rs

@@ -5,3 +5,50 @@
 pub mod activity_store;
 
 pub mod activity_tracker;
+
+use std::sync::Arc;
+
+use pace_core::prelude::{ActivityLogStorageKind, ActivityStorage, DatabaseEngineKind, PaceConfig};
+use pace_error::{DatabaseStorageErrorKind, PaceResult};
+use tracing::debug;
+
+use pace_storage::storage::{
+    file::TomlActivityStorage, in_memory::InMemoryActivityStorage, sqlite::SqliteActivityStorage,
+};
+
+/// Get the storage backend from the configuration.
+///
+/// # Arguments
+///
+/// * `config` - The application configuration.
+///
+/// # Errors
+///
+/// This function should return an error if the storage backend cannot be created or is not supported.
+///
+/// # Returns
+///
+/// The storage backend.
+pub fn get_storage_from_config(config: &PaceConfig) -> PaceResult<Arc<dyn ActivityStorage>> {
+    let storage: Arc<dyn ActivityStorage> = match config.storage().storage() {
+        ActivityLogStorageKind::File { location } => Arc::new(TomlActivityStorage::new(location)?),
+        ActivityLogStorageKind::Database { kind, url } => match kind {
+            DatabaseEngineKind::Sqlite => {
+                debug!("Connecting to database: {}", url);
+
+                Arc::new(SqliteActivityStorage::new(url.clone())?)
+            }
+            engine => {
+                return Err(
+                    DatabaseStorageErrorKind::UnsupportedDatabaseEngine(engine.to_string()).into(),
+                )
+            }
+        },
+        ActivityLogStorageKind::InMemory => Arc::new(InMemoryActivityStorage::new()),
+        _ => return Err(DatabaseStorageErrorKind::StorageNotImplemented.into()),
+    };
+
+    debug!("Using storage backend: {:?}", storage);
+
+    Ok(storage)
+}

crates/storage/src/lib.rs

@@ -3,50 +3,3 @@ pub mod entities;
 pub mod migration;
 pub mod query;
 pub mod storage;
-
-use std::sync::Arc;
-
-use pace_core::prelude::{ActivityLogStorageKind, ActivityStorage, DatabaseEngineKind, PaceConfig};
-use pace_error::{DatabaseStorageErrorKind, PaceResult};
-use tracing::debug;
-
-use crate::storage::{
-    file::TomlActivityStorage, in_memory::InMemoryActivityStorage, sqlite::SqliteActivityStorage,
-};
-
-/// Get the storage backend from the configuration.
-///
-/// # Arguments
-///
-/// * `config` - The application configuration.
-///
-/// # Errors
-///
-/// This function should return an error if the storage backend cannot be created or is not supported.
-///
-/// # Returns
-///
-/// The storage backend.
-pub fn get_storage_from_config(config: &PaceConfig) -> PaceResult<Arc<dyn ActivityStorage>> {
-    let storage: Arc<dyn ActivityStorage> = match config.storage().storage() {
-        ActivityLogStorageKind::File { location } => Arc::new(TomlActivityStorage::new(location)?),
-        ActivityLogStorageKind::Database { kind, url } => match kind {
-            DatabaseEngineKind::Sqlite => {
-                debug!("Connecting to database: {}", url);
-
-                Arc::new(SqliteActivityStorage::new(url.clone())?)
-            }
-            engine => {
-                return Err(
-                    DatabaseStorageErrorKind::UnsupportedDatabaseEngine(engine.to_string()).into(),
-                )
-            }
-        },
-        ActivityLogStorageKind::InMemory => Arc::new(InMemoryActivityStorage::new()),
-        _ => return Err(DatabaseStorageErrorKind::StorageNotImplemented.into()),
-    };
-
-    debug!("Using storage backend: {:?}", storage);
-
-    Ok(storage)
-}

src/commands/adjust.rs

@@ -3,7 +3,7 @@
 use abscissa_core::{status_err, Application, Command, Runnable, Shutdown};
 use clap::Parser;
 use pace_cli::commands::adjust::AdjustCommandOptions;
-use pace_storage::get_storage_from_config;
+use pace_service::get_storage_from_config;
 
 use crate::prelude::PACE_APP;
 

src/commands/begin.rs

@@ -3,7 +3,7 @@
 use abscissa_core::{status_err, Application, Command, Runnable, Shutdown};
 use clap::Parser;
 use pace_cli::commands::begin::BeginCommandOptions;
-use pace_storage::get_storage_from_config;
+use pace_service::get_storage_from_config;
 
 use crate::prelude::PACE_APP;
 

src/commands/end.rs

@@ -3,7 +3,7 @@
 use abscissa_core::{status_err, Application, Command, Runnable, Shutdown};
 use clap::Parser;
 use pace_cli::commands::end::EndCommandOptions;
-use pace_storage::get_storage_from_config;
+use pace_service::get_storage_from_config;
 
 use crate::prelude::PACE_APP;
 

src/commands/hold.rs

@@ -4,7 +4,7 @@ use abscissa_core::{status_err, Application, Command, Runnable, Shutdown};
 
 use clap::Parser;
 use pace_cli::commands::hold::HoldCommandOptions;
-use pace_storage::get_storage_from_config;
+use pace_service::get_storage_from_config;
 
 use crate::prelude::PACE_APP;
 

src/commands/now.rs

@@ -3,7 +3,7 @@
 use abscissa_core::{status_err, Application, Command, Runnable, Shutdown};
 use clap::Parser;
 use pace_cli::commands::now::NowCommandOptions;
-use pace_storage::get_storage_from_config;
+use pace_service::get_storage_from_config;
 
 use crate::prelude::PACE_APP;
 

src/commands/reflect.rs

@@ -7,7 +7,7 @@ use abscissa_core::{status_err, Application, Command, Runnable, Shutdown};
 use clap::Parser;
 
 use pace_cli::commands::reflect::ReflectCommandOptions;
-use pace_storage::get_storage_from_config;
+use pace_service::get_storage_from_config;
 
 use crate::prelude::PACE_APP;
 

src/commands/resume.rs

@@ -14,8 +14,7 @@ use pace_core::{
     prelude::{ActivityQuerying, ActivityReadOps, ActivityStateManagement, SyncStorage},
 };
 use pace_error::UserMessage;
-use pace_service::activity_store::ActivityStore;
-use pace_storage::get_storage_from_config;
+use pace_service::{activity_store::ActivityStore, get_storage_from_config};
 use pace_time::{date_time::PaceDateTime, time_zone::PaceTimeZoneKind, Validate};
 
 use crate::prelude::PACE_APP;