[DT-2839] Allow open after approval. (#2787)

Author: otchet-broad

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

@@ -276,7 +276,8 @@ private void processDarCollectionSummariesForChair(List<DarCollectionSummary> su
         s -> {
           Map<String, Integer> statusCount = new HashMap<>();
           Map<Integer, Election> elections = s.getElections();
-          if (!s.requiresSOApproval() && elections.size() < s.getDatasetCount()) {
+          if ((!s.requiresSOApproval() || s.getSOApprover() != null)
+              && elections.size() < s.getDatasetCount()) {
             s.addAction(DarCollectionActions.OPEN);
           }
           elections
@@ -310,7 +311,8 @@ private void updateSummaryActionsForChair(
     }
 
     // If there are no elections, only show open
-    if (!summary.requiresSOApproval() && summary.getElections().isEmpty()) {
+    if ((!summary.requiresSOApproval() || summary.getSOApprover() != null)
+        && summary.getElections().isEmpty()) {
       summary.addAction(DarCollectionActions.OPEN);
     }
 

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

@@ -1700,6 +1700,28 @@ void testProcessDarCollectionSummariesForChairWithSOApprovalRequired() {
     assertTrue(summaries.getFirst().getActions().isEmpty());
   }
 
+  @Test
+  void testProcessDarCollectionSummariesForChairWithSOApprovalRequired_And_Granted() {
+    User user = new User();
+    user.setUserId(1);
+    user.addRole(UserRoles.Chairperson());
+    DarCollectionSummary summary = new DarCollectionSummary();
+    summary.setLatestReferenceId(UUID.randomUUID().toString());
+    summary.setRequiresSOApproval(true);
+    summary.setSOApprover(1);
+    summary.addDatasetId(1);
+    when(darCollectionSummaryDAO.getDarCollectionSummariesForDACRole(
+            user.getUserId(), UserRoles.CHAIRPERSON.getRoleId()))
+        .thenReturn(List.of(summary));
+
+    List<DarCollectionSummary> summaries = service.getSummariesForRole(user, UserRoles.CHAIRPERSON);
+
+    assertNotNull(summaries);
+    assertEquals(1, summaries.size());
+    // Chair summary have the open action after it is approved by the SO.
+    assertTrue(summaries.getFirst().getActions().contains(DarCollectionActions.OPEN.getValue()));
+  }
+
   @Test
   void testGetSummaryForRoleByCollectionId_SO() {
     User user = new User();