feat: move collectiontype to state

src/libs/satellite/src/lib.rs

@@ -19,7 +19,9 @@ mod version;
 use crate::auth::types::config::AuthenticationConfig;
 use crate::db::types::config::DbConfig;
 use crate::guards::{caller_is_admin_controller, caller_is_controller};
-use crate::types::interface::{CollectionType, Config};
+use crate::types::interface::Config;
+use crate::types::state::CollectionType;
+use crate::usage::types::state::UserUsage;
 use crate::version::SATELLITE_VERSION;
 use ic_cdk::api::trap;
 use ic_cdk_macros::{init, post_upgrade, pre_upgrade, query, update};
@@ -43,7 +45,6 @@ use junobuild_storage::types::interface::{
     AssetNoContent, CommitBatch, InitAssetKey, InitUploadResult, UploadChunk, UploadChunkResult,
 };
 use junobuild_storage::types::state::FullPath;
-use crate::usage::types::state::UserUsage;
 
 // ============================================================================================
 // START: Re-exported Types

src/libs/satellite/src/satellite.rs

@@ -36,8 +36,8 @@ use crate::storage::store::{
     set_domain_store,
 };
 use crate::storage::strategy_impls::StorageState;
-use crate::types::interface::{CollectionType, Config};
-use crate::types::state::{HeapState, RuntimeState, State};
+use crate::types::interface::Config;
+use crate::types::state::{CollectionType, HeapState, RuntimeState, State};
 use crate::usage::types::state::UserUsage;
 use crate::usage::user_usage::{
     decrease_db_usage, decrease_db_usage_by, get_db_usage_by_id, get_storage_usage_by_id,

src/libs/satellite/src/types.rs

@@ -44,6 +44,12 @@ pub mod state {
         pub rng: Option<StdRng>, // rng = Random Number Generator
         pub db: DbRuntimeState,
     }
+
+    #[derive(CandidType, Deserialize, Serialize, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+    pub enum CollectionType {
+        Db,
+        Storage,
+    }
 }
 
 pub mod interface {
@@ -53,12 +59,6 @@ pub mod interface {
     use junobuild_storage::types::config::StorageConfig;
     use serde::Deserialize;
 
-    #[derive(CandidType, Deserialize, Serialize, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    pub enum CollectionType {
-        Db,
-        Storage,
-    }
-
     #[derive(CandidType, Deserialize)]
     pub struct Config {
         pub storage: StorageConfig,

src/libs/satellite/src/usage/impls.rs

@@ -1,4 +1,4 @@
-use crate::types::interface::CollectionType;
+use crate::types::state::CollectionType;
 use crate::usage::types::interface::ModificationType;
 use crate::usage::types::state::{UserUsage, UserUsageKey};
 use ic_cdk::api::time;

src/libs/satellite/src/usage/store.rs

@@ -1,5 +1,5 @@
 use crate::memory::STATE;
-use crate::types::interface::CollectionType;
+use crate::types::state::CollectionType;
 use crate::usage::types::interface::ModificationType;
 use crate::usage::types::state::{UserUsage, UserUsageKey, UserUsageStable};
 use junobuild_collections::types::core::CollectionKey;

src/libs/satellite/src/usage/types.rs

@@ -1,5 +1,5 @@
 pub mod state {
-    use crate::types::interface::CollectionType;
+    use crate::types::state::CollectionType;
     use candid::{CandidType, Deserialize};
     use ic_stable_structures::StableBTreeMap;
     use junobuild_collections::types::core::CollectionKey;

src/libs/satellite/src/usage/user_usage.rs

@@ -1,5 +1,5 @@
 use crate::get_controllers;
-use crate::types::interface::CollectionType;
+use crate::types::state::CollectionType;
 use crate::usage::store;
 use crate::usage::store::get_user_usage as get_user_usage_store;
 use crate::usage::types::interface::ModificationType;