feat(connector): [Adyen] add dispute flows for adyen connector #5514

KiranKBR · 2024-08-02T10:33:41Z

Type of Change

Description

This PR will add dispute flows - accept,defend,submitEvidence to adyen connector

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?

Accept:

Submit Evidence:

Accept request:

curl --location 'http://127.0.0.1:8080/disputes/accept/4' \
--header 'Content-Type: application/json' \
--header 'Accept: application/json' \
--header 'api-key: dev_fa9dwFZSZMb3ff7RSv3pUo80lBHMK9ehompmReZFR0ChI6EdIjLqhHLgIPiPmAVT' \
--data '{
   "dispute_id" : "4",
   "connector_dispute_id" : "DZ4DPSHB4WD2WN82"
}'

response:

    "dispute_id": "4",
    "payment_id": "pay_CKkAkx5CUtC3XS70Y0zW",
    "attempt_id": "pay_CKkAkx5CUtC3XS70Y0zW_1",
    "amount": "6540",
    "currency": "USD",
    "dispute_stage": "dispute",
    "dispute_status": "dispute_accepted",
    "connector": "adyen",
    "connector_status": "open",
    "connector_dispute_id": "DZ4DPSHB4WD2WN82",
    "connector_reason": null,
    "connector_reason_code": null,
    "challenge_required_by": null,
    "connector_created_at": null,
    "connector_updated_at": null,
    "created_at": "2024-08-11T13:17:27.165Z",
    "profile_id": null,
    "merchant_connector_id": null
}

Submit evidence:

curl --location 'http://127.0.0.1:8080/disputes/evidence' \
--header 'Content-Type: application/json' \
--header 'Accept: application/json' \
--header 'api-key: dev_fa9dwFZSZMb3ff7RSv3pUo80lBHMK9ehompmReZFR0ChI6EdIjLqhHLgIPiPmAVT' \
--data '{
   "dispute_id" : "4",
   "refund_policy" : "file_AB3d0rudo4VuIMdCflbE"
}'

response:

{
    "dispute_id": "4",
    "payment_id": "pay_CKkAkx5CUtC3XS70Y0zW",
    "attempt_id": "pay_CKkAkx5CUtC3XS70Y0zW_1",
    "amount": "6540",
    "currency": "USD",
    "dispute_stage": "dispute",
    "dispute_status": "dispute_challenged",
    "connector": "adyen",
    "connector_status": "open",
    "connector_dispute_id": "DZ4DPSHB4WD2WN82",
    "connector_reason": null,
    "connector_reason_code": null,
    "challenge_required_by": null,
    "connector_created_at": null,
    "connector_updated_at": null,
    "created_at": "2024-08-11T13:17:27.165Z",
    "profile_id": null,
    "merchant_connector_id": null
}

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 · 2024-08-06T13:29:16Z

config/config.example.toml

@@ -181,6 +181,7 @@ hash_key = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
 aci.base_url = "https://eu-test.oppwa.com/"
 adyen.base_url = "https://checkout-test.adyen.com/"
 adyen.secondary_base_url = "https://pal-test.adyen.com/"
+adyen.third_base_url = "https://ca-test.adyen.com/ca/services/DisputeService/v30/"


Can we proper naming convention stating the usecase of the newly added url?

Please don't add the url path (ca/services/DisputeService/v30/) in base_url

Can we proper naming convention stating the usecase of the newly added url?

It can be used by other connectors for other use cases in future so it is better to be like that

sai-harsha-vardhan · 2024-08-07T07:37:39Z

crates/hyperswitch_domain_models/src/router_request_types.rs

    pub cancellation_policy: Option<Vec<u8>>,
+    pub cancellation_policy_type: Option<String>,


Suggested change

pub cancellation_policy_type: Option<String>,

pub cancellation_policy_file_type: Option<String>,

sai-harsha-vardhan · 2024-08-07T07:38:12Z

crates/hyperswitch_domain_models/src/router_request_types.rs

    pub cancellation_policy: Option<Vec<u8>>,
+    pub cancellation_policy_type: Option<String>,


Please follow the same convention for all the other newly added fields

sai-harsha-vardhan · 2024-08-07T07:41:28Z

crates/router/src/connector/adyen.rs

@@ -52,16 +50,18 @@ impl Adyen {
        }
    }
 }
-
+fn get_key(auth_type: &types::ConnectorAuthType) -> CustomResult<String, errors::ConnectorError> {


Can we move this to transformers and name it more meaningful?

sai-harsha-vardhan · 2024-08-07T13:27:14Z

crates/router/src/connector/adyen.rs

+    ) -> CustomResult<types::AcceptDisputeRouterData, errors::ConnectorError> {
+        Ok(types::AcceptDisputeRouterData {
+            response: Ok(types::AcceptDisputeResponse {
+                dispute_status: api::enums::DisputeStatus::DisputeAccepted,


We can't hardcode the status here, when we get a 200 response.

Instead, we need to consume the body and decide the status

{ "disputeServiceResult": { "success": true } }

sai-harsha-vardhan · 2024-08-07T13:34:34Z

crates/router/src/connector/adyen.rs

+    ) -> CustomResult<types::SubmitEvidenceRouterData, errors::ConnectorError> {
+        Ok(types::SubmitEvidenceRouterData {
+            response: Ok(types::SubmitEvidenceResponse {
+                dispute_status: api_models::enums::DisputeStatus::DisputeChallenged,


Please consume the response body and decide the status

sai-harsha-vardhan · 2024-08-07T13:35:24Z

crates/router/src/connector/adyen.rs

+}
+#[async_trait::async_trait]
+impl api::FileUpload for Adyen {
+    fn validate_file_upload(


Can you please add validations specific to adyen connector, https://help.adyen.com/knowledge/risk/dispute-management/what-are-the-specific-defense-requirements

sai-harsha-vardhan · 2024-08-07T13:39:47Z

crates/router/src/connector/adyen/transformers.rs

+        Ok(Self {
+            dispute_psp_reference: item.request.connector_dispute_id.clone(),
+            merchant_account_code,
+            defense_reason_code: "SupplyDefenseMaterial".into(),


Can you please attach the screenshot of adyen support confirming the usage of SupplyDefenseMaterial in all Defend dispute requests?

What about the production environment?

Yes, We can use this for production also

sai-harsha-vardhan · 2024-08-07T13:49:22Z

crates/router/src/connector/adyen/transformers.rs

+        defense_documents.push(DefenseDocuments {
+            content: get_content(service_documentation),
+            content_type: item.service_documentation_type,
+            defense_document_type_code: "DefenseMaterial".into(),


Should we take this as an input from the merchant, or is it okay to hardcode it to be DefenseMaterial?

It is okay to be DefenceMaterial

Did we get a confirmation for this from adyen for production environment? : Yes We got that

Yes We can use that

sai-harsha-vardhan · 2024-08-07T13:51:02Z

crates/router/src/core/files/helpers.rs

@@ -175,9 +175,9 @@ pub async fn retrieve_file_and_provider_file_id_from_file_id(
    merchant_account: &domain::MerchantAccount,
    key_store: &domain::MerchantKeyStore,
    is_connector_file_data_required: api::FileDataRequired,
-) -> CustomResult<(Option<Vec<u8>>, Option<String>), errors::ApiErrorResponse> {
+) -> CustomResult<(Option<Vec<u8>>, Option<String>, Option<String>), errors::ApiErrorResponse> {


Instead of returning a tuple with 3 elements, please create a struct for this

sai-harsha-vardhan · 2024-08-09T07:37:01Z

crates/api_models/src/disputes.rs

@@ -49,6 +49,11 @@ pub struct DisputeResponse {
    pub merchant_connector_id: Option<String>,
 }

+pub struct FileInfo {


Why is this struct defined in api_models? We can consider this moving into hyperswitch domain models

sai-harsha-vardhan · 2024-08-09T07:38:10Z

crates/hyperswitch_interfaces/src/configs.rs

    pub adyenplatform: ConnectorParams,
    #[cfg(not(feature = "payouts"))]
-    pub adyen: ConnectorParams,
+    pub adyen: ConnectorParamsWithThreeBaseUrls,


Previously this didn't have a secondary_base_url, why are we adding it now?

sai-harsha-vardhan · 2024-08-09T07:43:15Z

crates/router/src/connector/adyen.rs

+            .response
+            .parse_struct("AdyenDisputeResponse")
+            .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
+        if response.success {


Can we move this block to transformers please?

sai-harsha-vardhan · 2024-08-09T07:43:48Z

crates/router/src/connector/adyen.rs

+            .response
+            .parse_struct("AdyenDisputeResponse")
+            .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
+        if response.success {


Can we move this block to transformers please?

sai-harsha-vardhan · 2024-08-09T07:44:18Z

crates/router/src/connector/adyen.rs

+            .parse_struct("AdyenDisputeResponse")
+            .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
+
+        if response.success {


Can we move this block to transformers please and try to reuse the same function?

sai-harsha-vardhan · 2024-08-09T07:45:49Z

crates/router/src/connector/adyen/transformers.rs

+        Ok(Self {
+            dispute_psp_reference: item.request.connector_dispute_id.clone(),
+            merchant_account_code,
+            defense_reason_code: "SupplyDefenseMaterial".into(),


What about the production environment?

sai-harsha-vardhan · 2024-08-09T07:46:36Z

crates/router/src/connector/adyen/transformers.rs

+        defense_documents.push(DefenseDocuments {
+            content: get_content(service_documentation),
+            content_type: item.service_documentation_type,
+            defense_document_type_code: "DefenseMaterial".into(),


Did we get a confirmation for this from adyen for production environment? : Yes We got that

sai-harsha-vardhan · 2024-08-12T07:17:40Z

crates/hyperswitch_interfaces/src/configs.rs

@@ -11,7 +11,7 @@ use serde::Deserialize;
 pub struct Connectors {
    pub aci: ConnectorParams,
    #[cfg(feature = "payouts")]
-    pub adyen: ConnectorParamsWithSecondaryBaseUrl,
+    pub adyen: ConnectorParamsWithThreeBaseUrls,
    pub adyenplatform: ConnectorParams,
    #[cfg(not(feature = "payouts"))]
    pub adyen: ConnectorParams,


Irrespective of payout feature being enabled, we would need this url for disputes right?

sai-harsha-vardhan · 2024-08-12T07:19:19Z

CI checks are failing, please check @KiranKBR

sai-harsha-vardhan

LGTM

SamraatBansal · 2024-08-13T07:04:21Z

crates/router/src/connector/adyen.rs

+                if (file_type.to_string().as_str() == "image/jpeg"
+                    || file_type.to_string().as_str() == "image/jpeg")


This OR clause is checking same thing, please updated with intended check

jarnura · 2024-08-14T03:38:58Z

@sai-harsha-vardhan Should we make FileData's vec<u8> to Secret<vec<u8>>? I feel we should make them into secret.

sai-harsha-vardhan · 2024-08-14T04:14:58Z

Yes @jarnura, We can make File data as Secret<vec<u8>>. @KiranKBR Can you please make this change?

KiranKBR · 2024-08-14T08:52:28Z

Yes @jarnura, We can make File data as Secret<vec<u8>>. @KiranKBR Can you please make this change?

We r are sending connector request with aggregated string of vec so we can make that string as Secret

Updae: struct has updated

* 'main' of github.com:juspay/hyperswitch: feat(connector): [Adyen] add dispute flows for adyen connector (#5514) chore(version): 2024.08.23.0 feat(router): [cybersource] add disable_avs and disable_cvn flag in connector metadata (#5667) feat(customer_v2): add route for customer retrieve v2 (#5516) chore(version): 2024.08.22.1 fix(router): [Adyen] prevent partial submission of billing address and add required fields for all payment methods (#5660) docs(README): Adding Contributors guide (#5184) Docs: Adding redirect url details (#5507) feat(global_id): create a `GlobalId` domain type (#5644) feat(router): collect customer address details based on business profile config regardless of connector required fields (#5418) feat: add new routes for profile level list apis (#5589) refactor(core): Refactor fallback routing behaviour in payments for v2 (#5642) refactor(router): add connector_transaction_id, send response body and use admin_api_auth_with_merchant_id for payments manual update flow (#5658)

* 'main' of github.com:juspay/hyperswitch: (134 commits) refactor(open_banking): Added merchant data update in mca update (#5655) feat: add test_mode for quickly testing payout links (#5669) refactor: introduce a domain type for profile ID (#5687) ci(cypress): update paybox configs (#5664) feat(openapi): Add open api routes for routing v2 (#5686) feat(connector): [NOVALNET] Add template code (#5670) feat(user): business email update (#5674) chore(config): add production connector-configs for netcetera external 3ds flow (#5698) chore(version): 2024.08.27.0 refactor(euclid): make the disabled node's relation as negative (#5701) feat: populate payment method details in payments response (#5661) build(deps): bump `diesel` to `2.2.3` and `sqlx` to `0.8.1` (#5688) feat(customer_v2): added list customer v2 end point (#5517) feat(business_profile): add tax_connector_id column in business_profile table (#5576) chore: create v2 route for organization (#5679) refactor(payments_response): remove setter from payments response (#5676) feat(payment_methods_v2): Payment methods v2 API models (#5564) chore(version): 2024.08.26.0 feat(connector): [Adyen] add dispute flows for adyen connector (#5514) chore(version): 2024.08.23.0 ...

add dispute flows for adyen

e5c0f62

KiranKBR requested review from a team as code owners August 2, 2024 10:33

KiranKBR changed the title ~~add dispute flows for adyen~~ feat(connector): [Adyen] add dispute flows for adyen connector Aug 2, 2024

resolve clippy issues

7d2c714

KiranKBR force-pushed the adyene-dispute-defend branch from c8f2f1c to 7d2c714 Compare August 2, 2024 12:57

KiranKBR added 3 commits August 2, 2024 19:04

resolve clippy issues

6737834

change file_id to file_data

9be43cb

add changes to toml files

8f005fc

KiranKBR force-pushed the adyene-dispute-defend branch from 7374cf8 to 8f005fc Compare August 5, 2024 11:56

KiranKBR added 2 commits August 5, 2024 17:44

do clippy changes

4504e09

changes to configs urls

a384d96

KiranKBR force-pushed the adyene-dispute-defend branch from 82bf8da to a384d96 Compare August 6, 2024 03:50

KiranKBR added 2 commits August 6, 2024 10:39

change connectorParams

7162cb6

add file upload flow

4b23ad1

sai-harsha-vardhan requested changes Aug 7, 2024

View reviewed changes

resolve comments

635ca1c

KiranKBR force-pushed the adyene-dispute-defend branch from 7d55c76 to 635ca1c Compare August 7, 2024 21:27

resolve comments

86080df

KiranKBR force-pushed the adyene-dispute-defend branch from 1e839ad to 86080df Compare August 8, 2024 09:57

sai-harsha-vardhan requested changes Aug 9, 2024

View reviewed changes

resolve comments

555bbfe

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

resolve clippy issues

71853aa

KiranKBR force-pushed the adyene-dispute-defend branch from 759fe1a to 71853aa Compare August 12, 2024 04:40

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

sai-harsha-vardhan reviewed Aug 12, 2024

View reviewed changes

change for ConnectorParamsWithThreeBaseUrls

a4ca9cc

KiranKBR force-pushed the adyene-dispute-defend branch from fa954c1 to 29611c2 Compare August 12, 2024 10:57

sai-harsha-vardhan previously approved these changes Aug 12, 2024

View reviewed changes

SamraatBansal assigned KiranKBR Aug 13, 2024

SamraatBansal added A-connector-integration Area: Connector integration C-feature Category: Feature request or enhancement labels Aug 13, 2024

SamraatBansal added this to the August 2024 Release milestone Aug 13, 2024

SamraatBansal requested changes Aug 13, 2024

View reviewed changes

resolve comments

cd93e54

KiranKBR dismissed sai-harsha-vardhan’s stale review via cd93e54 August 13, 2024 07:42

KiranKBR force-pushed the adyene-dispute-defend branch from e5597b7 to cd93e54 Compare August 13, 2024 07:42

SamraatBansal previously approved these changes Aug 13, 2024

View reviewed changes

sai-harsha-vardhan previously approved these changes Aug 13, 2024

View reviewed changes

make request string to Secret<String>

260046d

KiranKBR dismissed stale reviews from sai-harsha-vardhan and SamraatBansal via 260046d August 14, 2024 09:17

KiranKBR force-pushed the adyene-dispute-defend branch from a72e67d to 260046d Compare August 14, 2024 09:17

Merge branch 'main' into adyene-dispute-defend

56d3360

jarnura approved these changes Aug 14, 2024

View reviewed changes

SamraatBansal approved these changes Aug 14, 2024

View reviewed changes

KiranKBR requested a review from sai-harsha-vardhan August 14, 2024 15:06

sai-harsha-vardhan approved these changes Aug 14, 2024

View reviewed changes

Gnanasundari24 added this pull request to the merge queue Aug 23, 2024

Merged via the queue into main with commit ad9f91b Aug 23, 2024
26 checks passed

Gnanasundari24 deleted the adyene-dispute-defend branch August 23, 2024 07:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(connector): [Adyen] add dispute flows for adyen connector #5514

feat(connector): [Adyen] add dispute flows for adyen connector #5514

KiranKBR commented Aug 2, 2024 •

edited

Loading

sai-harsha-vardhan Aug 6, 2024

sai-harsha-vardhan Aug 6, 2024

KiranKBR Aug 7, 2024

sai-harsha-vardhan Aug 7, 2024

sai-harsha-vardhan Aug 7, 2024

sai-harsha-vardhan Aug 7, 2024

sai-harsha-vardhan Aug 7, 2024

sai-harsha-vardhan Aug 7, 2024

sai-harsha-vardhan Aug 7, 2024

sai-harsha-vardhan Aug 7, 2024

KiranKBR Aug 7, 2024

sai-harsha-vardhan Aug 9, 2024

KiranKBR Aug 9, 2024

sai-harsha-vardhan Aug 7, 2024

KiranKBR Aug 7, 2024

sai-harsha-vardhan Aug 9, 2024 •

edited by KiranKBR

Loading

KiranKBR Aug 9, 2024

sai-harsha-vardhan Aug 7, 2024

sai-harsha-vardhan Aug 9, 2024

sai-harsha-vardhan Aug 9, 2024

sai-harsha-vardhan Aug 9, 2024

sai-harsha-vardhan Aug 9, 2024

sai-harsha-vardhan Aug 9, 2024

sai-harsha-vardhan Aug 9, 2024

sai-harsha-vardhan Aug 9, 2024 •

edited by KiranKBR

Loading

sai-harsha-vardhan Aug 12, 2024

sai-harsha-vardhan commented Aug 12, 2024

sai-harsha-vardhan left a comment

SamraatBansal Aug 13, 2024

jarnura commented Aug 14, 2024

sai-harsha-vardhan commented Aug 14, 2024 •

edited

Loading

KiranKBR commented Aug 14, 2024 •

edited

Loading

		pub cancellation_policy: Option<Vec<u8>>,
		pub cancellation_policy_type: Option<String>,

	pub cancellation_policy_type: Option<String>,
	pub cancellation_policy_file_type: Option<String>,

		if (file_type.to_string().as_str() == "image/jpeg"
		\|\| file_type.to_string().as_str() == "image/jpeg")

feat(connector): [Adyen] add dispute flows for adyen connector #5514

feat(connector): [Adyen] add dispute flows for adyen connector #5514

Conversation

KiranKBR commented Aug 2, 2024 • edited Loading

Type of Change

Description

Additional Changes

Motivation and Context

How did you test it?

Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sai-harsha-vardhan Aug 9, 2024 • edited by KiranKBR Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sai-harsha-vardhan Aug 9, 2024 • edited by KiranKBR Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sai-harsha-vardhan commented Aug 12, 2024

sai-harsha-vardhan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jarnura commented Aug 14, 2024

sai-harsha-vardhan commented Aug 14, 2024 • edited Loading

KiranKBR commented Aug 14, 2024 • edited Loading

KiranKBR commented Aug 2, 2024 •

edited

Loading

sai-harsha-vardhan Aug 9, 2024 •

edited by KiranKBR

Loading

sai-harsha-vardhan Aug 9, 2024 •

edited by KiranKBR

Loading

sai-harsha-vardhan commented Aug 14, 2024 •

edited

Loading

KiranKBR commented Aug 14, 2024 •

edited

Loading