Skip to content

Commit 39727be

Browse files
committed
MODEUR-166 etc: exclude cancelled invoice lines
1 parent dd665cb commit 39727be

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/main/java/org/folio/eusage/reports/api/EusageReportsApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,7 @@ Future<JsonObject> lookupOrderLine(UUID poLineId, RoutingContext ctx) {
10981098
* @return Invoice lines response.
10991099
*/
11001100
Future<JsonObject> lookupInvoiceLines(UUID poLineId, RoutingContext ctx) {
1101-
String uri = "/invoice-storage/invoice-lines" + LIMIT_ALL + "&query=poLineId%3D%3D" + poLineId;
1101+
String uri = "/invoice-storage/invoice-lines" + LIMIT_ALL + "&query=poLineId%3D%3D" + poLineId + "%20AND%20invoiceLineStatus%3C%3ECancelled";
11021102
return getRequestSend(ctx, uri)
11031103
.map(HttpResponse::bodyAsJsonObject);
11041104
}

src/test/java/org/folio/eusage/reports/MainVerticleTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ static void getInvoiceLines(RoutingContext ctx) {
535535
ctx.response().end("limit missing");
536536
return;
537537
}
538-
UUID poLineId = UUID.fromString(query.substring(10));
538+
UUID poLineId = UUID.fromString(query.substring(10,46));
539539

540540
JsonArray ar = new JsonArray();
541541
for (int i = 0; i < poLineIds.length; i++) {

0 commit comments

Comments
 (0)