feat: insert merchant account and merchant key store in a db transaction

crates/diesel_models/src/errors.rs

@@ -10,7 +10,15 @@ pub enum DatabaseError {
     NoFieldsToUpdate,
     #[error("An error occurred when generating typed SQL query")]
     QueryGenerationFailed,
+    #[error("DB transaction failure")]
+    TransactionFailed(String),
     // InsertFailed,
     #[error("An unknown error occurred")]
     Others,
 }
+
+impl From<diesel::result::Error> for DatabaseError {
+    fn from(err: diesel::result::Error) -> Self {
+        Self::TransactionFailed(err.to_string())
+    }
+}

crates/router/src/core/admin.rs

@@ -111,10 +111,6 @@ pub async fn create_merchant_account(
         .payment_response_hash_key
         .or(Some(generate_cryptographically_secure_random_string(64)));
 
-    db.insert_merchant_key_store(key_store.clone(), &master_key.to_vec().into())
-        .await
-        .to_duplicate_response(errors::ApiErrorResponse::DuplicateMerchantAccount)?;
-
     let parent_merchant_id = get_parent_merchant(
         db,
         req.sub_merchants_enabled,

crates/router/src/db/merchant_account.rs

@@ -1,3 +1,4 @@
+use async_bb8_diesel::AsyncConnection;
 use common_utils::ext_traits::AsyncExt;
 use error_stack::{IntoReport, ResultExt};
 #[cfg(feature = "accounts_cache")]
@@ -72,20 +73,36 @@ impl MerchantAccountInterface for Store {
     async fn insert_merchant(
         &self,
         merchant_account: domain::MerchantAccount,
-        merchant_key_store: &domain::MerchantKeyStore,
+        merchant_key_store: domain::MerchantKeyStore,
     ) -> CustomResult<domain::MerchantAccount, errors::StorageError> {
         let conn = connection::pg_connection_write(self).await?;
-        merchant_account
-            .construct_new()
-            .await
-            .change_context(errors::StorageError::EncryptionError)?
-            .insert(&conn)
-            .await
-            .map_err(Into::into)
-            .into_report()?
-            .convert(merchant_key_store.key.get_inner())
-            .await
-            .change_context(errors::StorageError::DecryptionError)
+
+        conn.transaction_async(|e| async move {
+            let key_store = merchant_key_store
+                .construct_new()
+                .await
+                .change_context(errors::StorageError::EncryptionError)?
+                .insert(&e)
+                .await
+                .map_err(Into::into)
+                .into_report()?
+                .convert(self.get_master_key())
+                .await
+                .change_context(errors::StorageError::DecryptionError);
+
+            merchant_account
+                .construct_new()
+                .await
+                .change_context(errors::StorageError::EncryptionError)?
+                .insert(&e)
+                .await
+                .map_err(Into::into)
+                .into_report()?
+                .convert(merchant_key_store.key.get_inner())
+                .await
+                .change_context(errors::StorageError::DecryptionError)
+        })
+        .await
     }
 
     async fn find_merchant_account_by_merchant_id(

crates/storage_impl/src/errors.rs

@@ -98,6 +98,9 @@ impl Into<DataStorageError> for &StorageError {
                 storage_errors::DatabaseError::QueryGenerationFailed => {
                     DataStorageError::DatabaseError("Query generation failed".to_string())
                 }
+                storage_errors::DatabaseError::TransactionFailed(e) => {
+                    DataStorageError::DatabaseError(e.to_string())
+                }
                 storage_errors::DatabaseError::Others => {
                     DataStorageError::DatabaseError("Unknown database error".to_string())
                 }