refactor: cleanup and rewrite of unified function (#212)

picahq · Jan 23, 2025 · 02c179c · 02c179c
1 parent 6c8a3a1
commit 02c179c
Show file tree

Hide file tree

Showing 59 changed files with 1,486 additions and 1,730 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,6 +23,7 @@ bson = "2.13.0"
 chrono = { version = "0.4.38", features = ["serde"] }
 convert_case = "0.6.0"
 dotenvy = "0.15.7"
+derive_builder = "0.20.0"
 envconfig = "0.10.0"
 fake = { version = "2.10.0", features = [
     "uuid",

diff --git a/integrationos-api/src/logic/mod.rs b/integrationos-api/src/logic/mod.rs
@@ -9,7 +9,7 @@ use axum::{
 };
 use bson::doc;
 use http::{HeaderMap, HeaderValue};
-use integrationos_cache::local::connection_cache::ConnectionCacheArcStrHeaderKey;
+use integrationos_cache::local::{ConnectionHeaderCache, LocalCacheExt};
 use integrationos_domain::{
     algebra::MongoStore, event_access::EventAccess, ApplicationError, Connection,
     IntegrationOSError, InternalError, OAuth, Store, Unit,
@@ -42,7 +42,7 @@ pub mod schema_generator;
 pub mod secrets;
 pub mod transactions;
 pub mod unified;
-pub mod utils;
+pub mod utility;
 pub mod vault_connection;
 
 const INTEGRATION_OS_PASSTHROUGH_HEADER: &str = "x-pica-passthrough";
@@ -322,11 +322,11 @@ async fn get_connection(
     access: &EventAccess,
     connection_key: &HeaderValue,
     stores: &AppStores,
-    cache: &ConnectionCacheArcStrHeaderKey,
+    cache: &ConnectionHeaderCache,
 ) -> Result<Arc<Connection>, IntegrationOSError> {
     let connection = cache
         .get_or_insert_with_filter(
-            (access.ownership.id.clone(), connection_key.clone()),
+            &(access.ownership.id.clone(), connection_key.clone()),
             stores.connection.clone(),
             doc! {
                 "key": connection_key.to_str().map_err(|_| {
@@ -335,6 +335,7 @@ async fn get_connection(
                 "ownership.buildableId": access.ownership.id.as_ref(),
                 "deleted": false
             },
+            None,
         )
         .await?;
 

diff --git a/integrationos-api/src/logic/passthrough.rs b/integrationos-api/src/logic/passthrough.rs
@@ -68,7 +68,7 @@ pub async fn passthrough_request(
 
     let model_execution_result = state
         .extractor_caller
-        .send_to_destination(
+        .dispatch_destination_request(
             Some(connection.clone()),
             &destination,
             headers,