Skip to content

Fix email tool crash due to missing _hrm permission in non-Ontario regions #128

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix email tool crash due to missing _hrm permission in non-Ontario regions #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cf90c6
Fix email tool crash in BC due to missing _hrm permission
D3V41 Oct 17, 2025
efa9851
Return empty list when HRM permission is missing in BC regions where …
D3V41 Oct 17, 2025
8b04720
Update HRM check to use Ontario billing region instead of non-BC cond…
D3V41 Oct 18, 2025
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: 5 additions & 1 deletion src/main/java/org/oscarehr/email/action/EmailComposeAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import org.oscarehr.util.PDFGenerationException;
import org.oscarehr.util.SpringUtils;

import oscar.OscarProperties;

public class EmailComposeAction extends DispatchAction {
private static final Logger logger = MiscUtils.getLogger();
private DemographicManager demographicManager = SpringUtils.getBean(DemographicManager.class);
Expand Down Expand Up @@ -56,7 +58,9 @@ public ActionForward prepareComposeEFormMailer(ActionMapping mapping, ActionForm
emailAttachmentList.addAll(emailComposeManager.prepareEFormAttachments(loggedInInfo, fdid, attachedEForms));
emailAttachmentList.addAll(emailComposeManager.prepareEDocAttachments(loggedInInfo, attachedDocuments));
emailAttachmentList.addAll(emailComposeManager.prepareLabAttachments(loggedInInfo, attachedLabs));
emailAttachmentList.addAll(emailComposeManager.prepareHRMAttachments(loggedInInfo, attachedHRMDocuments));
if (OscarProperties.getInstance().isOntarioBillingRegion()) {
emailAttachmentList.addAll(emailComposeManager.prepareHRMAttachments(loggedInInfo, attachedHRMDocuments));
}
emailAttachmentList.addAll(emailComposeManager.prepareFormAttachments(request, response, attachedForms, Integer.parseInt(demographicId)));
} catch (PDFGenerationException e) {
logger.error(e.getMessage(), e);
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/org/oscarehr/hospitalReportManager/HRMUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.oscarehr.util.PDFGenerationException;
import org.oscarehr.util.SpringUtils;

import oscar.OscarProperties;
import oscar.oscarLab.ca.on.HRMResultsData;
import oscar.util.StringUtils;

Expand Down Expand Up @@ -56,6 +57,13 @@ public HRMUtil() {
* Because multiple versions of a single HRM document can be received,
*/
public static ArrayList<HashMap<String, ? extends Object>> listHRMDocuments(LoggedInInfo loggedInInfo, String sortBy, boolean sortAsc, String demographicNo,boolean filterDuplicates){
if (!OscarProperties.getInstance().isOntarioBillingRegion()) {
return new ArrayList<>();
}
if (!securityInfoManager.hasPrivilege(loggedInInfo, "_hrm", SecurityInfoManager.READ, null)) {
logger.warn("missing required security object (_hrm)");
return new ArrayList<>();
}

ArrayList<HashMap<String, ? extends Object>> hrmdocslist = new ArrayList<HashMap<String, ?>>();

Expand Down
9 changes: 7 additions & 2 deletions src/main/java/org/oscarehr/managers/EmailComposeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import oscar.OscarProperties;
import oscar.util.StringUtils;

/*
Expand Down Expand Up @@ -119,9 +120,13 @@ public List<EmailAttachment> prepareLabAttachments(LoggedInInfo loggedInInfo, St
}

public List<EmailAttachment> prepareHRMAttachments(LoggedInInfo loggedInInfo, String[] attachedHRMDocuments) throws PDFGenerationException {
if (!OscarProperties.getInstance().isOntarioBillingRegion()) {
return new ArrayList<>();
}
if (!securityInfoManager.hasPrivilege(loggedInInfo, "_hrm", SecurityInfoManager.READ, null)) {
throw new RuntimeException("missing required security object (_hrm)");
}
logger.warn("missing required security object (_hrm)");
return new ArrayList<>();
}

List<String> attachedHRMIds = convertToList(attachedHRMDocuments);

Expand Down