Skip to content

refactor(accounts): move accounts related tables to accounts schema #7626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 12 commits into from
Apr 3, 2025
Merged

refactor(accounts): move accounts related tables to accounts schema #7626

merged 12 commits into from
Apr 3, 2025

Conversation

hrithikesh026
Copy link
Contributor

@hrithikesh026 hrithikesh026 commented Mar 25, 2025 •
edited
Loading

Type of Change

  • Bugfix
  • New feature
  • Enhancement
  • Refactoring
  • Dependency updates
  • Documentation
  • CI/CD

Description

  • moved merchant_account, business_profile and merchant_connector_account under accounts_schema.
  • added id as varchar in business_profile and merchant_connector_account and added logic to populate it during creation in v1 itself.
  • added migration to create index for every table after running compatible migrations.

Additional Changes

  • This PR modifies the API contract
  • This PR modifies the database schema
  • This PR modifies application configuration/environment variables

Motivation and Context

How did you test it?

Create a merchant_account and MCA for that merchant account
and check if id column is populated for business_profile and mca.

MCA DB query:

select id, merchant_connector_id from merchant_connector_account
where merchant_connector_id = '<mca_id>';

image

Profile DB query:

select id, profile_id from business_profile
where profile_id = '<profile_id>';

image

Checklist

  • I formatted the code cargo +nightly fmt --all
  • I addressed lints thrown by cargo clippy
  • I reviewed the submitted code
  • I added unit tests for my changes where possible

@hrithikesh026 hrithikesh026 self-assigned this Mar 25, 2025
@hrithikesh026 hrithikesh026 requested review from a team as code owners March 25, 2025 11:32
@semanticdiff-com SemanticDiff.com
Copy link

semanticdiff-com bot commented Mar 25, 2025 •
edited
Loading

Review changes with  SemanticDiff

Changed Files
File Status
  crates/router/src/db.rs  69% smaller
  crates/hyperswitch_domain_models/src/merchant_connector_account.rs  63% smaller
  crates/hyperswitch_domain_models/src/business_profile.rs  62% smaller
  crates/common_types/src/payment_methods.rs  58% smaller
  crates/diesel_models/src/business_profile.rs  0% smaller
  crates/diesel_models/src/merchant_connector_account.rs  0% smaller
  crates/diesel_models/src/schema.rs  0% smaller
  crates/diesel_models/src/schema_v2.rs  0% smaller
  crates/router/src/db/business_profile.rs  0% smaller
  crates/router/src/db/merchant_account.rs  0% smaller
  crates/router/src/db/merchant_connector_account.rs  0% smaller
  migrations/2025-03-25-090203_add_id_column_to_profile_mca/down.sql Unsupported file format
  migrations/2025-03-25-090203_add_id_column_to_profile_mca/up.sql Unsupported file format
  v2_compatible_migrations/2024-08-28-081747_recreate_ids_for_v2/down.sql Unsupported file format
  v2_compatible_migrations/2024-08-28-081747_recreate_ids_for_v2/up.sql Unsupported file format
  v2_compatible_migrations/2024-08-28-081757_drop_not_null_constraints_on_v1_columns/down.sql Unsupported file format
  v2_compatible_migrations/2024-08-28-081757_drop_not_null_constraints_on_v1_columns/up.sql Unsupported file format
  v2_migrations/2025-01-13-081848_alter_column_types_for_v2/up.sql Unsupported file format

@hyperswitch-bot hyperswitch-bot bot added the M-database-changes Metadata: This PR involves database schema changes label Mar 25, 2025
@hrithikesh026 hrithikesh026 requested review from a team as code owners March 27, 2025 06:20
@hyperswitch-bot hyperswitch-bot bot added the M-api-contract-changes Metadata: This PR involves API contract changes label Mar 27, 2025
@hyperswitch-bot hyperswitch-bot bot removed the M-api-contract-changes Metadata: This PR involves API contract changes label Mar 27, 2025
@hrithikesh026 hrithikesh026 removed request for a team March 27, 2025 06:31
jarnura
jarnura requested changes Mar 27, 2025
View reviewed changes
jarnura
jarnura previously approved these changes Apr 1, 2025
View reviewed changes
Narayanbhat166
Narayanbhat166 reviewed Apr 1, 2025
View reviewed changes
v2_compatible_migrations/2024-08-28-081757_drop_not_null_constraints_on_v1_columns/up.sql
ALTER TABLE organization
DROP CONSTRAINT organization_pkey,
ALTER COLUMN org_id DROP NOT NULL;
-- Create index on org_id in organization table
CREATE INDEX idx_organization_org_id ON organization (org_id);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are we creating these indexes again in v2? can you add appropriate comments?

@hrithikesh026 hrithikesh026 linked an issue Apr 2, 2025 that may be closed by this pull request
[FEATURE] create accounts schema for accounts tables #7125
Closed
2 tasks
@hrithikesh026 hrithikesh026 mentioned this pull request Apr 2, 2025
Closed
2 tasks
@Gnanasundari24 Gnanasundari24 added this pull request to the merge queue Apr 3, 2025
Merged via the queue into main with commit 4b7f55a Apr 3, 2025
22 of 27 checks passed
@Gnanasundari24 Gnanasundari24 deleted the move-accounts-related-tables-to-accounts-schema branch April 3, 2025 16:25
pixincreate added a commit that referenced this pull request Apr 4, 2025
@pixincreate
Merge branch 'main' of github.com:juspay/hyperswitch into connector/f…
e460497 
…acilitapay-pix-pmt

* 'main' of github.com:juspay/hyperswitch: (33 commits)
  fix(connector): [Nexixpay] handle error code and message in failure response (#7713)
  fix(connector): [Coingate] Fix Wasm Changes  (#7716)
  fix(config): add billing payment sync configs in different environments (#7708)
  chore(dashboard): update dashboard toml (#7703)
  chore(postman): update auth for payment connectors in postman collection (#7702)
  feat(connector): [BANKOFAMERICA] Enable SamsungPay In Dashboard (#7677)
  feat(session): Added dpa_client_id, provider to click to pay session response (#7683)
  feat(core): add network error related columns in payment attempt [v2] (#7706)
  chore(version): 2025.04.04.0
  refactor(accounts): move accounts related tables to accounts schema (#7626)
  revert: implement `NameType` for name validation (#6734) (#7717)
  fix(errors): Entry not found error as 4xx instead of 5xx (#7712)
  refactor(analytics): default config for forex_enabled (#7695)
  refactor(core): made provider field in ctp_service_details backward compatible (#7705)
  refactor(openapi): modify profile-delete auth to AdminAPIKey in API doc (#7697)
  fix: web-docker pull from docker hub (#7700)
  ci(cypress): fix iatapay upi payments (#7698)
  docs: Updated next steps after deployment setup on Readme (#7686)
  chore(version): 2025.04.03.0
  fix(connector): [JPMORGAN, PAYU, DIGITALVIRGO, BITPAY, HELCIM, PAYBOX] Replaced lazystatic macros with LazyLock (#7524)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jarnura jarnura jarnura approved these changes

+1 more reviewer

@Narayanbhat166 Narayanbhat166 Narayanbhat166 approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@hrithikesh026 hrithikesh026

Labels
M-database-changes Metadata: This PR involves database schema changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[FEATURE] create accounts schema for accounts tables
4 participants
@hrithikesh026 @jarnura @Narayanbhat166 @Gnanasundari24