Skip to content
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

[PAGOPA-1164] psp business name #102

Merged
merged 4 commits into from
Aug 24, 2023
Merged

[PAGOPA-1164] psp business name #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2326a9f
[PAGOPA-1164] psp business name: first impl
pagopa-github-bot Aug 22, 2023
72166ec
[PAGOPA-1164] psp business name: update integration test
pagopa-github-bot Aug 22, 2023
eb6b03f
Merge branch 'PAGOPA-1164-psp-business-name' of https://github.com/pa…
Aug 24, 2023
35fb5dc
Merge branch 'main' into PAGOPA-1164-psp-business-name
alessio-acitelli Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions integration-test/src/config/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"validityDateTo": null,
"touchpoint": "ANY",
"paymentType": null,
"abi": 14156
"abi": 14156,
"pspBusinessName": "psp business name int-test-1"
},
{
"id": "int-test-2",
Expand All @@ -36,7 +37,8 @@
"validityDateFrom": null,
"validityDateTo": null,
"touchpoint": "ANY",
"abi": 14156
"abi": 14156,
"pspBusinessName": "psp business name int-test-2"
},
{
"id": "int-test-3",
Expand All @@ -56,7 +58,8 @@
"validityDateFrom": null,
"validityDateTo": null,
"touchpoint": "ANY",
"abi": 14156
"abi": 14156,
"pspBusinessName": "psp business name int-test-3"
},
{
"id": "int-test-4",
Expand All @@ -72,6 +75,7 @@
"maxPaymentAmount": 999999999999999,
"type": "GLOBAL",
"abi": 14156,
"pspBusinessName": "psp business name int-test-4",
"transferCategoryList": [
"TAX1"
],
Expand Down Expand Up @@ -102,7 +106,8 @@
],
"validityDateFrom": null,
"validityDateTo": null,
"abi": 14156
"abi": 14156,
"pspBusinessName": "psp business name int-test-5"
},
{
"id": "int-test-6",
Expand All @@ -121,7 +126,8 @@
"validityDateFrom": null,
"validityDateTo": null,
"paymentType": null,
"abi": 14156
"abi": 14156,
"pspBusinessName": "psp business name int-test-6"
},
{
"id": "int-test-7",
Expand All @@ -140,7 +146,8 @@
"validityDateFrom": null,
"validityDateTo": null,
"paymentType": null,
"abi": 14156
"abi": 14156,
"pspBusinessName": "psp business name int-test-7"
},
{
"id": "int-test-8",
Expand All @@ -159,7 +166,8 @@
"validityDateFrom": null,
"validityDateTo": null,
"paymentType": null,
"abi": 14156
"abi": 14156,
"pspBusinessName": "psp business name int-test-8"
},
{
"id": "int-test-9",
Expand All @@ -178,7 +186,8 @@
"validityDateFrom": null,
"validityDateTo": null,
"paymentType": null,
"abi": 14156
"abi": 14156,
"pspBusinessName": "psp business name int-test-9"
},
{
"id": "int-test-10",
Expand All @@ -197,7 +206,8 @@
"validityDateTo": null,
"touchpoint": "ANY",
"paymentType": "CP",
"abi": 36019
"abi": 36019,
"pspBusinessName": "psp business name int-test-10"
}
],
"ciBundles": [
Expand Down
9 changes: 6 additions & 3 deletions integration-test/src/features/getFeeByPsp.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ Feature: GetFeeByPsp
"idBrokerPsp": "88888888899",
"idChannel": "88888888899_01_ONUS",
"onUs": false,
"abi": "14156"
"abi": "14156",
"pspBusinessName": "psp business name int-test-1"
}
]
}
Expand Down Expand Up @@ -178,7 +179,8 @@ Feature: GetFeeByPsp
"idBrokerPsp": "88888888899",
"idChannel": "88888888899_01_ONUS",
"onUs": false,
"abi": "14156"
"abi": "14156",
"pspBusinessName": "psp business name int-test-7"
}
]
}
Expand Down Expand Up @@ -314,7 +316,8 @@ Feature: GetFeeByPsp
"idBrokerPsp": "88888888899",
"idChannel": "AMEX_ONUS",
"onUs": true,
"abi": "36019"
"abi": "36019",
"pspBusinessName": "psp business name int-test-10"
}
]
}
Expand Down
3 changes: 2 additions & 1 deletion integration-test/src/features/getFees.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ Feature: GetFees - Get List of fees by CI, amount, method, touchpoint
"idChannel": "88888888899_01_ONUS",
"idBrokerPsp": "88888888899",
"onUs": false,
"abi": "14156"
"abi": "14156",
"pspBusinessName": "psp business name int-test-7"
}
]
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/it/gov/pagopa/afm/calculator/entity/Bundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public class Bundle {
@PartitionKey private String idPsp;

private String abi;
private String pspBusinessName;

private String name;
private String description;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/it/gov/pagopa/afm/calculator/model/calculator/Transfer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public class Transfer implements Comparable<Transfer>, Serializable {
private String idBrokerPsp;
private Boolean onUs;
private String abi;
private String pspBusinessName;

@Override
public int compareTo(Transfer t) {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/it/gov/pagopa/afm/calculator/service/CalculatorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ private Transfer createTransfer(
.idChannel(bundle.getIdChannel())
.onUs(this.getOnUsValue(bundle, paymentOption))
.abi(bundle.getAbi())
.pspBusinessName(bundle.getPspBusinessName())
.build();
}

Expand Down
3 changes: 3 additions & 0 deletions src/test/java/it/gov/pagopa/afm/calculator/TestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ public static ValidBundle getMockGlobalValidBundle() {
.id("2")
.name("bundle2")
.idPsp("123")
.pspBusinessName("psp business name 2")
.paymentAmount(2L)
.minPaymentAmount(0L)
.maxPaymentAmount(1000L)
Expand All @@ -85,6 +86,7 @@ public static ValidBundle getMockValidBundle() {
.name("bundle1")
.idPsp("ABC")
.abi("14156")
.pspBusinessName("psp business name 1")
.paymentAmount(1L)
.minPaymentAmount(0L)
.maxPaymentAmount(1000L)
Expand All @@ -105,6 +107,7 @@ public static ValidBundle getMockAmexValidBundle() {
.idChannel("AMEX_ONUS")
.name("bundle1")
.idPsp("AMEX")
.pspBusinessName("psp business name amex")
.abi("36019")
.paymentAmount(1L)
.minPaymentAmount(0L)
Expand Down
3 changes: 2 additions & 1 deletion src/test/resources/responses/getAmexFees.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"idChannel": "AMEX_ONUS",
"idBrokerPsp": null,
"onUs": true,
"abi": "36019"
"abi": "36019",
"pspBusinessName": "psp business name amex"
}
]
}
3 changes: 2 additions & 1 deletion src/test/resources/responses/getFees.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"idChannel": "13212880150_07_ONUS",
"idBrokerPsp": null,
"onUs": true,
"abi": "14156"
"abi": "14156",
"pspBusinessName": "psp business name 1"
}
]
}
3 changes: 2 additions & 1 deletion src/test/resources/responses/getFees2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"idChannel": "13212880150_07_ONUS",
"idBrokerPsp": null,
"onUs": true,
"abi": "14156"
"abi": "14156",
"pspBusinessName": "psp business name 1"
}
]
}
3 changes: 2 additions & 1 deletion src/test/resources/responses/getFees3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"idChannel": "13212880150_07_ONUS",
"idBrokerPsp": null,
"onUs": true,
"abi": "14156"
"abi": "14156",
"pspBusinessName": "psp business name 1"
}
]
}
3 changes: 2 additions & 1 deletion src/test/resources/responses/getFeesNoInTransfer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"idChannel": null,
"idBrokerPsp": null,
"onUs": false,
"abi": null
"abi": null,
"pspBusinessName": "psp business name 2"
}
]
}
3 changes: 2 additions & 1 deletion src/test/resources/responses/getFeesPaymentTypeNull.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"idChannel": "13212880150_07_ONUS",
"idBrokerPsp": null,
"onUs": false,
"abi": "14156"
"abi": "14156",
"pspBusinessName": "psp business name 1"
}
]
}
3 changes: 2 additions & 1 deletion src/test/resources/responses/getFeesSubThreshold.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"idChannel": "13212880150_07_ONUS",
"idBrokerPsp": null,
"onUs": false,
"abi": "14156"
"abi": "14156",
"pspBusinessName": "psp business name 1"
}
]
}
Loading