Moved DatasetSummary

kamu-data · Dec 25, 2024 · 5fb406d · 5fb406d
1 parent b2006a7
commit 5fb406d
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/app/cli/src/commands/list_command.rs b/src/app/cli/src/commands/list_command.rs
@@ -15,7 +15,7 @@ use chrono_humanize::HumanTime;
 use futures::TryStreamExt;
 use internal_error::ResultIntoInternal;
 use kamu::domain::*;
-use odf_storage::{BlockRef, MetadataChainExt};
+use odf_storage::{BlockRef, DatasetSummary, MetadataChainExt};
 use opendatafabric::*;
 
 use super::{CLIError, Command};

diff --git a/src/domain/core/src/entities/mod.rs b/src/domain/core/src/entities/mod.rs
@@ -8,15 +8,13 @@
 // by the Apache License, Version 2.0.
 
 mod dataset;
-mod dataset_summary;
 pub mod engine;
 mod resolved_dataset;
 mod resolved_datasets_map;
 mod writer_metadata_state;
 mod writer_source_visitor;
 
 pub use dataset::*;
-pub use dataset_summary::*;
 pub use resolved_dataset::*;
 pub use resolved_datasets_map::*;
 pub use writer_metadata_state::*;

diff --git a/src/domain/odf/odf-storage/Cargo.toml b/src/domain/odf/odf-storage/Cargo.toml
@@ -32,6 +32,8 @@ chrono = { version = "0.4", features = ["serde"] }
 futures = { version = "0.3", default-features = false }
 http = { version = "1" }
 pin-project = { version = "1", default-features = false }
+serde = { version = "1", default-features = false, features = ["derive"] }
+serde_with = { version = "3", default-features = false }
 thiserror = { version = "2", default-features = false, features = ["std"] }
 url = { version = "2", default-features = false }
 

diff --git a/...main/core/src/entities/dataset_summary.rs → ...f-storage/src/entities/dataset_summary.rs b/...main/core/src/entities/dataset_summary.rs → ...f-storage/src/entities/dataset_summary.rs
diff --git a/src/domain/odf/odf-storage/src/entities/mod.rs b/src/domain/odf/odf-storage/src/entities/mod.rs
@@ -8,9 +8,11 @@
 // by the Apache License, Version 2.0.
 
 mod block_ref;
+mod dataset_summary;
 mod metadata_chain;
 mod metadata_stream;
 
 pub use block_ref::*;
+pub use dataset_summary::*;
 pub use metadata_chain::*;
 pub use metadata_stream::*;
diff --git a/src/infra/core/src/repos/dataset_repository_local_fs.rs b/src/infra/core/src/repos/dataset_repository_local_fs.rs
@@ -15,7 +15,7 @@ use dill::*;
 use internal_error::{ErrorIntoInternal, InternalError, ResultIntoInternal};
 use kamu_accounts::{CurrentAccountSubject, DEFAULT_ACCOUNT_NAME_STR};
 use kamu_core::*;
-use odf_storage::{AppendError, AppendOpts, BlockRef, GetNamedError, GetRefError};
+use odf_storage::{AppendError, AppendOpts, BlockRef, DatasetSummary, GetNamedError, GetRefError};
 use odf_storage_impl::{
     MetadataBlockRepositoryCachingInMem,
     MetadataBlockRepositoryImpl,

diff --git a/src/infra/core/src/services/pull_request_planner_impl.rs b/src/infra/core/src/services/pull_request_planner_impl.rs
@@ -15,7 +15,7 @@ use dill::*;
 use internal_error::{InternalError, ResultIntoInternal};
 use kamu_accounts::CurrentAccountSubject;
 use kamu_core::*;
-use odf_storage::BlockRef;
+use odf_storage::{BlockRef, DatasetSummary};
 use opendatafabric as odf;
 use url::Url;
 

diff --git a/src/infra/core/tests/tests/repos/test_dataset_impl.rs b/src/infra/core/tests/tests/repos/test_dataset_impl.rs
@@ -11,7 +11,7 @@ use std::assert_matches::assert_matches;
 
 use kamu::domain::*;
 use kamu::*;
-use odf_storage::AppendOpts;
+use odf_storage::{AppendOpts, DatasetSummary};
 use odf_storage_impl::testing::MetadataFactory;
 use opendatafabric::*;
 

diff --git a/src/infra/core/tests/tests/test_reset_services_impl.rs b/src/infra/core/tests/tests/test_reset_services_impl.rs
@@ -13,7 +13,7 @@ use std::sync::Arc;
 use kamu::domain::*;
 use kamu::testing::BaseRepoHarness;
 use kamu::*;
-use odf_storage::{BlockRef, SetChainRefError};
+use odf_storage::{BlockRef, DatasetSummary, SetChainRefError};
 use odf_storage_impl::testing::MetadataFactory;
 use opendatafabric::*;
 

diff --git a/src/infra/core/tests/tests/test_serde_yaml.rs b/src/infra/core/tests/tests/test_serde_yaml.rs
@@ -9,7 +9,7 @@
 
 use chrono::prelude::*;
 use indoc::indoc;
-use kamu::domain::DatasetSummary;
+use odf_storage::DatasetSummary;
 use opendatafabric::serde::yaml::Manifest;
 use opendatafabric::*;