Skip to content

fix!: Correctly calculate whether grouped stds are uptodate #2009

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
kekey1 wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

fix!: Correctly calculate whether grouped stds are uptodate #2009

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
21 changes: 18 additions & 3 deletions ...n/java/gov/healthit/chpl/certifiedproduct/service/CertificationResultUpToDateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public boolean isUpToDate(CertificationResult certResult) {
private boolean areNonGroupedStandardsUpToDate(List<Standard> standardsForCriterion, CertificationResult certResult, LocalDate asOfDate) {
List<Boolean> baselineStandardsUpToDate = standardsForCriterion.stream()
.filter(std -> StringUtils.isEmpty(std.getGroupName()))
.map(std -> areStandardsRequiredAndPresent(Stream.of(std).toList(), certResult, asOfDate))
.map(std -> areAllStandardsRequiredAndPresent(Stream.of(std).toList(), certResult, asOfDate))
.map(bool -> Boolean.valueOf(bool))
.collect(Collectors.toList());

Expand All @@ -82,7 +82,7 @@ private boolean areGroupedStandardsUpToDate(List<Standard> standardsForCriterion

List<Boolean> groupsUpToDate = standardGroupsForCriterion.keySet().stream()
.map(groupName -> standardGroupsForCriterion.get(groupName))
.map(stdList -> areStandardsRequiredAndPresent(stdList, certResult, asOfDate))
.map(stdList -> isAnyStandardRequiredAndPresent(stdList, certResult, asOfDate))
.map(bool -> Boolean.valueOf(bool))
.collect(Collectors.toList());

Expand All @@ -95,7 +95,7 @@ private boolean areGroupedStandardsUpToDate(List<Standard> standardsForCriterion
return true;
}

private boolean areStandardsRequiredAndPresent(List<Standard> standards, CertificationResult certResult, LocalDate asOfDate) {
private boolean areAllStandardsRequiredAndPresent(List<Standard> standards, CertificationResult certResult, LocalDate asOfDate) {
List<Standard> requiredStandards = standards.stream()
.filter(std -> DateUtil.isOnOrBefore(std.getStartDay(), asOfDate)
&& (std.getRequiredDay() != null && std.getRequiredDay().isBefore(asOfDate))
Expand All @@ -111,6 +111,21 @@ private boolean areStandardsRequiredAndPresent(List<Standard> standards, Certifi
return true;
}

private boolean isAnyStandardRequiredAndPresent(List<Standard> standards, CertificationResult certResult, LocalDate asOfDate) {
List<Standard> requiredStandards = standards.stream()
.filter(std -> DateUtil.isOnOrBefore(std.getStartDay(), asOfDate)
&& (std.getRequiredDay() != null && std.getRequiredDay().isBefore(asOfDate))
&& (std.getEndDay() == null || std.getEndDay().isAfter(asOfDate)))
.collect(Collectors.toList());
if (!CollectionUtils.isEmpty(requiredStandards)) {
return requiredStandards.stream()
.filter(requiredStandard -> isStandardOnCertResult(requiredStandard, certResult))
.findAny()
.isPresent();
}
return true;
}

private boolean isStandardOnCertResult(Standard standard, CertificationResult certResult) {
return certResult.getStandards().stream()
.filter(certResultStd -> standard.getId().equals(certResultStd.getStandard().getId()))
Expand Down
Loading