refactor(merchant_account): change primary key for merchant account

.github/workflows/migration-check.yaml

@@ -53,14 +53,31 @@ jobs:
           features: postgres
           args: "--no-default-features"
 
-      - name: Verify `diesel migration run`
+      - uses: baptiste0928/cargo-install@v2.2.0
+        with:
+          crate: just
+          args: "--no-default-features"
+
+      - name: Verify `diesel migration run for v1`
+        shell: bash
+        env:
+          DATABASE_URL: postgres://postgres:postgres@localhost:5432/postgres
+        run: just migrate run --locked-schema --all
+
+      - name: Verify `diesel migration redo for v1`
+        shell: bash
+        env:
+          DATABASE_URL: postgres://postgres:postgres@localhost:5432/postgres
+        run: just migrate redo --locked-schema --all
+
+      - name: Verify `diesel migration run for v2`
         shell: bash
         env:
           DATABASE_URL: postgres://postgres:postgres@localhost:5432/postgres
-        run: make migrate locked-schema=yes
+        run: just migrate_v2 run --locked-schema --all
 
-      - name: Verify `diesel migration redo`
+      - name: Verify `diesel migration redo for v2`
         shell: bash
         env:
           DATABASE_URL: postgres://postgres:postgres@localhost:5432/postgres
-        run: make redo_migrate locked-schema=yes
+        run: just migrate_v2 redo --locked-schema --all

.github/workflows/postman-collection-runner.yml

@@ -102,12 +102,17 @@ jobs:
           features: postgres
           args: "--no-default-features"
 
+      - uses: baptiste0928/cargo-install@v2.2.0
+        with:
+          crate: just
+          args: "--no-default-features"
+
       - name: Diesel migration run
         if: ${{ ((github.event_name == 'pull_request') && (github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name)) || (github.event_name == 'merge_group')}}
         shell: bash
         env:
           DATABASE_URL: postgres://db_user:db_pass@localhost:5432/hyperswitch_db
-        run: make migrate locked-schema=yes
+        run: just migrate run --locked-schema
 
       - name: Install newman from fork
         run: npm ci

crates/diesel_models/src/payment_attempt.rs

@@ -10,6 +10,7 @@ use crate::{
 #[derive(Clone, Debug, Eq, PartialEq, Identifiable, Queryable, Serialize, Deserialize)]
 #[diesel(table_name = payment_attempt, primary_key(attempt_id, merchant_id))]
 pub struct PaymentAttempt {
+    pub id: Option<i32>,
     pub payment_id: String,
     pub merchant_id: String,
     pub attempt_id: String,

crates/diesel_models/src/payment_intent.rs

@@ -9,6 +9,7 @@ use crate::{encryption::Encryption, enums as storage_enums, schema::payment_inte
 #[derive(Clone, Debug, PartialEq, Identifiable, Queryable, Serialize, Deserialize)]
 #[diesel(table_name = payment_intent, primary_key(payment_id, merchant_id))]
 pub struct PaymentIntent {
+    pub id: Option<i32>,
     pub payment_id: String,
     pub merchant_id: String,
     pub status: storage_enums::IntentStatus,

crates/diesel_models/src/query/merchant_account.rs

@@ -22,7 +22,7 @@ impl MerchantAccount {
     ) -> StorageResult<Self> {
         match generics::generic_update_by_id::<<Self as HasTable>::Table, _, _, _>(
             conn,
-            self.id,
+            self.merchant_id.clone(),
             merchant_account,
         )
         .await

crates/diesel_models/src/schema.rs

@@ -632,7 +632,7 @@ diesel::table! {
     use diesel::sql_types::*;
     use crate::enums::diesel_exports::*;
 
-    merchant_account (id) {
+    merchant_account (merchant_id) {
         id -> Int4,
         #[max_length = 64]
         merchant_id -> Varchar,
@@ -739,6 +739,7 @@ diesel::table! {
     use crate::enums::diesel_exports::*;
 
     payment_attempt (attempt_id, merchant_id) {
+        id -> Nullable<Int4>,
         #[max_length = 64]
         payment_id -> Varchar,
         #[max_length = 64]
@@ -828,6 +829,7 @@ diesel::table! {
     use crate::enums::diesel_exports::*;
 
     payment_intent (payment_id, merchant_id) {
+        id -> Nullable<Int4>,
         #[max_length = 64]
         payment_id -> Varchar,
         #[max_length = 64]