From 963cb528f54c69d98f598e69b510edf8f497f907 Mon Sep 17 00:00:00 2001
From: Kartikeya Hegde <karthikey.hegde@juspay.in>
Date: Fri, 10 Feb 2023 13:16:41 +0530
Subject: [PATCH] feat: Impelement redis cache for MCA fetch and update (#515)

---
 .../src/db/merchant_connector_account.rs      | 52 ++++++++++++++-----
 .../src/merchant_connector_account.rs         | 12 ++++-
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/crates/router/src/db/merchant_connector_account.rs b/crates/router/src/db/merchant_connector_account.rs
index 60a6ee09fb..e3920fc099 100644
--- a/crates/router/src/db/merchant_connector_account.rs
+++ b/crates/router/src/db/merchant_connector_account.rs
@@ -154,15 +154,26 @@ impl MerchantConnectorAccountInterface for Store {
         merchant_id: &str,
         merchant_connector_id: &str,
     ) -> CustomResult<storage::MerchantConnectorAccount, errors::StorageError> {
-        let conn = pg_connection(&self.master_pool).await;
-        storage::MerchantConnectorAccount::find_by_merchant_id_merchant_connector_id(
-            &conn,
-            merchant_id,
-            merchant_connector_id,
-        )
-        .await
-        .map_err(Into::into)
-        .into_report()
+        let find_call = || async {
+            let conn = pg_connection(&self.master_pool).await;
+            storage::MerchantConnectorAccount::find_by_merchant_id_merchant_connector_id(
+                &conn,
+                merchant_id,
+                merchant_connector_id,
+            )
+            .await
+            .map_err(Into::into)
+            .into_report()
+        };
+        #[cfg(not(feature = "accounts_cache"))]
+        {
+            find_call().await
+        }
+
+        #[cfg(feature = "accounts_cache")]
+        {
+            super::cache::get_or_populate_cache(self, merchant_connector_id, find_call).await
+        }
     }
 
     async fn insert_merchant_connector_account(
@@ -189,11 +200,24 @@ impl MerchantConnectorAccountInterface for Store {
         this: storage::MerchantConnectorAccount,
         merchant_connector_account: storage::MerchantConnectorAccountUpdate,
     ) -> CustomResult<storage::MerchantConnectorAccount, errors::StorageError> {
-        let conn = pg_connection(&self.master_pool).await;
-        this.update(&conn, merchant_connector_account)
-            .await
-            .map_err(Into::into)
-            .into_report()
+        let _merchant_connector_id = this.merchant_connector_id.clone();
+        let update_call = || async {
+            let conn = pg_connection(&self.master_pool).await;
+            this.update(&conn, merchant_connector_account)
+                .await
+                .map_err(Into::into)
+                .into_report()
+        };
+
+        #[cfg(feature = "accounts_cache")]
+        {
+            super::cache::redact_cache(self, &_merchant_connector_id, update_call).await
+        }
+
+        #[cfg(not(feature = "accounts_cache"))]
+        {
+            update_call().await
+        }
     }
 
     async fn delete_merchant_connector_account_by_merchant_id_merchant_connector_id(
diff --git a/crates/storage_models/src/merchant_connector_account.rs b/crates/storage_models/src/merchant_connector_account.rs
index 83526031c1..6b76859cc8 100644
--- a/crates/storage_models/src/merchant_connector_account.rs
+++ b/crates/storage_models/src/merchant_connector_account.rs
@@ -3,7 +3,17 @@ use masking::Secret;
 
 use crate::{enums as storage_enums, schema::merchant_connector_account};
 
-#[derive(Clone, Debug, Eq, PartialEq, Identifiable, Queryable, router_derive::DebugAsDisplay)]
+#[derive(
+    Clone,
+    Debug,
+    Eq,
+    serde::Serialize,
+    serde::Deserialize,
+    PartialEq,
+    Identifiable,
+    Queryable,
+    router_derive::DebugAsDisplay,
+)]
 #[diesel(table_name = merchant_connector_account)]
 pub struct MerchantConnectorAccount {
     pub id: i32,