RebacService::properties_count(): implement

Author: s373r

src/domain/auth-rebac/domain/src/services/rebac_service.rs

@@ -19,6 +19,7 @@ use crate::{
     DatasetPropertyName,
     EntityNotFoundError,
     EntityWithRelation,
+    PropertiesCountError,
     PropertyValue,
     SetEntityPropertyError,
     SubjectEntityRelationsError,
@@ -28,6 +29,8 @@ use crate::{
 
 #[async_trait::async_trait]
 pub trait RebacService: Send + Sync {
+    async fn properties_count(&self) -> Result<usize, PropertiesCountError>;
+
     // Account
     async fn set_account_property(
         &self,

src/domain/auth-rebac/services/src/rebac_indexer.rs

@@ -19,7 +19,7 @@ use kamu_accounts::{
     PredefinedAccountsConfig,
     JOB_KAMU_ACCOUNTS_PREDEFINED_ACCOUNTS_REGISTRATOR,
 };
-use kamu_auth_rebac::{AccountPropertyName, DatasetPropertyName, RebacRepository, RebacService};
+use kamu_auth_rebac::{AccountPropertyName, DatasetPropertyName, RebacService};
 use kamu_core::DatasetVisibility;
 use kamu_datasets::DatasetEntryService;
 use kamu_datasets_services::JOB_KAMU_DATASETS_DATASET_ENTRY_INDEXER;
@@ -34,7 +34,6 @@ type PredefinedAccountIdDatasetVisibilityMapping = HashMap<odf::AccountID, Datas
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 pub struct RebacIndexer {
-    rebac_repo: Arc<dyn RebacRepository>,
     rebac_service: Arc<dyn RebacService>,
     dataset_entry_service: Arc<dyn DatasetEntryService>,
     expensive_account_repo: Arc<dyn ExpensiveAccountRepository>,
@@ -53,14 +52,12 @@ pub struct RebacIndexer {
 })]
 impl RebacIndexer {
     pub fn new(
-        rebac_repo: Arc<dyn RebacRepository>,
         rebac_service: Arc<dyn RebacService>,
         dataset_entry_service: Arc<dyn DatasetEntryService>,
         expensive_account_repo: Arc<dyn ExpensiveAccountRepository>,
         predefined_accounts_config: Arc<PredefinedAccountsConfig>,
     ) -> Self {
         Self {
-            rebac_repo,
             rebac_service,
             dataset_entry_service,
             expensive_account_repo,
@@ -69,7 +66,7 @@ impl RebacIndexer {
     }
 
     async fn has_entities_indexed(&self) -> Result<bool, InternalError> {
-        let properties_count = self.rebac_repo.properties_count().await.int_err()?;
+        let properties_count = self.rebac_service.properties_count().await.int_err()?;
 
         Ok(properties_count > 0)
     }

src/domain/auth-rebac/services/src/rebac_service_impl.rs

@@ -28,6 +28,7 @@ use kamu_auth_rebac::{
     GetPropertiesError,
     InsertEntitiesRelationError,
     InsertRelationError,
+    PropertiesCountError,
     PropertyName,
     PropertyValue,
     RebacRepository,
@@ -56,6 +57,10 @@ impl RebacServiceImpl {
 
 #[async_trait::async_trait]
 impl RebacService for RebacServiceImpl {
+    async fn properties_count(&self) -> Result<usize, PropertiesCountError> {
+        self.rebac_repo.properties_count().await
+    }
+
     async fn set_account_property(
         &self,
         account_id: &odf::AccountID,