Skip to content

[PIDM-863] paymenttypes-touchpoint-any #203

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[PIDM-863] paymenttypes-touchpoint-any #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0719cf8
fix: replace isEqualOrNull with isEqualOrAny
Oct 13, 2025
3641108
fix: replace null with any in data.json
Oct 13, 2025
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
14 changes: 7 additions & 7 deletions integration-test/src/config/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"validityDateFrom": null,
"validityDateTo": null,
"touchpoint": "ANY",
"paymentType": null,
"paymentType": "ANY",
"abi": 14156,
"pspBusinessName": "psp business name int-test-1",
"cart" : true,
Expand Down Expand Up @@ -87,7 +87,7 @@
"validityDateFrom": null,
"validityDateTo": null,
"touchpoint": "ANY",
"paymentType": null,
"paymentType": "ANY",
"cart" : true,
"onUs" : true
},
Expand Down Expand Up @@ -133,7 +133,7 @@
"type": "GLOBAL",
"validityDateFrom": null,
"validityDateTo": null,
"paymentType": null,
"paymentType": "ANY",
"abi": 14156,
"pspBusinessName": "psp business name int-test-6",
"cart" : true,
Expand All @@ -155,7 +155,7 @@
"type": "GLOBAL",
"validityDateFrom": null,
"validityDateTo": null,
"paymentType": null,
"paymentType": "ANY",
"abi": 14156,
"pspBusinessName": "psp business name int-test-7",
"cart" : true,
Expand All @@ -177,7 +177,7 @@
"type": "GLOBAL",
"validityDateFrom": null,
"validityDateTo": null,
"paymentType": null,
"paymentType": "ANY",
"abi": 14156,
"pspBusinessName": "psp business name int-test-8",
"cart" : true,
Expand All @@ -199,7 +199,7 @@
"type": "GLOBAL",
"validityDateFrom": null,
"validityDateTo": null,
"paymentType": null,
"paymentType": "ANY",
"abi": 14156,
"pspBusinessName": "psp business name int-test-9",
"cart" : true,
Expand Down Expand Up @@ -375,7 +375,7 @@
"validityDateFrom": null,
"validityDateTo": null,
"touchpoint": "ANY",
"paymentType": null,
"paymentType": "ANY",
"abi": 10101,
"pspBusinessName": "ZZZZZZZZZZ",
"cart" : true,
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/it/gov/pagopa/afm/calculator/repository/CosmosRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ private Iterable<ValidBundle> findValidBundlesMulti(PaymentOptionMulti paymentOp
"Cannot find payment type with name: '" + paymentOptionMulti.getPaymentMethod() + "'");
}

var paymentTypeFilter = isEqualOrNull("paymentType", paymentType.get().getName());
var paymentTypeFilter = isEqualOrAny("paymentType", paymentType.get().getName());
queryResult = and(queryResult, paymentTypeFilter);
}

Expand Down Expand Up @@ -304,7 +304,7 @@ private Iterable<ValidBundle> findValidBundles(PaymentOption paymentOption, bool
"Cannot find payment type with name: '" + paymentOption.getPaymentMethod() + "'");
}

var paymentTypeFilter = isEqualOrNull("paymentType", paymentType.get().getName());
var paymentTypeFilter = isEqualOrAny("paymentType", paymentType.get().getName());
queryResult = and(queryResult, paymentTypeFilter);
}

Expand Down
Loading