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..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; + 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++) {