DatasetOwnershipService: move to kamu-datasets scope

kamu-data · Dec 20, 2024 · 2f8ab56 · 2f8ab56
1 parent a9f77a8
commit 2f8ab56
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/adapter/graphql/src/mutations/dataset_mut/dataset_mut_utils.rs b/src/adapter/graphql/src/mutations/dataset_mut/dataset_mut_utils.rs
@@ -7,7 +7,7 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0.
 
-use kamu_core::DatasetOwnershipService;
+use kamu_datasets::DatasetOwnershipService;
 use opendatafabric as odf;
 
 use crate::prelude::*;

diff --git a/src/adapter/graphql/src/mutations/flows_mut/account_flow_configs_mut.rs b/src/adapter/graphql/src/mutations/flows_mut/account_flow_configs_mut.rs
@@ -10,7 +10,7 @@
 use chrono::Utc;
 use fs::FlowConfigurationService;
 use kamu_accounts::Account;
-use kamu_core::DatasetOwnershipService;
+use kamu_datasets::DatasetOwnershipService;
 use kamu_flow_system as fs;
 use opendatafabric::DatasetID;
 

diff --git a/src/adapter/graphql/src/queries/accounts/account_flow_configs.rs b/src/adapter/graphql/src/queries/accounts/account_flow_configs.rs
@@ -9,7 +9,7 @@
 
 use futures::StreamExt;
 use kamu_accounts::Account as AccountEntity;
-use kamu_core::DatasetOwnershipService;
+use kamu_datasets::DatasetOwnershipService;
 use kamu_flow_system::FlowConfigurationService;
 
 use crate::prelude::*;

diff --git a/src/domain/core/src/services/mod.rs b/src/domain/core/src/services/mod.rs
@@ -23,7 +23,6 @@ pub use transform::*;
 pub use watermark::*;
 
 pub mod dataset_changes_service;
-pub mod dataset_ownership_service;
 pub mod dataset_registry;
 pub mod dependency_graph_service;
 pub mod engine_provisioner;
@@ -43,7 +42,6 @@ pub mod sync_service;
 pub mod verification_service;
 
 pub use dataset_changes_service::*;
-pub use dataset_ownership_service::*;
 pub use dataset_registry::*;
 pub use dependency_graph_service::*;
 pub use engine_provisioner::*;

diff --git a/...src/services/dataset_ownership_service.rs → ...src/services/dataset_ownership_service.rs b/...src/services/dataset_ownership_service.rs → ...src/services/dataset_ownership_service.rs
@@ -12,7 +12,6 @@ use opendatafabric as odf;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-// TODO: Private Datasets: replace with DatasetEntry-related service
 #[async_trait::async_trait]
 pub trait DatasetOwnershipService: Sync + Send {
     async fn get_dataset_owner(

diff --git a/src/domain/datasets/domain/src/services/mod.rs b/src/domain/datasets/domain/src/services/mod.rs
@@ -10,7 +10,9 @@
 mod dataset_entry_service;
 mod dataset_env_var_service;
 mod dataset_key_value_service;
+mod dataset_ownership_service;
 
 pub use dataset_entry_service::*;
 pub use dataset_env_var_service::*;
 pub use dataset_key_value_service::*;
+pub use dataset_ownership_service::*;
diff --git a/src/domain/datasets/services/src/dataset_entry_service_impl.rs b/src/domain/datasets/services/src/dataset_entry_service_impl.rs
@@ -22,7 +22,6 @@ use kamu_core::{
     DatasetLifecycleMessageDeleted,
     DatasetLifecycleMessageRenamed,
     DatasetNotFoundError,
-    DatasetOwnershipService,
     DatasetRegistry,
     DatasetRepository,
     GetDatasetError,

diff --git a/src/domain/flow-system/services/Cargo.toml b/src/domain/flow-system/services/Cargo.toml
@@ -26,11 +26,12 @@ database-common = { workspace = true }
 database-common-macros = { workspace = true }
 init-on-startup = { workspace = true }
 internal-error = { workspace = true }
-messaging-outbox = { workspace = true }
 kamu-accounts = { workspace = true }
 kamu-core = { workspace = true }
+kamu-datasets = { workspace = true }
 kamu-flow-system = { workspace = true }
 kamu-task-system = { workspace = true }
+messaging-outbox = { workspace = true }
 observability = { workspace = true, default-features = false }
 opendatafabric = { workspace = true }
 time-source = { workspace = true }

diff --git a/src/domain/flow-system/services/src/flow/flow_query_service_impl.rs b/src/domain/flow-system/services/src/flow/flow_query_service_impl.rs
@@ -15,7 +15,7 @@ use database_common::PaginationOpts;
 use dill::{component, interface, Catalog};
 use futures::TryStreamExt;
 use internal_error::ResultIntoInternal;
-use kamu_core::DatasetOwnershipService;
+use kamu_datasets::DatasetOwnershipService;
 use kamu_flow_system::*;
 use opendatafabric::{AccountID, DatasetID};
 

diff --git a/src/domain/flow-system/services/src/flow/flow_scheduling_helper.rs b/src/domain/flow-system/services/src/flow/flow_scheduling_helper.rs
@@ -12,7 +12,8 @@ use std::sync::Arc;
 use chrono::{DateTime, Utc};
 use dill::component;
 use internal_error::InternalError;
-use kamu_core::{DatasetChangesService, DatasetOwnershipService, DependencyGraphService};
+use kamu_core::{DatasetChangesService, DependencyGraphService};
+use kamu_datasets::DatasetOwnershipService;
 use kamu_flow_system::*;
 use messaging_outbox::{Outbox, OutboxExt};
 use time_source::SystemTimeSource;