refactor(v1v2): refactor database queries for v1 and v2

crates/common_enums/src/enums.rs

@@ -1,14 +1,15 @@
+mod accounts;
 mod payments;
 mod ui;
 use std::num::{ParseFloatError, TryFromIntError};
 
+pub use accounts::MerchantProductType;
 pub use payments::ProductType;
 use serde::{Deserialize, Serialize};
 pub use ui::*;
 use utoipa::ToSchema;
 
 pub use super::connector_enums::RoutableConnectors;
-
 #[doc(hidden)]
 pub mod diesel_exports {
     pub use super::{

crates/common_enums/src/enums/accounts.rs

@@ -0,0 +1,28 @@
+use serde;
+use utoipa::ToSchema;
+#[derive(
+    Default,
+    Clone,
+    Debug,
+    Eq,
+    PartialEq,
+    serde::Deserialize,
+    serde::Serialize,
+    strum::Display,
+    strum::EnumString,
+    ToSchema,
+    Hash,
+)]
+#[router_derive::diesel_enum(storage_type = "text")]
+#[serde(rename_all = "snake_case")]
+#[strum(serialize_all = "snake_case")]
+pub enum MerchantProductType {
+    Orchestration,
+    #[default]
+    Legacy,
+    Vault,
+    Recon,
+    Recovery,
+    CostObservability,
+    DynamicRouting,
+}

crates/diesel_models/drop_id.patch

@@ -0,0 +1,66 @@
+diff --git a/crates/diesel_models/src/schema.rs b/crates/diesel_models/src/schema.rs
+index b35e809a0..749a5dd47 100644
+--- a/crates/diesel_models/src/schema.rs
++++ b/crates/diesel_models/src/schema.rs
+@@ -142,14 +142,13 @@ diesel::table! {
+ }
+
+ diesel::table! {
+     use diesel::sql_types::*;
+     use crate::enums::diesel_exports::*;
+
+-    blocklist_fingerprint (id) {
+-        id -> Int4,
++    blocklist_fingerprint (merchant_id, fingerprint_id) {
+         #[max_length = 64]
+         merchant_id -> Varchar,
+         #[max_length = 64]
+         fingerprint_id -> Varchar,
+         data_kind -> BlocklistDataKind,
+         encrypted_fingerprint -> Text,
+@@ -158,14 +157,13 @@ diesel::table! {
+ }
+
+ diesel::table! {
+     use diesel::sql_types::*;
+     use crate::enums::diesel_exports::*;
+
+-    blocklist_lookup (id) {
+-        id -> Int4,
++    blocklist_lookup (merchant_id, fingerprint) {
+         #[max_length = 64]
+         merchant_id -> Varchar,
+         fingerprint -> Text,
+     }
+ }
+
+@@ -300,13 +298,12 @@ diesel::table! {
+
+ diesel::table! {
+     use diesel::sql_types::*;
+     use crate::enums::diesel_exports::*;
+
+     configs (key) {
+-        id -> Int4,
+         #[max_length = 255]
+         key -> Varchar,
+         config -> Text,
+     }
+ }
+
+@@ -615,14 +612,13 @@ diesel::table! {
+ }
+
+ diesel::table! {
+     use diesel::sql_types::*;
+     use crate::enums::diesel_exports::*;
+
+-    locker_mock_up (id) {
+-        id -> Int4,
++    locker_mock_up (card_id) {
+         #[max_length = 255]
+         card_id -> Varchar,
+         #[max_length = 255]
+         external_id -> Varchar,
+         #[max_length = 255]
+         card_fingerprint -> Varchar,

crates/diesel_models/src/blocklist_fingerprint.rs

@@ -16,10 +16,8 @@ pub struct BlocklistFingerprintNew {
 #[derive(
     Clone, Debug, Eq, PartialEq, Queryable, Identifiable, Selectable, Deserialize, Serialize,
 )]
-#[diesel(table_name = blocklist_fingerprint, check_for_backend(diesel::pg::Pg))]
+#[diesel(table_name = blocklist_fingerprint, primary_key(merchant_id, fingerprint_id), check_for_backend(diesel::pg::Pg))]
 pub struct BlocklistFingerprint {
-    #[serde(skip_serializing)]
-    pub id: i32,
     pub merchant_id: common_utils::id_type::MerchantId,
     pub fingerprint_id: String,
     pub data_kind: common_enums::BlocklistDataKind,

crates/diesel_models/src/blocklist_lookup.rs

@@ -22,10 +22,8 @@ pub struct BlocklistLookupNew {
     Deserialize,
     Serialize,
 )]
-#[diesel(table_name = blocklist_lookup, check_for_backend(diesel::pg::Pg))]
+#[diesel(table_name = blocklist_lookup, primary_key(merchant_id, fingerprint), check_for_backend(diesel::pg::Pg))]
 pub struct BlocklistLookup {
-    #[serde(skip)]
-    pub id: i32,
     pub merchant_id: common_utils::id_type::MerchantId,
     pub fingerprint: String,
 }

crates/diesel_models/src/business_profile.rs

@@ -310,14 +310,6 @@ pub struct Profile {
     pub always_collect_shipping_details_from_wallet_connector: Option<bool>,
     pub tax_connector_id: Option<common_utils::id_type::MerchantConnectorAccountId>,
     pub is_tax_connector_enabled: Option<bool>,
-    pub routing_algorithm_id: Option<common_utils::id_type::RoutingId>,
-    pub order_fulfillment_time: Option<i64>,
-    pub order_fulfillment_time_origin: Option<common_enums::OrderFulfillmentTimeOrigin>,
-    pub frm_routing_algorithm_id: Option<String>,
-    pub payout_routing_algorithm_id: Option<common_utils::id_type::RoutingId>,
-    pub default_fallback_routing: Option<pii::SecretSerdeValue>,
-    pub should_collect_cvv_during_payment: bool,
-    pub id: common_utils::id_type::ProfileId,
     pub version: common_enums::ApiVersion,
     pub dynamic_routing_algorithm: Option<serde_json::Value>,
     pub is_network_tokenization_enabled: bool,
@@ -327,9 +319,17 @@ pub struct Profile {
     pub is_click_to_pay_enabled: bool,
     pub authentication_product_ids:
         Option<common_types::payments::AuthenticationConnectorAccountMap>,
-    pub three_ds_decision_manager_config: Option<common_types::payments::DecisionManagerRecord>,
     pub card_testing_guard_config: Option<CardTestingGuardConfig>,
     pub card_testing_secret_key: Option<Encryption>,
+    pub routing_algorithm_id: Option<common_utils::id_type::RoutingId>,
+    pub order_fulfillment_time: Option<i64>,
+    pub order_fulfillment_time_origin: Option<common_enums::OrderFulfillmentTimeOrigin>,
+    pub frm_routing_algorithm_id: Option<String>,
+    pub payout_routing_algorithm_id: Option<common_utils::id_type::RoutingId>,
+    pub default_fallback_routing: Option<pii::SecretSerdeValue>,
+    pub three_ds_decision_manager_config: Option<common_types::payments::DecisionManagerRecord>,
+    pub should_collect_cvv_during_payment: bool,
+    pub id: common_utils::id_type::ProfileId,
 }
 
 impl Profile {

crates/diesel_models/src/configs.rs

@@ -13,10 +13,8 @@ pub struct ConfigNew {
 }
 
 #[derive(Default, Clone, Debug, Identifiable, Queryable, Selectable, Deserialize, Serialize)]
-#[diesel(table_name = configs, check_for_backend(diesel::pg::Pg))]
+#[diesel(table_name = configs, primary_key(key), check_for_backend(diesel::pg::Pg))]
 pub struct Config {
-    #[serde(skip)]
-    pub id: i32,
     pub key: String,
     pub config: String,
 }
@@ -49,7 +47,6 @@ impl From<ConfigUpdate> for ConfigUpdateInternal {
 impl From<ConfigNew> for Config {
     fn from(config_new: ConfigNew) -> Self {
         Self {
-            id: 0i32,
             key: config_new.key,
             config: config_new.config,
         }

crates/diesel_models/src/locker_mock_up.rs

@@ -3,9 +3,8 @@ use diesel::{Identifiable, Insertable, Queryable, Selectable};
 use crate::schema::locker_mock_up;
 
 #[derive(Clone, Debug, Eq, Identifiable, Queryable, Selectable, PartialEq)]
-#[diesel(table_name = locker_mock_up, check_for_backend(diesel::pg::Pg))]
+#[diesel(table_name = locker_mock_up, primary_key(card_id), check_for_backend(diesel::pg::Pg))]
 pub struct LockerMockUp {
-    pub id: i32,
     pub card_id: String,
     pub external_id: String,
     pub card_fingerprint: String,