SHIBUI-2393/2493

fixed issue when changing dynamic registration group
TIER · Dec 6, 2022 · d7cd6fb · d7cd6fb
1 parent cd4594b
commit d7cd6fb
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/...main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/GroupController.java b/...main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/GroupController.java
@@ -6,6 +6,7 @@
 import edu.internet2.tier.shibboleth.admin.ui.security.exception.InvalidGroupRegexException;
 import edu.internet2.tier.shibboleth.admin.ui.security.model.Group;
 import edu.internet2.tier.shibboleth.admin.ui.security.service.IGroupService;
+import edu.internet2.tier.shibboleth.admin.ui.service.DynamicRegistrationService;
 import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.tags.Tags;
@@ -33,6 +34,9 @@ public class GroupController {
     @Autowired
     private EntityDescriptorService entityDescriptorService;
 
+    @Autowired
+    private DynamicRegistrationService dynamicRegistrationService;
+
     @Secured("ROLE_ADMIN")
     @PostMapping
     @Transactional
@@ -71,6 +75,7 @@ public ResponseEntity<?> getOne(@PathVariable String resourceId) throws Persiste
     public ResponseEntity<?> update(@RequestBody Group group) throws PersistentEntityNotFound, InvalidGroupRegexException {
         Group result = groupService.updateGroup(group);
         entityDescriptorService.checkApprovalStatusOfEntitiesForGroup(result);
+        dynamicRegistrationService.checkApprovalStatusOfEntitiesForGroup(result);
         return ResponseEntity.ok(result);
     }
 }
diff --git a/...rnet2/tier/shibboleth/admin/ui/security/repository/DynamicRegistrationInfoRepository.java b/...rnet2/tier/shibboleth/admin/ui/security/repository/DynamicRegistrationInfoRepository.java
@@ -11,6 +11,9 @@
 public interface DynamicRegistrationInfoRepository extends JpaRepository<DynamicRegistrationInfo, String> {
     List<DynamicRegistrationInfo> findAllByIdOfOwner(String idOfOwner);
 
+    @Query(value="SELECT dri.resourceId FROM DynamicRegistrationInfo dri WHERE dri.idOfOwner = :groupId AND dri.enabled = false")
+    List<String> findAllResourceIdsByIdOfOwnerAndNotEnabled(@Param("groupId") String groupId);
+
     DynamicRegistrationInfo findByResourceId(String id);
 
     @Query(value = "SELECT dri FROM DynamicRegistrationInfo dri " +

diff --git a/.../main/java/edu/internet2/tier/shibboleth/admin/ui/service/DynamicRegistrationService.java b/.../main/java/edu/internet2/tier/shibboleth/admin/ui/service/DynamicRegistrationService.java
@@ -6,6 +6,7 @@
 import edu.internet2.tier.shibboleth.admin.ui.exception.ObjectIdExistsException;
 import edu.internet2.tier.shibboleth.admin.ui.exception.PersistentEntityNotFound;
 import edu.internet2.tier.shibboleth.admin.ui.exception.UnsupportedShibUiOperationException;
+import edu.internet2.tier.shibboleth.admin.ui.security.model.Group;
 import org.springframework.http.HttpStatus;
 
 import java.util.List;
@@ -14,6 +15,8 @@ public interface DynamicRegistrationService {
     DynamicRegistrationRepresentation approveDynamicRegistration(String resourceId, boolean status)
                     throws PersistentEntityNotFound, ForbiddenException;
 
+    void checkApprovalStatusOfEntitiesForGroup(Group result);
+
     DynamicRegistrationRepresentation createNew(DynamicRegistrationRepresentation dynRegRepresentation) throws ObjectIdExistsException,
                     MissingRequiredFieldsException;
 

diff --git a/...ava/edu/internet2/tier/shibboleth/admin/ui/service/JPADynamicRegistrationServiceImpl.java b/...ava/edu/internet2/tier/shibboleth/admin/ui/service/JPADynamicRegistrationServiceImpl.java
@@ -1,5 +1,6 @@
 package edu.internet2.tier.shibboleth.admin.ui.service;
 
+import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor;
 import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.DynamicRegistrationRepresentation;
 import edu.internet2.tier.shibboleth.admin.ui.domain.oidc.DynamicRegistrationInfo;
 import edu.internet2.tier.shibboleth.admin.ui.exception.ForbiddenException;
@@ -237,4 +238,18 @@ public DynamicRegistrationRepresentation updateGroupForDynamicRegistration(Strin
         DynamicRegistrationInfo savedEntity = repository.save(existingDri);
         return new DynamicRegistrationRepresentation(savedEntity);
     }
+
+    /**
+     * Update the approval status of entities that were in some approval state but the group approvers were added/removed.
+     */
+    @Override
+    public void checkApprovalStatusOfEntitiesForGroup(Group group) {
+        repository.findAllResourceIdsByIdOfOwnerAndNotEnabled(group.getResourceId()).forEach(id -> {
+            DynamicRegistrationInfo dri = repository.findByResourceId(id);
+            int approvedCount = dri.approvedCount(); // total number of approvals so far
+            List<Approvers> theApprovers = groupService.find(dri.getIdOfOwner()).getApproversList();
+            dri.setApproved(approvedCount >= theApprovers.size());
+            dri = repository.save(dri);
+        });
+    }
 }