-
Notifications
You must be signed in to change notification settings - Fork 11
feat(ACL-390): Add new data fields required for cVRP payments across all payment products #389
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
7395058
Add use cases to search provider endpoint
tl-tai-tang 1226c6e
Add use cases to get and search provider endpoint
tl-tai-tang d1dda44
move use case to common entities
tl-tai-tang c9d22e1
Add use case to mandate creation and retrieval
tl-tai-tang 3c5a1ec
spotless formatting
tl-tai-tang f4fb990
Add user interaction to payment creation and retrieval
tl-tai-tang 465fc61
add mandate test
tl-tai-tang 6336ea0
spotless format
tl-tai-tang 41602ed
add sub merchant business client id
tl-tai-tang d601e0e
Update src/main/java/com/truelayer/java/payments/entities/UserInterac…
tl-tai-tang 85c303d
rename commercial capability
tl-tai-tang 48075d6
bump change log and lib version
tl-tai-tang d1955e0
Bump version from 17.5.2 to 17.6.0
tl-tai-tang 7359108
Bump version to 17.6.0 and add payment API fields
tl-tai-tang fbe8d4a
address copilot feedback
tl-tai-tang 11712a5
Potential fix for pull request finding
tl-tai-tang 3880db4
revert mandate type back to String
tl-tai-tang a178d28
spotless formatting
tl-tai-tang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package com.truelayer.java.entities; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonValue; | ||
| import lombok.Getter; | ||
| import lombok.RequiredArgsConstructor; | ||
|
|
||
| @RequiredArgsConstructor | ||
| @Getter | ||
| public enum UseCase { | ||
| CHARITY("charity"), | ||
| FINANCIAL_SERVICES("financial_services"), | ||
| GOVERNMENT("government"), | ||
| UTILITIES("utilities"); | ||
|
|
||
| @JsonValue | ||
| private final String useCase; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
src/main/java/com/truelayer/java/payments/entities/UserInteraction.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package com.truelayer.java.payments.entities; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonValue; | ||
| import lombok.Getter; | ||
| import lombok.RequiredArgsConstructor; | ||
|
|
||
| @RequiredArgsConstructor | ||
| @Getter | ||
| public enum UserInteraction { | ||
| PRESENT("present"), | ||
| NOT_PRESENT("not_present"); | ||
|
|
||
| @JsonValue | ||
| private final String userInteraction; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
src/main/java/com/truelayer/java/paymentsproviders/entities/VrpCommercialCapabilities.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,16 @@ | ||
| package com.truelayer.java.paymentsproviders.entities; | ||
|
|
||
| import com.truelayer.java.entities.ProviderAvailability; | ||
| import com.truelayer.java.entities.UseCase; | ||
| import com.truelayer.java.payments.entities.ReleaseChannel; | ||
| import java.util.List; | ||
| import lombok.Value; | ||
|
|
||
| @Value | ||
| public class VrpCommercialCapabilities { | ||
| ReleaseChannel releaseChannel; | ||
|
|
||
| ProviderAvailability availability; | ||
|
|
||
| List<UseCase> useCases; | ||
| } |
6 changes: 5 additions & 1 deletion
6
.../truelayer/java/paymentsproviders/entities/searchproviders/VrpCommercialCapabilities.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,10 @@ | ||
| package com.truelayer.java.paymentsproviders.entities.searchproviders; | ||
|
|
||
| import com.truelayer.java.entities.UseCase; | ||
| import java.util.List; | ||
| import lombok.Value; | ||
|
|
||
| @Value | ||
| public class VrpCommercialCapabilities {} | ||
| public class VrpCommercialCapabilities { | ||
| List<UseCase> useCases; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
src/test/resources/__files/mandates/200.get_commercial_mandate_by_id.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| { | ||
| "status": "authorized", | ||
| "id": "string", | ||
| "type": "commercial", | ||
| "use_case": "financial_services", | ||
| "authorization_flow":{ | ||
| "actions":{ | ||
| "next":{ | ||
| "type":"provider_selection", | ||
| "providers":[ | ||
| { | ||
| "provider_id":"ob-bank-name", | ||
| "display_name":"Bank Name", | ||
| "icon_uri":"https://truelayer-provider-assets.s3.amazonaws.com/global/icon/generic.svg", | ||
| "logo_uri":"https://truelayer-provider-assets.s3.amazonaws.com/global/logos/generic.svg", | ||
| "bg_color":"#000000", | ||
| "country_code":"GB" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "currency": "GBP", | ||
| "beneficiary": { | ||
| "type": "merchant_account", | ||
| "id": "string", | ||
| "account_holder_name": "string" | ||
| }, | ||
| "reference": "a-mandate-ref", | ||
| "provider_selection":{ | ||
| "type":"preselected", | ||
| "provider_id": "a-provider-id", | ||
| "remitter": { | ||
| "account_holder_name": "Andrea Di Lisio", | ||
| "account_identifier": { | ||
| "type":"sort_code_account_number", | ||
| "sort_code":"040662", | ||
| "account_number":"00002723" | ||
| } | ||
| } | ||
| }, | ||
| "user": { | ||
| "id": "f9b48c9d-176b-46dd-b2da-fe1a2b77350c" | ||
| }, | ||
| "created_at": "2022-01-17T17:13:18.214924Z", | ||
| "authorized_at": "2022-01-17T17:13:18.214924Z", | ||
| "constraints": { | ||
| "valid_from": "2022-01-17T17:13:18.214924Z", | ||
| "valid_to": "2023-01-17T17:13:18.214924Z", | ||
| "maximum_individual_amount": 1, | ||
| "periodic_limits": { | ||
| "day": { | ||
| "maximum_amount": 0, | ||
| "period_alignment": "consent" | ||
| }, | ||
| "week": { | ||
| "maximum_amount": 0, | ||
| "period_alignment": "consent" | ||
| } | ||
| } | ||
| }, | ||
| "metadata": { | ||
| "a_custom_key": "a-value" | ||
| }, | ||
| "remitter": { | ||
| "account_holder_name": "Andrea Di Lisio", | ||
| "account_identifier": { | ||
| "type":"iban", | ||
| "iban":"GB53CLRB04066200002723" | ||
| } | ||
| } | ||
| } |
1 change: 1 addition & 0 deletions
1
src/test/resources/__files/mandates/200.get_mandate_by_id.authorization_required.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.