Skip to content

refactor(router): remove admin v2 intermediate features#5780

Merged
likhinbopanna merged 20 commits intomainfrom
remove_merchant_connector_account_v2
Sep 4, 2024
Merged

refactor(router): remove admin v2 intermediate features#5780
likhinbopanna merged 20 commits intomainfrom
remove_merchant_connector_account_v2

Conversation

@sai-harsha-vardhan
Copy link
Contributor

@sai-harsha-vardhan sai-harsha-vardhan commented Sep 3, 2024

Type of Change

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

Description

remove intermediate admin features for v2

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?

Sanity admin, payments, captures and refunds for v1 & v2

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

@sai-harsha-vardhan sai-harsha-vardhan requested review from a team as code owners September 3, 2024 08:06
@semanticdiff-com
Copy link

semanticdiff-com bot commented Sep 3, 2024 •
edited
Loading

Review changes with SemanticDiff.

Analyzed 51 of 71 files.

Overall, the semantic diff is 55% smaller than the GitHub diff.

1 files do not contain logic changes.

File Information
Filename Status
❔ Dockerfile Unsupported file format
❔ Makefile Unsupported file format
❔ justfile Unsupported file format
❔ scripts/ci-checks-v2.sh Unsupported file format
❔ crates/storage_impl/Cargo.toml Unsupported file format
❔ crates/scheduler/Cargo.toml Unsupported file format
❔ crates/router/Cargo.toml Unsupported file format
✔️ crates/router/src/utils.rs 58.17% smaller
✔️ crates/router/src/utils/connector_onboarding.rs 54.37% smaller
✔️ crates/router/src/utils/user/sample_data.rs 54.91% smaller
✔️ crates/router/src/types/transformers.rs 57.49% smaller
✔️ crates/router/src/types/domain/user.rs 54.91% smaller
✔️ crates/router/src/types/api/admin.rs 50.1% smaller
✔️ crates/router/src/routes/admin.rs 54.26% smaller
✔️ crates/router/src/routes/api_keys.rs 48.22% smaller
✔️ crates/router/src/routes/app.rs 72.5% smaller
✔️ crates/router/src/routes/routing.rs 71.75% smaller
✔️ crates/router/src/db/kafka_store.rs 58.4% smaller
✔️ crates/router/src/db/merchant_account.rs 54.91% smaller
✔️ crates/router/src/db/merchant_connector_account.rs 57.78% smaller
✔️ crates/router/src/core/admin.rs 60.05% smaller
✔️ crates/router/src/core/conditional_config.rs 48.22% smaller
✔️ crates/router/src/core/fraud_check.rs 48.38% smaller
✔️ crates/router/src/core/payments.rs 55.21% smaller
✔️ crates/router/src/core/pm_auth.rs 54.37% smaller
✔️ crates/router/src/core/routing.rs 49.43% smaller
✔️ crates/router/src/core/surcharge_decision_config.rs 48.22% smaller
✔️ crates/router/src/core/user_role.rs No logic changes found
✔️ crates/router/src/core/utils.rs 43.24% smaller
✔️ crates/router/src/core/verification.rs 54.37% smaller
✔️ crates/router/src/core/webhooks/incoming.rs 57.49% smaller
✔️ crates/router/src/core/verification/utils.rs 54.37% smaller
✔️ crates/router/src/core/user/dashboard_metadata.rs 54.37% smaller
✔️ crates/router/src/core/routing/helpers.rs 38.29% smaller
✔️ crates/router/src/core/payouts/validator.rs 54.91% smaller
✔️ crates/router/src/core/payments/helpers.rs 59.98% smaller
✔️ crates/router/src/core/payments/routing.rs 57.38% smaller
✔️ crates/router/src/core/payments/operations/payment_create.rs 61.15% smaller
✔️ crates/router/src/core/payments/operations/payment_session.rs 61.18% smaller
✔️ crates/router/src/core/payment_methods/cards.rs 65.43% smaller
✔️ crates/router/src/core/payment_methods/validator.rs 54.91% smaller
✔️ crates/router/src/core/connector_onboarding/paypal.rs 54.37% smaller
❔ crates/pm_auth/Cargo.toml Unsupported file format
❔ crates/openapi/Cargo.toml Unsupported file format
❔ crates/kgraph_utils/Cargo.toml Unsupported file format
✔️ crates/kgraph_utils/src/mca.rs 57.49% smaller
✔️ crates/kgraph_utils/benches/evaluation.rs 54.37% smaller
❔ crates/hyperswitch_interfaces/Cargo.toml Unsupported file format
❔ crates/hyperswitch_domain_models/Cargo.toml Unsupported file format
✔️ crates/hyperswitch_domain_models/src/business_profile.rs 49.7% smaller
✔️ crates/hyperswitch_domain_models/src/consts.rs 62.12% smaller
✔️ crates/hyperswitch_domain_models/src/merchant_account.rs 49.17% smaller
✔️ crates/hyperswitch_domain_models/src/merchant_connector_account.rs 47.78% smaller
❔ crates/hyperswitch_connectors/Cargo.toml Unsupported file format
❔ crates/external_services/Cargo.toml Unsupported file format
❔ crates/euclid_wasm/Cargo.toml Unsupported file format
❔ crates/diesel_models/Cargo.toml Unsupported file format
✔️ crates/diesel_models/src/business_profile.rs 48.42% smaller
✔️ crates/diesel_models/src/merchant_account.rs 49.17% smaller
✔️ crates/diesel_models/src/merchant_connector_account.rs 47.78% smaller
✔️ crates/diesel_models/src/organization.rs 47.92% smaller
✔️ crates/diesel_models/src/query/business_profile.rs 48.22% smaller
✔️ crates/diesel_models/src/query/merchant_account.rs 48.22% smaller
✔️ crates/diesel_models/src/query/merchant_connector_account.rs 47.78% smaller
✔️ crates/diesel_models/src/query/organization.rs 37.51% smaller
❔ crates/connector_configs/Cargo.toml Unsupported file format
❔ crates/api_models/Cargo.toml Unsupported file format
✔️ crates/api_models/src/admin.rs 47.99% smaller
✔️ crates/api_models/src/routing.rs Analyzed
❔ crates/analytics/Cargo.toml Unsupported file format
❔ .github/workflows/CI-pr.yml Unsupported file format

@hyperswitch-bot hyperswitch-bot bot added the M-database-changes Metadata: This PR involves database schema changes label Sep 3, 2024
@sai-harsha-vardhan sai-harsha-vardhan changed the title refactor(router): remove intermediate admin features for v2 refactor(router): remove admin v2 intermediate features Sep 3, 2024
@hyperswitch-bot hyperswitch-bot bot removed the M-database-changes Metadata: This PR involves database schema changes label Sep 3, 2024
@sai-harsha-vardhan sai-harsha-vardhan self-assigned this Sep 3, 2024
@sai-harsha-vardhan sai-harsha-vardhan added A-core Area: Core flows C-refactor Category: Refactor api-v2 labels Sep 3, 2024
@sai-harsha-vardhan sai-harsha-vardhan added this to the August 2024 Release milestone Sep 3, 2024
@hyperswitch-bot hyperswitch-bot bot added M-database-changes Metadata: This PR involves database schema changes M-api-contract-changes Metadata: This PR involves API contract changes labels Sep 3, 2024
@sai-harsha-vardhan sai-harsha-vardhan changed the base branch from remove_merchant_account_v2 to main September 3, 2024 11:55
@hyperswitch-bot hyperswitch-bot bot removed M-database-changes Metadata: This PR involves database schema changes M-api-contract-changes Metadata: This PR involves API contract changes labels Sep 3, 2024
Narayanbhat166
Narayanbhat166 previously approved these changes Sep 3, 2024
View reviewed changes
SanchithHegde
SanchithHegde reviewed Sep 3, 2024
View reviewed changes
Makefile
Comment on lines 114 to +115
hack:
cargo hack check --workspace --each-feature --all-targets --exclude-features 'v2 merchant_account_v2 payment_v2'
cargo hack check --workspace --each-feature --all-targets --exclude-features 'v2 payment_v2'
Copy link
Member

@SanchithHegde SanchithHegde Sep 3, 2024

Choose a reason for hiding this comment

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

We can remove this target / recipe if we're not using it actively.

crates/router/src/routes/admin.rs
@@ -206,10 +206,7 @@ pub async fn delete_merchant_account(
/// Merchant Connector - Create
Copy link
Member

@SanchithHegde SanchithHegde Sep 3, 2024

Choose a reason for hiding this comment

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

Nit: We can remove the doc comments here, since they're anyway being read from the openapi crate for the purpose of the OpenAPI documentation. Can be taken up in a separate PR.

Copy link
Contributor Author

@sai-harsha-vardhan sai-harsha-vardhan Sep 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

will take this up in next PR

@SanchithHegde
Copy link
Member

SanchithHegde commented Sep 3, 2024

Can you also please update docs/building_docker_images.md with the updates docker build commands?

ThisIsMani
ThisIsMani approved these changes Sep 4, 2024
View reviewed changes
Copy link
Contributor

@ThisIsMani ThisIsMani left a comment

Choose a reason for hiding this comment

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

Dashboard specific changes looks fine.

@sai-harsha-vardhan sai-harsha-vardhan removed the request for review from a team September 4, 2024 08:23
@likhinbopanna likhinbopanna added this pull request to the merge queue Sep 4, 2024
Merged via the queue into main with commit b853226 Sep 4, 2024
@likhinbopanna likhinbopanna deleted the remove_merchant_connector_account_v2 branch September 4, 2024 08:52
pixincreate added a commit that referenced this pull request Sep 5, 2024
@pixincreate
Merge branch 'main' of github.com:juspay/hyperswitch into cypress-v2
c16b53c 
* 'main' of github.com:juspay/hyperswitch:
  feat(customer_v2): Add customer V2 delete api (#5518)
  chore(version): 2024.09.05.0
  feat(user_roles): get user role details (#5777)
  feat(users): Add profile level invites (#5793)
  refactor(router): profile based routes for payouts (#5794)
  Feat(connector): [Fiuu] Add Card Flows (#5786)
  fix(cypress): fix fiservemea configs for cypress (#5772)
  fix(cypress): `api_key` check in cypress (#5787)
  feat(payment_methods_v2): Implemented Diesel and Domain models for v2 (#5700)
  fix(payout): query for getting a list of active payout IDs (#5771)
  refactor(router): remove admin v2 intermediate features (#5780)
  feat(revert): populate payment method details in payments response (#5785)
  chore(version): 2024.09.04.0
  fix(connector): skip 3DS in `network_transaction_id` flow for cybersource (#5781)
  refactor(euclid): check the authenticity of profile_id being used (#5647)
  feat(analytics): refactor and introduce analytics APIs to accommodate OrgLevel, MerchantLevel and ProfileLevel authentication (#5729)
  fix(router): make customer details None in the `Psync` flow if the customer is deleted (#5732)
  feat(connector): [DEUTSCHE] Add template code (#5774)
  chore(version): 2024.09.03.1
  fix(router): send post message to window.parent instead of window.top in external 3ds flow (#5778)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SanchithHegde SanchithHegde SanchithHegde approved these changes

@tsdk02 tsdk02 tsdk02 approved these changes

@ShankarSinghC ShankarSinghC ShankarSinghC approved these changes

@ThisIsMani ThisIsMani ThisIsMani approved these changes

@swangi-kumari swangi-kumari swangi-kumari approved these changes

+1 more reviewer

@Narayanbhat166 Narayanbhat166 Narayanbhat166 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@sai-harsha-vardhan sai-harsha-vardhan

Labels

A-core Area: Core flows api-v2 C-refactor Category: Refactor

Projects

None yet

Milestone

August 2024 Release

Development

Successfully merging this pull request may close these issues.

9 participants

@sai-harsha-vardhan @SanchithHegde @Narayanbhat166 @tsdk02 @ShankarSinghC @ThisIsMani @swangi-kumari @likhinbopanna @Aprabhat19