Skip to content

MODEUR-175 Avoid multiplication of usage counts #200

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

Merged
nielserik merged 1 commit into from
Mar 18, 2026
Merged

MODEUR-175 Avoid multiplication of usage counts #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/main/java/org/folio/eusage/reports/api/CostPerUse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ static JsonObject titlesToJsonObject(RowSet<Row> rowSet, Periods usePeriods) {
item.put("poLineIDs", poLineIDs);

JsonArray invoiceNumbers = new JsonArray();
String invoiceNumber = row.getString("invoicenumber");
if (invoiceNumber != null) {
invoiceNumbers.add(invoiceNumber);
String invoicenumbers = row.getString("invoicenumbers");
if (invoicenumbers != null) {
invoiceNumbers.add(invoicenumbers);
}
item.put("invoiceNumbers", invoiceNumbers);
if (usageDateRange != null) {
Expand Down
58 changes: 52 additions & 6 deletions src/main/java/org/folio/eusage/reports/api/EusageReportsApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ static String agreementEntriesTable(TenantPgPool pool) {
return pool.getSchema() + ".agreement_entries";
}

static String subscriptionCostsView(TenantPgPool pool) {
return pool.getSchema() + ".aggregated_subscription_costs";
}

static String statusTable(TenantPgPool pool) {
return pool.getSchema() + ".status";
}
Expand Down Expand Up @@ -1240,7 +1244,7 @@ Future<JsonObject> parsePoLine(JsonObject poLine, RoutingContext ctx) {
result.put("fiscalYear", fiscalYears);
result.put("invoicedPeriods", invoicedPeriods);
JsonArray invoiceNumbers = new JsonArray();
result.put("invoiceNumber", invoiceNumbers);
result.put("invoiceNumbers", invoiceNumbers);
UUID poLineId = UUID.fromString(poLine.getString("poLineId"));
return lookupOrderLine(poLineId, ctx).compose(orderLine -> {
result.put("poLineNumber", orderLine.getString("poLineNumber"));
Expand Down Expand Up @@ -1382,7 +1386,7 @@ private Future<Void> populateParsedPoLine(TenantPgPool pool, SqlConnection con,
JsonArray fiscalYears = poResult.getJsonArray("fiscalYear");
JsonArray subscriptionPeriods = poResult.getJsonArray("subscriptionPeriods");
JsonArray invoicedPeriods = poResult.getJsonArray("invoicedPeriods");
JsonArray invoiceNumbers = poResult.getJsonArray("invoiceNumber");
JsonArray invoiceNumbers = poResult.getJsonArray("invoiceNumbers");
if (subscriptionPeriods.isEmpty()) {
return insertAgreementLine(pool, con, agreementId, agreementLineId,
coverageDateRanges, type, kbTitleId, kbPackageId, poLineId, poResult,
Expand Down Expand Up @@ -1730,10 +1734,10 @@ static Future<RowSet<Row>> getTitlesCost(TenantPgPool pool, Boolean isJournal, b
+ " kbPackageId, kbPackageName, printISSN, onlineISSN, ISBN,"
+ " NULL AS publicationDate, NULL AS usageDateRange,"
+ " NULL AS uniqueAccessCount, NULL AS totalAccessCount, TRUE AS openAccess,"
+ " orderType, poLineNumber, invoiceNumber,"
+ " orderType, poLineNumber, invoiceNumbers,"
+ " fiscalYearRange, subscriptionDateRange,"
+ " encumberedCost, invoicedCost"
+ " FROM " + agreementEntriesTable(pool)
+ " FROM " + subscriptionCostsView(pool) + " AS agreement_entries"
+ " LEFT JOIN " + packageEntriesTable(pool) + " USING (kbPackageId)"
+ " JOIN " + titleEntriesTable(pool) + " ON"
+ " title_entries.kbTitleId = agreement_entries.kbTitleId OR"
Expand All @@ -1745,10 +1749,10 @@ static Future<RowSet<Row>> getTitlesCost(TenantPgPool pool, Boolean isJournal, b
+ " title_entries.kbTitleId AS kbId, kbTitleName AS title,"
+ " kbPackageId, kbPackageName, printISSN, onlineISSN, ISBN,"
+ " publicationDate, usageDateRange, uniqueAccessCount, totalAccessCount, openAccess,"
+ " orderType, poLineNumber, invoiceNumber,"
+ " orderType, poLineNumber, invoiceNumbers,"
+ " fiscalYearRange, subscriptionDateRange,"
+ " encumberedCost, invoicedCost"
+ " FROM " + agreementEntriesTable(pool)
+ " FROM " + subscriptionCostsView(pool) + " AS agreement_entries "
+ " LEFT JOIN " + packageEntriesTable(pool) + " USING (kbPackageId)"
+ " JOIN " + titleEntriesTable(pool) + " ON"
+ " title_entries.kbTitleId = agreement_entries.kbTitleId OR"
Expand Down Expand Up @@ -1956,6 +1960,48 @@ public Future<Void> postInit(Vertx vertx, String tenant, JsonObject tenantAttrib
+ "id UUID PRIMARY KEY, "
+ "status json"
+ ")",
"DROP VIEW IF EXISTS " + subscriptionCostsView(pool),
"CREATE VIEW " + subscriptionCostsView(pool) + " AS\n"
+ "SELECT kbtitleid,\n"
+ " kbpackageid,\n"
+ " type,\n"
+ " agreementid,\n"
+ " agreementlineid,\n"
+ " coveragedateranges,\n"
+ " ordertype,\n"
+ " date_part('year', lower(subscriptiondaterange)) AS year,\n"
+ " TRANSLATE(CAST(range_agg(subscriptiondaterange) AS TEXT),'{}','') "
+ " AS subscriptiondaterange,\n"
+ " TRANSLATE(CAST(range_agg(fiscalyearrange) AS TEXT),'{}','') "
+ " AS fiscalyearrange,\n"
+ " string_agg(DISTINCT polinenumber, '/') AS poLineNumber,\n"
+ " string_agg(DISTINCT invoicenumber, '/') AS invoicenumbers,\n"
+ " sum(invoicedcost) AS invoicedcost,\n"
+ " sum(encumberedcost) AS encumberedcost\n"
// Uncertain if same invoice could be inserted into table multiple times.
// Ensuring uniqueness.
+ "FROM (SELECT DISTINCT kbtitleid,\n"
+ " kbpackageid,\n"
+ " type,\n"
+ " agreementid,\n"
+ " agreementlineid,\n"
+ " fiscalyearrange,\n"
+ " subscriptiondaterange,\n"
+ " coveragedateranges,\n"
+ " ordertype,\n"
+ " polinenumber,\n"
+ " invoicenumber,\n"
+ " invoicedcost,\n"
+ " encumberedcost\n"
+ " FROM " + agreementEntriesTable(pool) + ")\n"
+ "GROUP BY kbtitleid,\n"
+ " kbpackageid,\n"
+ " type,\n"
+ " agreementid,\n"
+ " agreementlineid,\n"
+ " year,\n"
+ " coveragedateranges,\n"
+ " ordertype",
"CREATE OR REPLACE FUNCTION " + pool.getSchema() + ".floor_months(date, integer)"
+ " RETURNS date AS $$\n"
+ "-- floor_months(date, n) returns the start of the period date belongs to,\n"
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/folio/eusage/reports/MainVerticleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Copy link
Contributor

@adamdickmeiss adamdickmeiss Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this for?

Copy link
Contributor Author

@nielserik nielserik Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, for https://folio-org.atlassian.net/browse/MODEUR-176 actually, query will get an additional parameter. PR coming soon.


JsonArray ar = new JsonArray();
for (int i = 0; i < poLineIds.length; i++) {
Expand Down
Loading
Loading