OCD-5219: Add listing, developer URLs to report-data responses

chpl/chpl-api/src/main/java/gov/healthit/chpl/web/controller/QuestionableUrlReportController.java

@@ -40,7 +40,7 @@ public QuestionableUrlReportController(ReportDataManager reportDataManager) {
         return reportDataManager.getQuestionableUrlService().getQuestionableUrlReports();
     }
 
-    @Operation(summary = "Retrieves the data used to generate the Questionable URL Listings report.",
+    @Operation(summary = "Retrieves the data used to generate the Questionable URL Detailed report.",
             security = {
                     @SecurityRequirement(name = SwaggerSecurityRequirement.API_KEY)
             })

chpl/chpl-service/src/main/java/gov/healthit/chpl/dao/DeveloperDAO.java

@@ -63,7 +63,7 @@ public class DeveloperDAO extends BaseDAOImpl {
     private DeveloperStatusDAO statusDao;
     private AttestationDAO attestationDAO;
     private ErrorMessageUtil msgUtil;
-    private String unformattedDeveloperDetalisUrl;
+    private String unformattedDeveloperDetailsUrl;
 
     @Autowired
     public DeveloperDAO(AddressDAO addressDao,
@@ -78,7 +78,7 @@ public DeveloperDAO(AddressDAO addressDao,
        this.statusDao = statusDao;
        this.attestationDAO = attestationDAO;
        this.msgUtil = msgUtil;
-       this.unformattedDeveloperDetalisUrl = chplUrlBegin + developerUrlPart;
+       this.unformattedDeveloperDetailsUrl = chplUrlBegin + developerUrlPart;
     }
 
     public Long create(Developer developer) throws EntityCreationException {
@@ -200,7 +200,7 @@ public List<DeveloperSearchResult> getAllSearchResults() {
         LOGGER.info("Got all developers from db. Converting to Domain..");
         return entities.stream()
                 .map(entity -> entity.toDomain())
-                .peek(dev -> dev.setDeveloperDetailsUrl(String.format(unformattedDeveloperDetalisUrl, dev.getId())))
+                .peek(dev -> dev.setDeveloperDetailsUrl(String.format(unformattedDeveloperDetailsUrl, dev.getId())))
                 .collect(Collectors.toList());
     }
 

chpl/chpl-service/src/main/java/gov/healthit/chpl/report/criteriaattribute/CodeSetListingReport.java

@@ -9,6 +9,7 @@
 @Builder
 public class CodeSetListingReport {
     private String chplProductNumber;
+    private String listingDetailsUrl;
     private CertificationCriterion criterion;
     private CodeSet codeSet;
 }

chpl/chpl-service/src/main/java/gov/healthit/chpl/report/criteriaattribute/CodeSetReportDao.java

@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Repository;
 
 import gov.healthit.chpl.certificationCriteria.CertificationCriterionEntity;
@@ -11,6 +13,14 @@
 
 @Repository
 public class CodeSetReportDao extends BaseDAOImpl {
+    private String unformattedListingDetailsUrl;
+
+    @Autowired
+    public CodeSetReportDao(@Value("${chplUrlBegin}") String chplUrlBegin,
+            @Value("${listingDetailsUrlPart}") String listingDetailsUrlPart) {
+        this.unformattedListingDetailsUrl = chplUrlBegin + listingDetailsUrlPart;
+    }
+
     public List<CodeSetReport> getCodeSetReports() {
         String hql = "SELECT cc, cs, count(*) as codeSetCount "
                 + "FROM CertificationCriterionEntity cc, "
@@ -44,7 +54,7 @@
     }
 
     public List<CodeSetListingReport> getCodeSetListingReports() {
-        String hql = "SELECT cc, cs, cpd.chplProductNumber "
+        String hql = "SELECT cc, cs, cpd.id, cpd.chplProductNumber "
                 + "FROM CertificationCriterionEntity cc, "
                 + "CertificationResultEntity cr, "
                 + "CertifiedProductDetailsEntity cpd, "
@@ -68,7 +78,8 @@
                 .map(result -> CodeSetListingReport.builder()
                         .criterion(((CertificationCriterionEntity) result[0]).toDomain())
                         .codeSet(((CodeSetEntity) result[1]).toDomain())
-                        .chplProductNumber((String) result[2])
+                        .listingDetailsUrl(String.format(unformattedListingDetailsUrl, (Long) result[2]))
+                        .chplProductNumber((String) result[3])
                         .build())
                 .toList();
     }

chpl/chpl-service/src/main/java/gov/healthit/chpl/report/criteriaattribute/ConformanceMethodListingReport.java

@@ -9,6 +9,7 @@
 @Builder
 public class ConformanceMethodListingReport {
     private String chplProductNumber;
+    private String listingDetailsUrl;
     private CertificationCriterion criterion;
     private ConformanceMethod conformanceMethod;
 }

chpl/chpl-service/src/main/java/gov/healthit/chpl/report/criteriaattribute/ConformanceMethodReportDao.java

@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Repository;
 
 import gov.healthit.chpl.certificationCriteria.CertificationCriterionEntity;
@@ -11,6 +13,14 @@
 
 @Repository
 public class ConformanceMethodReportDao extends BaseDAOImpl {
+    private String unformattedListingDetailsUrl;
+
+    @Autowired
+    public ConformanceMethodReportDao(@Value("${chplUrlBegin}") String chplUrlBegin,
+            @Value("${listingDetailsUrlPart}") String listingDetailsUrlPart) {
+        this.unformattedListingDetailsUrl = chplUrlBegin + listingDetailsUrlPart;
+    }
+
     public List<ConformanceMethodReport> getConformanceMethodReports() {
         String hql = "SELECT cc, cm, count(*) as conrmfanceMethodCount "
                 + "FROM CertificationCriterionEntity cc, "
@@ -44,7 +54,7 @@
     }
 
     public List<ConformanceMethodListingReport> getConformanceMethodListingReports() {
-        String hql = "SELECT cc, cm, cpd.chplProductNumber "
+        String hql = "SELECT cc, cm, cpd.id, cpd.chplProductNumber "
                 + "FROM CertificationCriterionEntity cc, "
                 + "CertificationResultEntity cr, "
                 + "CertifiedProductDetailsEntity cpd, "
@@ -68,7 +78,8 @@
                 .map(result -> ConformanceMethodListingReport.builder()
                         .criterion(((CertificationCriterionEntity) result[0]).toDomain())
                         .conformanceMethod(((ConformanceMethodEntity) result[1]).toDomain())
-                        .chplProductNumber((String) result[2])
+                        .listingDetailsUrl(String.format(unformattedListingDetailsUrl, (Long) result[2]))
+                        .chplProductNumber((String) result[3])
                         .build())
                 .toList();
     }

chpl/chpl-service/src/main/java/gov/healthit/chpl/report/criteriaattribute/FunctionalityTestedListingReport.java

@@ -9,6 +9,7 @@
 @Builder
 public class FunctionalityTestedListingReport {
     private String chplProductNumber;
+    private String listingDetailsUrl;
     private CertificationCriterion criterion;
     private FunctionalityTested functionalityTested;
 }

chpl/chpl-service/src/main/java/gov/healthit/chpl/report/criteriaattribute/FunctionalityTestedReportDao.java

@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Repository;
 
 import gov.healthit.chpl.certificationCriteria.CertificationCriterionEntity;
@@ -11,6 +13,15 @@
 
 @Repository
 public class FunctionalityTestedReportDao extends BaseDAOImpl {
+
+    private String unformattedListingDetailsUrl;
+
+    @Autowired
+    public FunctionalityTestedReportDao(@Value("${chplUrlBegin}") String chplUrlBegin,
+            @Value("${listingDetailsUrlPart}") String listingDetailsUrlPart) {
+        this.unformattedListingDetailsUrl = chplUrlBegin + listingDetailsUrlPart;
+    }
+
     public List<FunctionalityTestedReport> getFunctionalityTestedReports() {
         String hql = "SELECT cc, ft, count(*) as functionalityTestedCount "
                 + "FROM CertificationCriterionEntity cc, "
@@ -44,7 +55,7 @@
     }
 
     public List<FunctionalityTestedListingReport> getFunctionalityTestedListingReports() {
-        String hql = "SELECT cc, ft, cpd.chplProductNumber "
+        String hql = "SELECT cc, ft, cpd.id, cpd.chplProductNumber "
                 + "FROM CertificationCriterionEntity cc, "
                 + "CertificationResultEntity cr, "
                 + "CertifiedProductDetailsEntity cpd, "
@@ -68,7 +79,8 @@
                 .map(result -> FunctionalityTestedListingReport.builder()
                         .criterion(((CertificationCriterionEntity) result[0]).toDomain())
                         .functionalityTested(((FunctionalityTestedEntity) result[1]).toDomain())
-                        .chplProductNumber((String) result[2])
+                        .listingDetailsUrl(String.format(unformattedListingDetailsUrl, (Long) result[2]))
+                        .chplProductNumber((String) result[3])
                         .build())
                 .toList();
     }

chpl/chpl-service/src/main/java/gov/healthit/chpl/report/criteriaattribute/OptionalStandardListingReport.java

@@ -9,6 +9,7 @@
 @Builder
 public class OptionalStandardListingReport {
     private String chplProductNumber;
+    private String listingDetailsUrl;
     private CertificationCriterion criterion;
     private OptionalStandard optionalStandard;
 }

chpl/chpl-service/src/main/java/gov/healthit/chpl/report/criteriaattribute/OptionalStandardReportDao.java

@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Repository;
 
 import gov.healthit.chpl.certificationCriteria.CertificationCriterionEntity;
@@ -11,6 +13,15 @@
 
 @Repository
 public class OptionalStandardReportDao extends BaseDAOImpl {
+
+    private String unformattedListingDetailsUrl;
+
+    @Autowired
+    public OptionalStandardReportDao(@Value("${chplUrlBegin}") String chplUrlBegin,
+            @Value("${listingDetailsUrlPart}") String listingDetailsUrlPart) {
+        this.unformattedListingDetailsUrl = chplUrlBegin + listingDetailsUrlPart;
+    }
+
     public List<OptionalStandardReport> getOptionalStandardReports() {
         String hql = "SELECT cc, os, count(*) as optionalStandardCount "
                 + "FROM CertificationCriterionEntity cc, "
@@ -44,7 +55,7 @@
     }
 
     public List<OptionalStandardListingReport> getOptionalStandardListingReports() {
-        String hql = "SELECT cc, os, cpd.chplProductNumber "
+        String hql = "SELECT cc, os, cpd.id, cpd.chplProductNumber "
                 + "FROM CertificationCriterionEntity cc, "
                 + "CertificationResultEntity cr, "
                 + "CertifiedProductDetailsEntity cpd, "
@@ -68,7 +79,8 @@
                 .map(result -> OptionalStandardListingReport.builder()
                         .criterion(((CertificationCriterionEntity) result[0]).toDomain())
                         .optionalStandard(((OptionalStandardEntity) result[1]).toDomain())
-                        .chplProductNumber((String) result[2])
+                        .listingDetailsUrl(String.format(unformattedListingDetailsUrl, (Long) result[2]))
+                        .chplProductNumber((String) result[3])
                         .build())
                 .toList();
     }

chpl/chpl-service/src/main/java/gov/healthit/chpl/report/criteriaattribute/PrivacyAndSecurityFrameworkListingReport.java

@@ -8,6 +8,7 @@
 @Builder
 public class PrivacyAndSecurityFrameworkListingReport {
     private String chplProductNumber;
+    private String listingDetailsUrl;
     private CertificationCriterion criterion;
     private String privacyAndSecurityFramework;
 }

chpl/chpl-service/src/main/java/gov/healthit/chpl/report/criteriaattribute/PrivacyAndSecurityFrameworkReportDao.java

@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Repository;
 
 import gov.healthit.chpl.certificationCriteria.CertificationCriterionEntity;
@@ -10,6 +12,15 @@
 
 @Repository
 public class PrivacyAndSecurityFrameworkReportDao extends BaseDAOImpl {
+
+    private String unformattedListingDetailsUrl;
+
+    @Autowired
+    public PrivacyAndSecurityFrameworkReportDao(@Value("${chplUrlBegin}") String chplUrlBegin,
+            @Value("${listingDetailsUrlPart}") String listingDetailsUrlPart) {
+        this.unformattedListingDetailsUrl = chplUrlBegin + listingDetailsUrlPart;
+    }
+
     public List<PrivacyAndSecurityFrameworkReport> getPrivacyAndSecurityFrameworkReports() {
         String hql = "SELECT cc, cr.privacySecurityFramework, count(*) as privacyAndSecurityFrameworkCount "
                 + "FROM CertificationCriterionEntity cc, "
@@ -39,7 +50,7 @@
     }
 
     public List<PrivacyAndSecurityFrameworkListingReport> getPrivacyAndSecurityFrameworkListingReports() {
-        String hql = "SELECT cc, cr.privacySecurityFramework, cpd.chplProductNumber "
+        String hql = "SELECT cc, cr.privacySecurityFramework, cpd.id, cpd.chplProductNumber "
                 + "FROM CertificationCriterionEntity cc, "
                 + "CertificationResultEntity cr, "
                 + "CertifiedProductDetailsEntity cpd "
@@ -58,7 +69,8 @@
                 .map(result -> PrivacyAndSecurityFrameworkListingReport.builder()
                         .criterion(((CertificationCriterionEntity) result[0]).toDomain())
                         .privacyAndSecurityFramework((String) result[1])
-                        .chplProductNumber((String) result[2])
+                        .listingDetailsUrl(String.format(unformattedListingDetailsUrl, (Long) result[2]))
+                        .chplProductNumber((String) result[3])
                         .build())
                 .toList();
     }

chpl/chpl-service/src/main/java/gov/healthit/chpl/report/criteriaattribute/StandardListingReport.java

@@ -9,6 +9,7 @@
 @Builder
 public class StandardListingReport {
     private String chplProductNumber;
+    private String listingDetailsUrl;
     private CertificationCriterion criterion;
     private Standard standard;
 }

chpl/chpl-service/src/main/java/gov/healthit/chpl/report/criteriaattribute/StandardReportDao.java

@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Repository;
 
 import gov.healthit.chpl.certificationCriteria.CertificationCriterionEntity;
@@ -14,6 +16,14 @@
 @Repository
 public class StandardReportDao extends BaseDAOImpl {
 
+    private String unformattedListingDetailsUrl;
+
+    @Autowired
+    public StandardReportDao(@Value("${chplUrlBegin}") String chplUrlBegin,
+            @Value("${listingDetailsUrlPart}") String listingDetailsUrlPart) {
+        this.unformattedListingDetailsUrl = chplUrlBegin + listingDetailsUrlPart;
+    }
+
     public List<StandardReport> getStandardReports() {
         String hql = "SELECT cc, s, count(*) as standardCount "
                 + "FROM CertificationCriterionEntity cc, "
@@ -47,7 +57,7 @@
     }
 
     public List<StandardListingReport> getStandardListingReports() {
-        String hql = "SELECT cc, s, cpd.chplProductNumber "
+        String hql = "SELECT cc, s, cpd.id, cpd.chplProductNumber "
                 + "FROM CertificationCriterionEntity cc, "
                 + "CertificationResultEntity cr, "
                 + "CertifiedProductDetailsEntity cpd, "
@@ -70,7 +80,8 @@
                 .map(result -> StandardListingReport.builder()
                         .criterion(((CertificationCriterionEntity) result[0]).toDomain())
                         .standard(((StandardEntity) result[1]).toDomain())
-                        .chplProductNumber((String) result[2])
+                        .listingDetailsUrl(String.format(unformattedListingDetailsUrl, (Long) result[2]))
+                        .chplProductNumber((String) result[3])
                         .build())
                 .toList();
     }

chpl/chpl-service/src/main/java/gov/healthit/chpl/report/criteriaattribute/TestDataListingReport.java

@@ -9,6 +9,7 @@
 @Builder
 public class TestDataListingReport {
     private String chplProductNumber;
+    private String listingDetailsUrl;
     private CertificationCriterion criterion;
     private TestData testData;
 }

chpl/chpl-service/src/main/java/gov/healthit/chpl/report/criteriaattribute/TestDataReportDao.java

@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Repository;
 
 import gov.healthit.chpl.certificationCriteria.CertificationCriterionEntity;
@@ -12,6 +14,14 @@
 @Repository
 public class TestDataReportDao extends BaseDAOImpl {
 
+    private String unformattedListingDetailsUrl;
+
+    @Autowired
+    public TestDataReportDao(@Value("${chplUrlBegin}") String chplUrlBegin,
+            @Value("${listingDetailsUrlPart}") String listingDetailsUrlPart) {
+        this.unformattedListingDetailsUrl = chplUrlBegin + listingDetailsUrlPart;
+    }
+
     public List<TestDataReport> getTestDataReports() {
         String hql = "SELECT cc, td, count(*) as testDataCount "
                 + "FROM CertificationCriterionEntity cc, "
@@ -45,7 +55,7 @@
     }
 
     public List<TestDataListingReport> getTestDataListingReports() {
-        String hql = "SELECT cc, td, cpd.chplProductNumber "
+        String hql = "SELECT cc, td, cpd.id, cpd.chplProductNumber "
                 + "FROM CertificationCriterionEntity cc, "
                 + "CertificationResultEntity cr, "
                 + "CertifiedProductDetailsEntity cpd, "
@@ -70,7 +80,8 @@
                 .map(result -> TestDataListingReport.builder()
                         .criterion(((CertificationCriterionEntity) result[0]).toDomain())
                         .testData(((TestDataEntity) result[1]).toDomain())
-                        .chplProductNumber((String) result[2])
+                        .listingDetailsUrl(String.format(unformattedListingDetailsUrl, (Long) result[2]))
+                        .chplProductNumber((String) result[3])
                         .build())
                 .toList();
     }