Skip to content

Update merged code to use HtmlString #1162

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
labkey-tchad merged 1 commit into from
Jun 29, 2026
Merged

Update merged code to use HtmlString #1162

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
20 changes: 10 additions & 10 deletions ehr_billing/src/org/labkey/ehr_billing/EHR_BillingManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ public List<HtmlString> deleteBillingRuns(User user, Container container, Collec
Set<String> invoiceRunIds = getInvoiceRunIds(invoiceRuns, objectIdFilter);
if (invoiceRunIds.isEmpty())
{
List<String> ret = new ArrayList<>();
List<HtmlString> ret = new ArrayList<>();
if (testOnly)
{
ret.add("0 records from invoiced items");
ret.add("0 records from invoice");
ret.add("0 invoice records from misc charges will be removed from the deleted invoice, which means they will be picked up by the next billing period. They are not deleted.");
ret.add(HtmlString.of("0 records from invoiced items"));
ret.add(HtmlString.of("0 records from invoice"));
ret.add(HtmlString.of("0 invoice records from misc charges will be removed from the deleted invoice, which means they will be picked up by the next billing period. They are not deleted."));
}
return ret;
}
Expand Down Expand Up @@ -237,8 +237,8 @@ public void testDeleteBillingRunsIsContainerScoped() throws Exception
EHR_BillingSchema schema = EHR_BillingSchema.getInstance();

// A testOnly preview issued from container A targeting container B's run must not see container B's rows
for (String summary : manager.deleteBillingRuns(_user, _containerA, List.of(_runIdB), true))
assertTrue("Preview from another container should count 0 rows, but got: " + summary, summary.startsWith("0 "));
for (HtmlString summary : manager.deleteBillingRuns(_user, _containerA, List.of(_runIdB), true))
assertTrue("Preview from another container should count 0 rows, but got: " + summary, summary.toString().startsWith("0 "));

// An actual delete issued from container A targeting container B's run must leave container B untouched
manager.deleteBillingRuns(_user, _containerA, List.of(_runIdB), false);
Expand All @@ -249,9 +249,9 @@ public void testDeleteBillingRunsIsContainerScoped() throws Exception

// WNPRC-style source data: billing artifacts live in the finance container, but miscCharges live in the EHR container
String runIdWithEHRMiscCharge = insertBillingRun(_containerA, _containerEHR);
List<String> preview = manager.deleteBillingRuns(_user, _containerA, List.of(runIdWithEHRMiscCharge), true);
List<HtmlString> preview = manager.deleteBillingRuns(_user, _containerA, List.of(runIdWithEHRMiscCharge), true);
assertTrue("Preview should count miscCharges rows in the EHR source container: " + preview,
preview.stream().anyMatch(summary -> summary.startsWith("1 invoice records from misc charges")));
preview.stream().anyMatch(summary -> summary.toString().startsWith("1 invoice records from misc charges")));

manager.deleteBillingRuns(_user, _containerA, List.of(runIdWithEHRMiscCharge), false);
assertEquals("miscCharges row in the EHR source container should be detached from the deleted invoice", 0, miscChargesWithInvoiceCount(_containerEHR));
Expand All @@ -261,9 +261,9 @@ public void testDeleteBillingRunsIsContainerScoped() throws Exception
// the configured EHR study container. The delete is keyed off the authorized run id, so these rows are
// still previewed and detached.
String runIdWithSatelliteMiscCharge = insertBillingRun(_containerA, _containerSatellite);
List<String> satellitePreview = manager.deleteBillingRuns(_user, _containerA, List.of(runIdWithSatelliteMiscCharge), true);
List<HtmlString> satellitePreview = manager.deleteBillingRuns(_user, _containerA, List.of(runIdWithSatelliteMiscCharge), true);
assertTrue("Preview should count miscCharges rows in an unrelated source container: " + satellitePreview,
satellitePreview.stream().anyMatch(summary -> summary.startsWith("1 invoice records from misc charges")));
satellitePreview.stream().anyMatch(summary -> summary.toString().startsWith("1 invoice records from misc charges")));

manager.deleteBillingRuns(_user, _containerA, List.of(runIdWithSatelliteMiscCharge), false);
assertEquals("miscCharges row in the satellite source container should be detached from the deleted invoice", 0, miscChargesWithInvoiceCount(_containerSatellite));
Expand Down