Skip to content

U4X-1082: Improve Error-Proofing in CPHL Barcode Validation #857

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
slubwama wants to merge 2 commits into
base: master
Choose a base branch
from
Open

U4X-1082: Improve Error-Proofing in CPHL Barcode Validation #857

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
719a550
U4X-1082: Improve Error-Proofing in CPHL Barcode Validation
slubwama Dec 2, 2025
bfcf4af
remove unnecessary changes
slubwama Dec 2, 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
27 changes: 23 additions & 4 deletions api/src/main/java/org/openmrs/module/ugandaemr/api/impl/UgandaEMRServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2423,21 +2423,40 @@ private void deleteDirectory(Path path) throws IOException {
}

private boolean validateCPHLBarCode(String accessionNumber) {
Integer minimumCPHLBarCodeLength = Integer.parseInt(Context.getAdministrationService().getGlobalProperty("ugandaemrsync.minimumCPHLBarCodeLength"));
if (accessionNumber == null || accessionNumber.length() < minimumCPHLBarCodeLength) {
if (accessionNumber == null || accessionNumber.trim().isEmpty()) {
return false;
}
accessionNumber = accessionNumber.trim();

int minimumCPHLBarCodeLength = 10;
try {
String gpValue = Context.getAdministrationService()
.getGlobalProperty("ugandaemrsync.minimumCPHLBarCodeLength");
if (gpValue != null) {
minimumCPHLBarCodeLength = Integer.parseInt(gpValue);
}
} catch (NumberFormatException ignored) {
log.error(ignored);
}

if (accessionNumber.length() < minimumCPHLBarCodeLength || accessionNumber.length() < 2) {
return false;
}

int currentYearSuffix = Year.now().getValue() % 100;
int previousYearSuffix = (currentYearSuffix == 0) ? 99 : currentYearSuffix - 1;

int prefix;
try {
int prefix = Integer.parseInt(accessionNumber.substring(0, 2));
return prefix == currentYearSuffix || prefix == (currentYearSuffix - 1);
prefix = Integer.parseInt(accessionNumber.substring(0, 2));
} catch (NumberFormatException e) {
return false;
}

return prefix == currentYearSuffix || prefix == previousYearSuffix;
}


private boolean accessionNumberAlreadyUsed(String accessionNumber) {
// Escape single quotes to prevent SQL injection or errors
String safeAccessionNumber = accessionNumber.replace("'", "''");
Expand Down