From 1a650dcc7e5e64c69e582f9a45daa1d850ac2c87 Mon Sep 17 00:00:00 2001
From: ItsMeShashank <shashank.attarde@juspay.in>
Date: Thu, 19 Jan 2023 12:15:46 +0530
Subject: [PATCH] fix(router): fix incorrect order of routing_algorithm and
 metadata fields in db models (#418)

---
 crates/storage_models/src/merchant_account.rs | 8 ++++----
 crates/storage_models/src/schema.rs           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/storage_models/src/merchant_account.rs b/crates/storage_models/src/merchant_account.rs
index 6937c70c0b..8fae8c1a9d 100644
--- a/crates/storage_models/src/merchant_account.rs
+++ b/crates/storage_models/src/merchant_account.rs
@@ -21,8 +21,8 @@ pub struct MerchantAccount {
     pub publishable_key: Option<String>,
     pub storage_scheme: storage_enums::MerchantStorageScheme,
     pub locker_id: Option<String>,
-    pub metadata: Option<serde_json::Value>,
     pub routing_algorithm: Option<serde_json::Value>,
+    pub metadata: Option<serde_json::Value>,
 }
 
 #[derive(Clone, Debug, Default, Insertable, router_derive::DebugAsDisplay)]
@@ -41,8 +41,8 @@ pub struct MerchantAccountNew {
     pub redirect_to_merchant_with_http_post: Option<bool>,
     pub publishable_key: Option<String>,
     pub locker_id: Option<String>,
-    pub metadata: Option<serde_json::Value>,
     pub routing_algorithm: Option<serde_json::Value>,
+    pub metadata: Option<serde_json::Value>,
 }
 
 #[derive(Debug)]
@@ -61,8 +61,8 @@ pub enum MerchantAccountUpdate {
         redirect_to_merchant_with_http_post: Option<bool>,
         publishable_key: Option<String>,
         locker_id: Option<String>,
-        metadata: Option<serde_json::Value>,
         routing_algorithm: Option<serde_json::Value>,
+        metadata: Option<serde_json::Value>,
     },
 }
 
@@ -82,8 +82,8 @@ pub struct MerchantAccountUpdateInternal {
     redirect_to_merchant_with_http_post: Option<bool>,
     publishable_key: Option<String>,
     locker_id: Option<String>,
-    metadata: Option<serde_json::Value>,
     routing_algorithm: Option<serde_json::Value>,
+    metadata: Option<serde_json::Value>,
 }
 
 impl From<MerchantAccountUpdate> for MerchantAccountUpdateInternal {
diff --git a/crates/storage_models/src/schema.rs b/crates/storage_models/src/schema.rs
index bdd8bbea09..c4d6a143eb 100644
--- a/crates/storage_models/src/schema.rs
+++ b/crates/storage_models/src/schema.rs
@@ -158,8 +158,8 @@ diesel::table! {
         publishable_key -> Nullable<Varchar>,
         storage_scheme -> MerchantStorageScheme,
         locker_id -> Nullable<Varchar>,
-        metadata -> Nullable<Jsonb>,
         routing_algorithm -> Nullable<Json>,
+        metadata -> Nullable<Jsonb>,
     }
 }