PR feedback

Author: rushtong

src/main/java/org/broadinstitute/consent/http/db/DataAccessRequestDAO.java

@@ -141,7 +141,7 @@ AND LOWER(v.type) IN ('final', 'radar_approve')) final_access_vote ON final_acce
       -- Exclude DARs that have a closeoutSupplement
       AND data ->> 'closeoutSupplement' IS NULL
       """)
-  List<DataAccessRequest> findSummaryMetricApprovedDARsByDatasetId(
+  List<DataAccessRequest> findSummaryMetricApprovedDARsByDatasetIdIncludesExpired(
       @Bind("datasetId") Integer datasetId);
 
   /**

src/main/java/org/broadinstitute/consent/http/service/MetricsService.java

@@ -33,7 +33,8 @@ public List<DarMetricsSummary> generateDarSummaries(Integer datasetId) {
     if (dataset == null) {
       throw new NotFoundException("Dataset with specified ID does not exist.");
     }
-    List<DataAccessRequest> dars = darDAO.findSummaryMetricApprovedDARsByDatasetId(datasetId);
+    List<DataAccessRequest> dars =
+        darDAO.findSummaryMetricApprovedDARsByDatasetIdIncludesExpired(datasetId);
     return dars.stream().map(DarMetricsSummary::new).toList();
   }
 }

src/test/java/org/broadinstitute/consent/http/db/DataAccessRequestDAOTest.java

@@ -818,7 +818,7 @@ void testFindApprovedDARsByDatasetId_ExcludeCloseouts() {
   }
 
   @Test
-  void testFindSummaryMetricApprovedDARsByDatasetId() {
+  void testFindSummaryMetricApprovedDARsByDatasetIdIncludesExpired() {
     // Create a dataset to request access to
     Dataset dataset = createDataset();
 
@@ -890,7 +890,8 @@ void testFindSummaryMetricApprovedDARsByDatasetId() {
         true, "", now, expiredVote.getVoteId(), false, expiredElectionId, submissionDate, false);
 
     List<DataAccessRequest> summaryDARs =
-        dataAccessRequestDAO.findSummaryMetricApprovedDARsByDatasetId(dataset.getDatasetId());
+        dataAccessRequestDAO.findSummaryMetricApprovedDARsByDatasetIdIncludesExpired(
+            dataset.getDatasetId());
     assertFalse(summaryDARs.isEmpty());
     assertTrue(
         summaryDARs.stream()

src/test/java/org/broadinstitute/consent/http/service/MetricsServiceTest.java

@@ -43,14 +43,15 @@ void testGenerateDatasetMetrics() {
     Dataset dataset = generateDataset();
 
     when(dataSetDAO.findDatasetById(dataset.getDatasetId())).thenReturn(dataset);
-    when(darDAO.findSummaryMetricApprovedDARsByDatasetId(any())).thenReturn(List.of(dar));
+    when(darDAO.findSummaryMetricApprovedDARsByDatasetIdIncludesExpired(any()))
+        .thenReturn(List.of(dar));
 
     DatasetMetrics metrics = service.generateDatasetMetrics(dataset.getDatasetId());
 
     assertEquals(dar.getData().getProjectTitle(), metrics.getDars().getFirst().projectTitle());
     assertEquals(dar.getDarCode(), metrics.getDars().getFirst().darCode());
     verify(dataSetDAO).findDatasetById(dataset.getDatasetId());
-    verify(darDAO).findSummaryMetricApprovedDARsByDatasetId(dataset.getDatasetId());
+    verify(darDAO).findSummaryMetricApprovedDARsByDatasetIdIncludesExpired(dataset.getDatasetId());
   }
 
   @Test