Include closeouts in results.

Author: rushtong

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

@@ -138,8 +138,20 @@ AND LOWER(v.type) IN ('final', 'radar_approve')) final_access_vote ON final_acce
       AND dar.submission_date IS NOT NULL
       AND final_access_vote.last_vote = TRUE
       AND (LOWER(dar.data->>'status') != 'archived' OR dar.data->>'status' IS NULL)
-      -- Exclude DARs that have a closeoutSupplement
-      AND data ->> 'closeoutSupplement' IS NULL
+      -- Pull in all closeouts for this dataset. Closeouts do not have elections,
+      -- but we want to include them in the dataset usage metrics.
+      UNION
+      SELECT dar.id, dar.reference_id, dar.collection_id, dar.parent_id, dar.user_id,
+        dar.create_date, dar.submission_date, dar.update_date, dar.data, dar.era_commons_id,
+        dar.approving_so_id, dar.approving_so_timestamp, dar.requires_so_approval,
+        dar.closeout_so_approval_timestamp, dar.closeout_approving_so_id,
+        dd.dataset_id, collection.dar_code
+      FROM data_access_request dar
+      LEFT JOIN dar_collection collection on collection.collection_id = dar.collection_id
+      INNER JOIN dar_dataset dd ON dd.reference_id = dar.reference_id
+      WHERE dd.dataset_id = :datasetId
+      AND dar.submission_date IS NOT NULL
+      AND data ->> 'closeoutSupplement' IS NOT NULL
       """)
   List<DataAccessRequest> findSummaryMetricApprovedDARsByDatasetIdIncludesExpired(
       @Bind("datasetId") Integer datasetId);

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

@@ -843,10 +843,20 @@ void testFindSummaryMetricApprovedDARsByDatasetIdIncludesExpired() {
     dataAccessRequestDAO.insertDARDatasetRelation(
         unsubmittedDAR.getReferenceId(), dataset.getDatasetId());
 
-    // Create a closeout DAR from the approved DAR
+    // Create a Progress Report on the approved DAR
+    DataAccessRequest prDAR = createDataAccessRequest(user.getUserId(), approvedCollectionId);
+    dataAccessRequestDAO.insertDARDatasetRelation(
+        prDAR.getReferenceId(), dataset.getDatasetId());
+    Election prElection =
+        createDataAccessElection(prDAR.getReferenceId(), dataset.getDatasetId());
+    Vote prVote = createFinalVote(dataset.getCreateUserId(), prElection.getElectionId());
+    updateVote(true, "", now, prVote.getVoteId(), false, prElection.getElectionId(), now, false);
+
+    // Create a closeout DAR from the PR DAR
     DataAccessRequest closeoutDAR =
         createProgressReport(
-            user.getEraCommonsId(), user.getUserId(), approvedCollectionId, approvedDAR.getId());
+            user.getEraCommonsId(), user.getUserId(), approvedCollectionId, prDAR.getId());
+    dataAccessRequestDAO.insertDARDatasetRelation(closeoutDAR.getReferenceId(), dataset.getDatasetId());
     CloseoutSupplement closeout =
         new CloseoutSupplement(List.of("Reason"), "Other Reason", user.getUserId());
     closeoutDAR.getData().setCloseoutSupplement(closeout);
@@ -893,18 +903,23 @@ void testFindSummaryMetricApprovedDARsByDatasetIdIncludesExpired() {
         dataAccessRequestDAO.findSummaryMetricApprovedDARsByDatasetIdIncludesExpired(
             dataset.getDatasetId());
     assertFalse(summaryDARs.isEmpty());
+    // Only DAR that should not be returned
+    assertTrue(
+        summaryDARs.stream()
+            .noneMatch(dar -> dar.getReferenceId().equals(unsubmittedDAR.getReferenceId())));
+    // All other DARs should be returned
     assertTrue(
         summaryDARs.stream()
             .anyMatch(dar -> dar.getReferenceId().equals(approvedDAR.getReferenceId())));
     assertTrue(
         summaryDARs.stream()
-            .noneMatch(dar -> dar.getReferenceId().equals(unsubmittedDAR.getReferenceId())));
+            .anyMatch(dar -> dar.getReferenceId().equals(prDAR.getReferenceId())));
     assertTrue(
         summaryDARs.stream()
-            .noneMatch(dar -> dar.getReferenceId().equals(closeoutDAR.getReferenceId())));
+            .anyMatch(dar -> dar.getReferenceId().equals(closeoutDAR.getReferenceId())));
     assertTrue(
         summaryDARs.stream().anyMatch(dar -> dar.getReferenceId().equals(expiredReferenceId)));
-    assertEquals(2, summaryDARs.size());
+    assertEquals(4, summaryDARs.size());
   }
 
   // findAllDraftDataAccessRequests should exclude archived DARs