Skip to content

[MODORDSTOR-407] Updated CQL queries to use the new indices #1244

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
damien-git wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[MODORDSTOR-407] Updated CQL queries to use the new indices #1244

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
b217e2e
[MODORDSTOR-407] Updated search for lines with an encumbrance
damien-git Feb 18, 2026
d4f94af
[MODORDSTOR-407] Another index change; fixed unit tests
damien-git Feb 18, 2026
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
2 changes: 1 addition & 1 deletion src/main/java/org/folio/service/orders/OrderRolloverService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public class OrderRolloverService {
private static final String PO_LINE_FUND_DISTR_QUERY = "poLine.fundDistribution =/@fundId %s";
// Following cql query filters orders whose po lines do not contain 'encumbrance' value in the entire fundDistribution array.
// That condition skips orders already processed in previous fiscal years.
private static final String PO_LINE_NON_EMPTY_ENCUMBRANCE_QUERY = "poLine.fundDistribution == \"*\\\"encumbrance\\\": \\\"*\"";
private static final String PO_LINE_NON_EMPTY_ENCUMBRANCE_QUERY = "poLine.fundDistribution = encumbrance";
private static final String ORDER_TYPE_QUERY = "orderType == %s";
private static final String ENCUMBR_FY_QUERY = "fiscalYearId == \"%s\"";
private static final String OR = " or ";
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/folio/service/routinglists/RoutingListService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,13 @@ private Future<TemplateProcessingRequest> getUsersAndCreateTemplate(RoutingList

private Future<String> getAddressTypeId(RequestContext requestContext) {
var requestEntry = new RequestEntry(ORDER_SETTINGS_ENDPOINT)
.withQuery("key=" + ROUTING_USER_ADDRESS_TYPE_ID);
.withQuery("key==" + ROUTING_USER_ADDRESS_TYPE_ID);
return restClient.get(requestEntry, SettingCollection.class, requestContext)
.map(settingCollection -> {
var settings = settingCollection.getSettings();
if (ObjectUtils.isEmpty(settings) || StringUtils.isBlank(settings.getFirst().getValue())) {
logger.error("getAddressTypeId:: Setting is not found with key={}", ROUTING_USER_ADDRESS_TYPE_ID);
throw new ResourceNotFoundException(String.format("Setting is not found with key=%s", ROUTING_USER_ADDRESS_TYPE_ID));
logger.error("getAddressTypeId:: Setting is not found with key=={}", ROUTING_USER_ADDRESS_TYPE_ID);
throw new ResourceNotFoundException(String.format("Setting is not found with key==%s", ROUTING_USER_ADDRESS_TYPE_ID));
}
return settings.getFirst().getValue();
});
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/folio/service/orders/OrderRolloverServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ private static Stream<Arguments> testBuildOrderQueryArgs() {
Arguments.of("(orderType == One-Time) and (workflowStatus==Open) and (poLine.fundDistribution =/@fundId (%s))",
true,
List.of(new EncumbranceRollover().withOrderType(EncumbranceRollover.OrderType.ONE_TIME).withBasedOn(EncumbranceRollover.BasedOn.INITIAL_AMOUNT).withIncreaseBy(0d))),
Arguments.of("(orderType == One-Time) and (workflowStatus<>Open) and (poLine.fundDistribution =/@fundId (%s)) and (poLine.fundDistribution == \"*\\\"encumbrance\\\": \\\"*\")",
Arguments.of("(orderType == One-Time) and (workflowStatus<>Open) and (poLine.fundDistribution =/@fundId (%s)) and (poLine.fundDistribution = encumbrance)",
false,
List.of(new EncumbranceRollover().withOrderType(EncumbranceRollover.OrderType.ONE_TIME).withBasedOn(EncumbranceRollover.BasedOn.INITIAL_AMOUNT).withIncreaseBy(0d)))
);
Expand All @@ -785,7 +785,7 @@ private static Stream<Arguments> testBuildOrderQueryWithoutSettingsArgs() {
return Stream.of(
Arguments.of("(workflowStatus==Open) and (poLine.fundDistribution =/@fundId (%s))",
true),
Arguments.of("(workflowStatus<>Open) and (poLine.fundDistribution =/@fundId (%s)) and (poLine.fundDistribution == \"*\\\"encumbrance\\\": \\\"*\")",
Arguments.of("(workflowStatus<>Open) and (poLine.fundDistribution =/@fundId (%s)) and (poLine.fundDistribution = encumbrance)",
false)
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/folio/service/routinglists/RoutingListServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ void throwErrorWhenSettingNotFound(VertxTestContext vertxTestContext) throws IOE
vertxTestContext.assertFailure(future).onComplete(result -> {
assertTrue(result.failed());
var exception = result.cause().getMessage();
assertTrue(exception.contains("Setting is not found with key=ROUTING_USER_ADDRESS_TYPE_ID"));
assertTrue(exception.contains("Setting is not found with key==ROUTING_USER_ADDRESS_TYPE_ID"));
vertxTestContext.completeNow();
});
}
Expand Down