OCD-5318: Update SED business logic for HTI-5

chpl/chpl-api/src/main/java/gov/healthit/chpl/CHPLConfig.java

@@ -87,7 +87,7 @@ public class CHPLConfig implements WebMvcConfigurer, EnvironmentAware {
     private Boolean tryItOutEnabled;
 
     @Autowired
-    private DeprecatedResponseFieldAnnotationIntrospector deprecatedResponseFieldAnnotationIntrospector;
+    private IgnorableResponseFieldAnnotationIntrospector ignorableResponseFieldAnnotationIntrospector;
 
     @Lazy
     @Autowired
@@ -117,7 +117,7 @@ public void setEnvironment(Environment e) {
     @Primary
     public JsonMapper jsonMapper() {
         JsonMapper mapper = JsonMapper.builder()
-                .annotationIntrospector(deprecatedResponseFieldAnnotationIntrospector)
+                .annotationIntrospector(ignorableResponseFieldAnnotationIntrospector)
                 .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
                 .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
                         DeserializationFeature.FAIL_ON_IGNORED_PROPERTIES,

chpl/chpl-api/src/main/java/gov/healthit/chpl/IgnorableResponseFieldAnnotationIntrospector.java

@@ -0,0 +1,48 @@
+package gov.healthit.chpl;
+
+import org.ff4j.FF4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+import gov.healthit.chpl.api.deprecatedUsage.DeprecatedResponseField;
+import gov.healthit.chpl.sed.SedSummaryData;
+import gov.healthit.chpl.sed.SedTestTaskData;
+import lombok.extern.log4j.Log4j2;
+import tools.jackson.databind.cfg.MapperConfig;
+import tools.jackson.databind.introspect.AnnotatedMember;
+import tools.jackson.databind.introspect.JacksonAnnotationIntrospector;
+
+@Log4j2
+@Component
+public class IgnorableResponseFieldAnnotationIntrospector extends JacksonAnnotationIntrospector {
+    private static final long serialVersionUID = 7316344670464634840L;
+
+    @Autowired
+    private Environment env;
+
+    @Autowired
+    private FF4j ff4j;
+
+    @Override
+    public boolean hasIgnoreMarker(MapperConfig<?> config, AnnotatedMember m) {
+        if (super.hasIgnoreMarker(config, m)) {
+            return true;
+        } else {
+            return isDeprecatedAndIgnorable(m) || isSedAndIgnorable(m);
+        }
+    }
+
+    private boolean isDeprecatedAndIgnorable(AnnotatedMember m) {
+        Boolean returnDeprecatedFields = Boolean.valueOf(env.getProperty("response.returnDeprecatedFields"));
+        boolean isDeprecated = _findAnnotation(m, DeprecatedResponseField.class) != null;
+        return !returnDeprecatedFields && isDeprecated;
+    }
+
+    private boolean isSedAndIgnorable(AnnotatedMember m) {
+        boolean isHti5Erd = ff4j.check(FeatureList.HTI_5_ERD);
+        boolean isSedSummary = _findAnnotation(m, SedSummaryData.class) != null;
+        boolean isSedTestTask = _findAnnotation(m, SedTestTaskData.class) != null;
+        return isHti5Erd && (isSedSummary || isSedTestTask);
+    }
+}

chpl/chpl-resources/src/main/resources/errors.properties

@@ -390,6 +390,7 @@ listing.criteria.badUcdProcess=Could not process UCD Process '%s'.
 listing.criteria.missingUcdProcess=Certification %s requires at least one UCD process.
 listing.criteria.ucdProcessNotFoundAndRemoved=UCD Process '%s' referenced by criteria %s was not found and was or will be removed.
 listing.ucdProcess.unattestedCriterionRemoved=The criterion %s is not attested to and has been removed from a UCD Process.
+listing.ucdProcess.bothFieldsPresent=Either the UCD Process Name or UCD Process Details must be filled in, but not both for UCD Process %s.
 
 #Test Task And Participant Errors
 listing.criteria.testTasksNotApplicable=Test Tasks are not applicable for the criterion %s.

chpl/chpl-service/src/main/java/gov/healthit/chpl/FeatureList.java

@@ -6,6 +6,7 @@ private FeatureList() {
 
     public static final String CMS_DISABLED = "cms-disabled";
     public static final String DEMOGRAPHIC_CHANGE_REQUEST = "demographic-change-request";
+    public static final String HTI_5_ERD = "hti-5-erd";
     public static final String INSIGHTS_DISPLAY = "insights-display";
     public static final String SERVICE_BASE_URL_LIST_CHANGE_REQUEST = "sbul-change-request";
     public static final String RWT_CHANGE_REQUEST = "rwt-change-request";

chpl/chpl-service/src/main/java/gov/healthit/chpl/certifiedproduct/csv/ListingCsvDataWriter.java

@@ -14,9 +14,11 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.ff4j.FF4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import gov.healthit.chpl.FeatureList;
 import gov.healthit.chpl.certificationCriteria.CertificationCriteriaManager;
 import gov.healthit.chpl.certificationCriteria.CertificationCriterion;
 import gov.healthit.chpl.certificationCriteria.CertificationCriterionWithAttributes;
@@ -82,19 +84,23 @@ public class ListingCsvDataWriter {
     private static final int SED_TESTING_DATE_COL = 40;
     private static final int PARTICIPANT_START_COL = 41;
     private static final int TASK_START_COL = 50;
-    private static final int CRITERIA_START_COL = 65;
+    private static final int CRITERIA_START_COL_PRE_HTI5 = 65;
+    private static final int CRITERIA_START_COL = 38;
     private static final int ADDITIONAL_SOFTWARE_COL_COUNT = 5;
     private static final int UCD_PROCESS_COL_COUNT = 2;
     private static final int SED_TESTING_COL_COUNT = 2;
 
     private CertificationCriteriaManager criteriaManager;
     private StandardManager standardManager;
     private DateFormat dateFormat;
+    private FF4j ff4j;
 
     @Autowired
-    public ListingCsvDataWriter(CertificationCriteriaManager criteriaManager, StandardManager standardManager) {
+    public ListingCsvDataWriter(CertificationCriteriaManager criteriaManager, StandardManager standardManager,
+            FF4j ff4j) {
         this.criteriaManager = criteriaManager;
         this.standardManager = standardManager;
+        this.ff4j = ff4j;
         this.dateFormat = new SimpleDateFormat(ListingUploadHandlerUtil.UPLOAD_DATE_FORMAT);
     }
 
@@ -121,11 +127,13 @@ public List<List<String>> getCsvData(CertifiedProductSearchDetails listing, int
         addAccessibilityStandards(csvDataMatrix, listing.getAccessibilityStandards());
         csvDataMatrix[0][K1_URL_COL] = listing.getMandatoryDisclosures();
         addCqms(csvDataMatrix, listing.getCqmResults());
-        csvDataMatrix[0][SED_REPORT_URL_COL] = listing.getSedReportFileLocation();
-        csvDataMatrix[0][SED_INTENDED_USERS_COL] = listing.getSedIntendedUserDescription();
-        csvDataMatrix[0][SED_TESTING_DATE_COL] = listing.getSedTestingEndDay() != null ? dateFormat.format(DateUtil.toDate(listing.getSedTestingEndDay())) : "";
-        addParticipants(csvDataMatrix, listing.getSed());
-        addTasks(csvDataMatrix, listing.getSed());
+        if (!ff4j.check(FeatureList.HTI_5_ERD)) {
+            csvDataMatrix[0][SED_REPORT_URL_COL] = listing.getSedReportFileLocation();
+            csvDataMatrix[0][SED_INTENDED_USERS_COL] = listing.getSedIntendedUserDescription();
+            csvDataMatrix[0][SED_TESTING_DATE_COL] = listing.getSedTestingEndDay() != null ? dateFormat.format(DateUtil.toDate(listing.getSedTestingEndDay())) : "";
+            addParticipants(csvDataMatrix, listing.getSed());
+            addTasks(csvDataMatrix, listing.getSed());
+        }
         addCertificationResults(csvDataMatrix, getAllAvailableCriteriaAsCertResults(listing), listing.getSed());
 
         List<List<String>> records = new ArrayList<List<String>>();
@@ -445,7 +453,7 @@ private void addTasks(String[][] csvDataMatrix, CertifiedProductSed sed) {
     }
 
     private void addCertificationResults(String[][] csvDataMatrix, List<CertificationResult> certResults, CertifiedProductSed sed) {
-        int currCol = CRITERIA_START_COL;
+        int currCol = !ff4j.check(FeatureList.HTI_5_ERD) ? CRITERIA_START_COL_PRE_HTI5 : CRITERIA_START_COL;
         for (int i = 0; i < certResults.size(); i++) {
             int currCertResultStartCol = currCol;
             CertificationResult certResult = certResults.get(i);
@@ -652,19 +660,21 @@ private int addSed(String[][] csvDataMatrix, CertificationResult certResult, Cer
             }
             currCol += UCD_PROCESS_COL_COUNT;
 
-            List<TestTask> testTasks = getTestTasksForCriterion(certResult.getCriterion(), sed);
-            if (!CollectionUtils.isEmpty(testTasks)) {
-                for (int i = 0; i < testTasks.size(); i++) {
-                    int sedTestingCol = currCol;
-                    TestTask testTask = testTasks.get(i);
-                    csvDataMatrix[i][sedTestingCol++] = testTask.getFriendlyId();
-                    String participants = testTask.getTestParticipants().stream()
-                        .map(participant -> participant.getFriendlyId())
-                        .collect(Collectors.joining(";"));
-                    csvDataMatrix[i][sedTestingCol++] = participants;
+            if (!ff4j.check(FeatureList.HTI_5_ERD)) {
+                List<TestTask> testTasks = getTestTasksForCriterion(certResult.getCriterion(), sed);
+                if (!CollectionUtils.isEmpty(testTasks)) {
+                    for (int i = 0; i < testTasks.size(); i++) {
+                        int sedTestingCol = currCol;
+                        TestTask testTask = testTasks.get(i);
+                        csvDataMatrix[i][sedTestingCol++] = testTask.getFriendlyId();
+                        String participants = testTask.getTestParticipants().stream()
+                            .map(participant -> participant.getFriendlyId())
+                            .collect(Collectors.joining(";"));
+                        csvDataMatrix[i][sedTestingCol++] = participants;
+                    }
                 }
+                currCol += SED_TESTING_COL_COUNT;
             }
-            currCol += SED_TESTING_COL_COUNT;
         }
         return currCol;
     }