feat(refunds): Refunds aggregate api #5795

gitanjli525 · 2024-09-04T11:12:56Z

Type of Change

Description

Added new api for refunds status aggregate

Additional Changes

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

Motivation and Context

Closed #5796

How did you test it?

Request

curl --location 'http://localhost:8080/refunds/aggregate?start_time=2022-08-28T18%3A30%3A00Z' \
--header 'Content-Type: application/json' \
--header 'Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiZjNmYzEyNjYtZDQ2MS00NWU3LWFkMzEtODdlMDA4ZWVlYjZjIiwibWVyY2hhbnRfaWQiOiJtZXJjaGFudF8xNzI0NjYxNjQ3Iiwicm9sZV9pZCI6Im9yZ19hZG1pbiIsImV4cCI6MTcyNTYyMDQ1MSwib3JnX2lkIjoib3JnX3pXYVBBZDBxOGtxcnRpQzN4U3o3IiwicHJvZmlsZV9pZCI6bnVsbH0.VXacvv96BOspj033EFwKvaYdyqjlSNIzMFXYQ-DvsvE' \
--header 'Cookie: login_token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiZjNmYzEyNjYtZDQ2MS00NWU3LWFkMzEtODdlMDA4ZWVlYjZjIiwibWVyY2hhbnRfaWQiOiJtZXJjaGFudF8xNzI0NjYxNjQ3Iiwicm9sZV9pZCI6Im9yZ19hZG1pbiIsImV4cCI6MTcyNTYyMDQ1MSwib3JnX2lkIjoib3JnX3pXYVBBZDBxOGtxcnRpQzN4U3o3IiwicHJvZmlsZV9pZCI6bnVsbH0.VXacvv96BOspj033EFwKvaYdyqjlSNIzMFXYQ-DvsvE'

Response

{
    "status_with_count": {
        "pending": 0,
        "transaction_failure": 0,
        "success": 40,
        "failure": 0,
        "manual_review": 0
    }
}

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

semanticdiff-com · 2024-09-04T11:12:59Z

Review changes with SemanticDiff.

Analyzed 14 of 14 files.

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

	Filename	Status
✔️	crates/router_env/src/logger/types.rs	Analyzed
✔️	crates/router/src/types/storage/refund.rs	Analyzed
✔️	crates/router/src/routes/app.rs	Analyzed
✔️	crates/router/src/routes/lock_utils.rs	38.89% smaller
✔️	crates/router/src/routes/refunds.rs	Analyzed
✔️	crates/router/src/db/kafka_store.rs	Analyzed
✔️	crates/router/src/db/refund.rs	0.69% smaller
✔️	crates/router/src/core/refunds.rs	Analyzed
✔️	crates/openapi/src/openapi.rs	7.74% smaller
✔️	crates/openapi/src/openapi_v2.rs	7.74% smaller
✔️	crates/api_models/src/refunds.rs	Analyzed
✔️	crates/api_models/src/events/refund.rs	18.51% smaller
✔️	api-reference-v2/openapi_spec.json	Analyzed
✔️	api-reference/openapi_spec.json	Analyzed

…erswitch into refunds-aggregate-api

crates/api_models/src/refunds.rs

crates/router/src/core/refunds.rs

crates/router/src/db/kafka_store.rs

…erswitch into refunds-aggregate-api

gitanjli525 · 2024-09-09T11:57:41Z

Please fix above comments

updated the PR

crates/router/src/core/refunds.rs

crates/router/src/routes/refunds.rs

Chethan-rao · 2024-09-10T14:30:25Z

crates/router/src/core/refunds.rs

+    let refund_status_with_count = db
+        .get_refund_status_with_count(merchant.get_id(), &time_range, merchant.storage_scheme)
+        .await
+        .change_context(errors::ApiErrorResponse::InternalServerError)?;


please add attach_printable if you are raising Internal server error

Chethan-rao · 2024-09-10T14:43:31Z

crates/api_models/src/refunds.rs

@@ -234,6 +234,12 @@ pub struct RefundListFilters {
    pub refund_status: Vec<enums::RefundStatus>,
 }

+#[derive(Clone, Debug, serde::Serialize, ToSchema)]


Could you mention this type in openapi.rs module

…erswitch into refunds-aggregate-api

Chethan-rao · 2024-09-12T07:31:59Z

crates/router/src/core/refunds.rs

+        .get_refund_status_with_count(merchant.get_id(), &time_range, merchant.storage_scheme)
+        .await
+        .change_context(errors::ApiErrorResponse::InternalServerError)
+        .attach_printable("Failed to find status count")?;


Nit:

Suggested change

.attach_printable("Failed to find status count")?;

.attach_printable("Failed to find refund status count")?;

* 'main' of github.com:juspay/hyperswitch: (51 commits) feat(connector): [DEUTSCHEBANK] Integrate SEPA Payments (#5826) feat(payments_v2): payment intent diesel and domain models changes v2 (#5783) feat(connector): [Fiuu] ADD Wasm Configs (#5874) chore(version): 2024.09.13.0 refactor(core): Update shipping_cost and order_tax_amount to net_amount of payment_attempt (#5844) refactor: return optional request body from build_request_v2 in ConnectorIntegrationV2 trait (#5865) feat(refunds): Refunds aggregate api (#5795) refactor: handle redirections for iframed content (#5591) refactor(payment_links): Update API contract for dynamic transaction details and upgrade UI (#5849) fix(router): add payment_method check in `get_mandate_type` (#5828) fix(connector): [ZSL] compare consr_paid_amt with the total amount for identifying partial payments (#5873) feat(connector): [Novalnet] add Payment flows for cards (#5726) chore(version): 2024.09.12.0 fix(router): return `collect_billing_details_from_wallet_connector` if `always_collect_billing_details_from_wallet_connector ` is false in merchant payment method list (#5854) feat(opensearch): add profile_id and organization_id to /search APIs (#5705) build(deps): bump `sqlx` to `0.8.2` (#5859) refactor: Remove unwanted commented lines (#5851) feat(payments): add support for profile aggregates (#5845) Feat(connector): [Fiuu] Add DuitNow/FPX PaymentMethod (#5841) chore: remove Connectors enum dependency from ConnectorIntegrationV2 trait (#5840) ...

gitanjli525 added 2 commits September 4, 2024 15:57

refunds aggregate api changes

3aabc35

refunds aggregate api changes

f0d4d2f

gitanjli525 added the S-waiting-on-review Status: This PR has been implemented and needs to be reviewed label Sep 4, 2024

gitanjli525 self-assigned this Sep 4, 2024

gitanjli525 requested review from a team as code owners September 4, 2024 11:12

hyperswitch-bot bot and others added 3 commits September 4, 2024 11:15

chore: run formatter

f94b8a0

refunds aggregate api changes

0df6a38

refunds aggregate api changes

276162d

gitanjli525 added C-feature Category: Feature request or enhancement A-refunds Area: Refund flows A-users Area: Users labels Sep 4, 2024

gitanjli525 and others added 10 commits September 4, 2024 17:19

refunds aggregate api changes

f8f9b07

chore: address ci check

475b9f7

chore: run formatter

a2591fa

chore: address ci check

6ac6a5d

Merge branch 'refunds-aggregate-api' of https://github.com/juspay/hyp…

cdaab17

…erswitch into refunds-aggregate-api

Merge branch 'main' into refunds-aggregate-api

e5917bb

chore: address ci check

0de45d0

Merge branch 'refunds-aggregate-api' of https://github.com/juspay/hyp…

3a3d6d9

…erswitch into refunds-aggregate-api

chore: update branch

6ac4df2

Merge branch 'main' into refunds-aggregate-api

2e95703

gitanjli525 requested review from apoorvdixit88, racnan and ThisIsMani September 9, 2024 07:32

apoorvdixit88 reviewed Sep 9, 2024

View reviewed changes

crates/api_models/src/refunds.rs Outdated Show resolved Hide resolved

apoorvdixit88 reviewed Sep 9, 2024

View reviewed changes

crates/router/src/core/refunds.rs Show resolved Hide resolved

apoorvdixit88 reviewed Sep 9, 2024

View reviewed changes

crates/router/src/db/kafka_store.rs Outdated Show resolved Hide resolved

gitanjli525 added 2 commits September 9, 2024 17:07

chore: addresses comments

f318a71

Merge branch 'refunds-aggregate-api' of https://github.com/juspay/hyp…

53e52a4

…erswitch into refunds-aggregate-api

gitanjli525 requested a review from apoorvdixit88 September 9, 2024 11:58

apoorvdixit88 reviewed Sep 10, 2024

View reviewed changes

crates/router/src/core/refunds.rs Outdated Show resolved Hide resolved

chore: addresses comments

7383afc

apoorvdixit88 reviewed Sep 10, 2024

View reviewed changes

crates/router/src/routes/refunds.rs Outdated Show resolved Hide resolved

juspay deleted a comment from apoorvdixit88 Sep 10, 2024

chore: addresses comments

95ddb88

apoorvdixit88 previously approved these changes Sep 10, 2024

View reviewed changes

Chethan-rao requested changes Sep 10, 2024

View reviewed changes

chore: addresses comments

fb6fc2a

gitanjli525 dismissed apoorvdixit88’s stale review via fb6fc2a September 12, 2024 07:05

gitanjli525 requested review from Chethan-rao and apoorvdixit88 September 12, 2024 07:06

docs(openapi): re-generate OpenAPI specification

82bd5bb

hyperswitch-bot bot added the M-api-contract-changes Metadata: This PR involves API contract changes label Sep 12, 2024

gitanjli525 and others added 3 commits September 12, 2024 12:53

chore: addresses comments

408de34

Merge branch 'refunds-aggregate-api' of https://github.com/juspay/hyp…

17f7b55

…erswitch into refunds-aggregate-api

docs(openapi): re-generate OpenAPI specification

d6a760b

Chethan-rao approved these changes Sep 12, 2024

View reviewed changes

ShivanshMathurJuspay approved these changes Sep 12, 2024

View reviewed changes

SanchithHegde approved these changes Sep 12, 2024

View reviewed changes

apoorvdixit88 approved these changes Sep 12, 2024

View reviewed changes

Gnanasundari24 added this pull request to the merge queue Sep 12, 2024

Merged via the queue into main with commit 00386f3 Sep 12, 2024
12 of 14 checks passed

Gnanasundari24 deleted the refunds-aggregate-api branch September 12, 2024 13:57

gitanjli525 removed the S-waiting-on-review Status: This PR has been implemented and needs to be reviewed label Sep 19, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(refunds): Refunds aggregate api #5795

feat(refunds): Refunds aggregate api #5795

gitanjli525 commented Sep 4, 2024 •

edited

Loading

semanticdiff-com bot commented Sep 4, 2024 •

edited

Loading

gitanjli525 commented Sep 9, 2024

Chethan-rao Sep 10, 2024

Chethan-rao Sep 10, 2024

Chethan-rao Sep 12, 2024

	.attach_printable("Failed to find status count")?;
	.attach_printable("Failed to find refund status count")?;

feat(refunds): Refunds aggregate api #5795

feat(refunds): Refunds aggregate api #5795

Conversation

gitanjli525 commented Sep 4, 2024 • edited Loading

Type of Change

Description

Additional Changes

Motivation and Context

How did you test it?

Checklist

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

gitanjli525 commented Sep 9, 2024

Chethan-rao Sep 10, 2024

Choose a reason for hiding this comment

Chethan-rao Sep 10, 2024

Choose a reason for hiding this comment

Chethan-rao Sep 12, 2024

Choose a reason for hiding this comment

gitanjli525 commented Sep 4, 2024 •

edited

Loading

semanticdiff-com bot commented Sep 4, 2024 •

edited

Loading