From 39727be90b51d14f3f859743f9586f96057deed7 Mon Sep 17 00:00:00 2001 From: nielserik Date: Thu, 26 Feb 2026 12:15:13 +0100 Subject: [PATCH 1/2] MODEUR-166 etc: exclude cancelled invoice lines --- .../java/org/folio/eusage/reports/api/EusageReportsApi.java | 2 +- src/test/java/org/folio/eusage/reports/MainVerticleTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/folio/eusage/reports/api/EusageReportsApi.java b/src/main/java/org/folio/eusage/reports/api/EusageReportsApi.java index dc5b6806..789f28fc 100644 --- a/src/main/java/org/folio/eusage/reports/api/EusageReportsApi.java +++ b/src/main/java/org/folio/eusage/reports/api/EusageReportsApi.java @@ -1098,7 +1098,7 @@ Future lookupOrderLine(UUID poLineId, RoutingContext ctx) { * @return Invoice lines response. */ Future lookupInvoiceLines(UUID poLineId, RoutingContext ctx) { - String uri = "/invoice-storage/invoice-lines" + LIMIT_ALL + "&query=poLineId%3D%3D" + poLineId; + String uri = "/invoice-storage/invoice-lines" + LIMIT_ALL + "&query=poLineId%3D%3D" + poLineId + "%20AND%20invoiceLineStatus%3C%3ECancelled"; return getRequestSend(ctx, uri) .map(HttpResponse::bodyAsJsonObject); } diff --git a/src/test/java/org/folio/eusage/reports/MainVerticleTest.java b/src/test/java/org/folio/eusage/reports/MainVerticleTest.java index 5113813e..4ce381dd 100644 --- a/src/test/java/org/folio/eusage/reports/MainVerticleTest.java +++ b/src/test/java/org/folio/eusage/reports/MainVerticleTest.java @@ -535,7 +535,7 @@ static void getInvoiceLines(RoutingContext ctx) { ctx.response().end("limit missing"); return; } - UUID poLineId = UUID.fromString(query.substring(10)); + UUID poLineId = UUID.fromString(query.substring(10,46)); JsonArray ar = new JsonArray(); for (int i = 0; i < poLineIds.length; i++) { From aa8f45747003cfe94528823bd43271fe00d77c6e Mon Sep 17 00:00:00 2001 From: nielserik Date: Thu, 26 Feb 2026 12:22:53 +0100 Subject: [PATCH 2/2] MODEUR-166 etc: exclude cancelled invoice lines --- .../java/org/folio/eusage/reports/api/EusageReportsApi.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/folio/eusage/reports/api/EusageReportsApi.java b/src/main/java/org/folio/eusage/reports/api/EusageReportsApi.java index 789f28fc..a6dc0d56 100644 --- a/src/main/java/org/folio/eusage/reports/api/EusageReportsApi.java +++ b/src/main/java/org/folio/eusage/reports/api/EusageReportsApi.java @@ -1098,7 +1098,8 @@ Future lookupOrderLine(UUID poLineId, RoutingContext ctx) { * @return Invoice lines response. */ Future lookupInvoiceLines(UUID poLineId, RoutingContext ctx) { - String uri = "/invoice-storage/invoice-lines" + LIMIT_ALL + "&query=poLineId%3D%3D" + poLineId + "%20AND%20invoiceLineStatus%3C%3ECancelled"; + String uri = "/invoice-storage/invoice-lines" + LIMIT_ALL + "&query=poLineId%3D%3D" + poLineId + + "%20AND%20invoiceLineStatus%3C%3ECancelled"; return getRequestSend(ctx, uri) .map(HttpResponse::bodyAsJsonObject); }