feat: merge cac and experimentation schemas

juspay · Dec 18, 2024 · 31667dd · 31667dd
1 parent 0994282
commit 31667dd
Show file tree

Hide file tree

Showing 51 changed files with 5,233 additions and 19,746 deletions.
diff --git a/crates/context_aware_config/samples/default_config.json b/crates/context_aware_config/samples/default_config.json
diff --git a/crates/context_aware_config/samples/dimensions.json b/crates/context_aware_config/samples/dimensions.json
diff --git a/crates/context_aware_config/samples/overrides.json b/crates/context_aware_config/samples/overrides.json
diff --git a/crates/context_aware_config/src/api/audit_log/handlers.rs b/crates/context_aware_config/src/api/audit_log/handlers.rs
@@ -8,7 +8,7 @@ use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl};
 use service_utils::service::types::DbConnection;
 use superposition_types::{
     database::{cac_models::EventLog, schema::event_log::dsl as event_log},
-    result as superposition, PaginatedResponse
+    result as superposition, PaginatedResponse,
 };
 
 use crate::api::audit_log::types::AuditQueryFilters;

diff --git a/crates/context_aware_config/src/api/config/handlers.rs b/crates/context_aware_config/src/api/config/handlers.rs
@@ -33,13 +33,13 @@ use service_utils::{
 use superposition_macros::response_error;
 use superposition_macros::{bad_argument, db_error, unexpected_error};
 use superposition_types::{
+    custom_query::{
+        self as superposition_query, CustomQuery, PaginationParams, QueryMap,
+    },
     database::{
         cac_models::ConfigVersion,
         schema::{config_versions::dsl as config_versions, event_log::dsl as event_log},
     },
-    custom_query::{
-        self as superposition_query, CustomQuery, PaginationParams, QueryMap,
-    },
     result as superposition, Cac, Condition, Config, Context, Overrides,
     PaginatedResponse, TenantConfig, User,
 };

diff --git a/crates/context_aware_config/src/api/context/handlers.rs b/crates/context_aware_config/src/api/context/handlers.rs
@@ -30,14 +30,14 @@ use superposition_macros::{
     bad_argument, db_error, not_found, unexpected_error, validation_error,
 };
 use superposition_types::{
+    custom_query::{self as superposition_query, CustomQuery, DimensionQuery, QueryMap},
     database::{
         cac_models::Context,
         schema::{
             contexts::{self, id},
             default_configs::dsl,
         },
     },
-    custom_query::{self as superposition_query, CustomQuery, DimensionQuery, QueryMap},
     result as superposition, Cac, Contextual, Overridden, Overrides, PaginatedResponse,
     SortBy, TenantConfig, User,
 };

diff --git a/crates/context_aware_config/src/api/default_config/handlers.rs b/crates/context_aware_config/src/api/default_config/handlers.rs
@@ -23,11 +23,11 @@ use superposition_macros::{
     bad_argument, db_error, not_found, unexpected_error, validation_error,
 };
 use superposition_types::{
+    custom_query::PaginationParams,
     database::{
         cac_models::{self as models, Context, DefaultConfig},
         schema::{self, contexts::dsl::contexts, default_configs::dsl},
     },
-    custom_query::PaginationParams,
     result as superposition, PaginatedResponse, User,
 };
 

diff --git a/crates/context_aware_config/src/api/dimension/handlers.rs b/crates/context_aware_config/src/api/dimension/handlers.rs
@@ -12,12 +12,12 @@ use diesel::{
 use service_utils::service::types::{AppState, DbConnection};
 use superposition_macros::{bad_argument, db_error, not_found, unexpected_error};
 use superposition_types::{
+    custom_query::PaginationParams,
     database::{
         cac_models::Dimension,
         schema::dimensions::{self, dsl::*},
         types::DimensionWithMandatory,
     },
-    custom_query::PaginationParams,
     result as superposition, PaginatedResponse, TenantConfig, User,
 };
 

diff --git a/crates/context_aware_config/src/api/functions/handlers.rs b/crates/context_aware_config/src/api/functions/handlers.rs
@@ -12,14 +12,14 @@ use serde_json::json;
 use service_utils::service::types::DbConnection;
 use superposition_macros::{bad_argument, not_found, unexpected_error};
 use superposition_types::{
+    custom_query::PaginationParams,
     database::{
         cac_models::Function,
         schema::{
             self,
             functions::{dsl, dsl::functions, function_name, last_modified_at},
         },
     },
-    custom_query::PaginationParams,
     result as superposition, PaginatedResponse, User,
 };
 use validation_functions::{compile_fn, execute_fn};

diff --git a/crates/context_aware_config/src/api/type_templates/handlers.rs b/crates/context_aware_config/src/api/type_templates/handlers.rs
@@ -9,7 +9,7 @@ use superposition_macros::{bad_argument, db_error};
 use superposition_types::{
     custom_query::PaginationParams,
     database::{
-        cac_models::TypeTemplates,
+        cac_models::TypeTemplate,
         schema::type_templates::{self, dsl},
     },
     result as superposition, PaginatedResponse, User,

diff --git a/crates/experimentation_client/src/lib.rs b/crates/experimentation_client/src/lib.rs
@@ -11,7 +11,7 @@ use chrono::{DateTime, TimeZone, Utc};
 use derive_more::{Deref, DerefMut};
 use serde_json::Value;
 use superposition_types::{
-    experimentation::models::{ExperimentStatusType, VariantType},
+    database::experimentation_models::{ExperimentStatusType, VariantType},
     Overridden, PaginatedResponse,
 };
 use tokio::{

diff --git a/crates/experimentation_client/src/types.rs b/crates/experimentation_client/src/types.rs
@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use superposition_types::{
-    experimentation::models::{ExperimentStatusType, VariantType},
+    database::experimentation_models::{ExperimentStatusType, VariantType},
     Exp, Overridden, Overrides,
 };
 

diff --git a/crates/experimentation_platform/src/api/experiments/helpers.rs b/crates/experimentation_platform/src/api/experiments/helpers.rs
@@ -9,7 +9,9 @@ use std::collections::HashSet;
 use std::str::FromStr;
 use superposition_macros::{bad_argument, unexpected_error};
 use superposition_types::{
-    database::experimentation_models::{Experiment, ExperimentStatusType, Variant, VariantType},
+    database::experimentation_models::{
+        Experiment, ExperimentStatusType, Variant, VariantType,
+    },
     result as superposition, Condition, Config, Exp, Overrides,
 };
 

diff --git a/crates/experimentation_platform/tests/experimentation_tests.rs b/crates/experimentation_platform/tests/experimentation_tests.rs
@@ -4,7 +4,9 @@ use serde_json::{json, Map, Value};
 use service_utils::helpers::extract_dimensions;
 use service_utils::service::types::ExperimentationFlags;
 use superposition_types::{
-    database::experimentation_models::{Experiment, ExperimentStatusType, Variant, Variants},
+    database::experimentation_models::{
+        Experiment, ExperimentStatusType, Variant, Variants,
+    },
     result as superposition, Cac, Condition, Exp, Overrides,
 };
 

diff --git a/crates/frontend/src/api.rs b/crates/frontend/src/api.rs
@@ -1,10 +1,10 @@
 use leptos::ServerFnError;
 use superposition_types::{
-    cac::{
-        models::{ConfigVersion, DefaultConfig, Function, TypeTemplate},
+    custom_query::PaginationParams,
+    database::{
+        cac_models::{ConfigVersion, DefaultConfig, Function, TypeTemplate},
         types::DimensionWithMandatory,
     },
-    custom_query::PaginationParams,
     Config, PaginatedResponse,
 };
 

diff --git a/crates/frontend/src/components/context_form.rs b/crates/frontend/src/components/context_form.rs
@@ -4,7 +4,7 @@ use std::collections::{HashMap, HashSet};
 
 use leptos::*;
 use serde_json::{Map, Value};
-use superposition_types::cac::types::DimensionWithMandatory;
+use superposition_types::database::types::DimensionWithMandatory;
 use web_sys::MouseEvent;
 
 use crate::components::{

diff --git a/crates/frontend/src/components/context_form/utils.rs b/crates/frontend/src/components/context_form/utils.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use leptos::logging;
 use serde_json::{json, Map, Value};
-use superposition_types::cac::types::DimensionWithMandatory;
+use superposition_types::database::types::DimensionWithMandatory;
 
 use crate::{
     components::condition_pills::types::{Condition, ConditionOperator},

diff --git a/crates/frontend/src/components/default_config_form.rs b/crates/frontend/src/components/default_config_form.rs
@@ -4,8 +4,8 @@ pub mod utils;
 use leptos::*;
 use serde_json::{json, Value};
 use superposition_types::{
-    cac::models::{Function, TypeTemplate},
     custom_query::PaginationParams,
+    database::cac_models::{Function, TypeTemplate},
 };
 use web_sys::MouseEvent;