Merge pull request #351 from netgrif/NAE-2186

[NAE-2186] PetriNet objects gRPC serialization

Author: machacjozef

application-engine/src/main/java/com/netgrif/application/engine/petrinet/service/PetriNetService.java

@@ -538,7 +538,7 @@ public void deletePetriNet(String processId, LoggedUser loggedUser, boolean forc
         PetriNet petriNet = petriNetOptional.get();
         log.info("[{}]: Initiating deletion of Petri net {} version {}", processId, petriNet.getIdentifier(), petriNet.getVersion().toString());
 
-        userService.removeRoleOfDeletedPetriNet(petriNet, null);
+        userService.removeRoleOfDeletedPetriNet(petriNet);
         workflowService.deleteInstancesOfPetriNet(petriNet, force);
         processRoleService.deleteRolesOfNet(petriNet, loggedUser);
 

nae-user-ce/src/main/java/com/netgrif/application/engine/auth/service/UserServiceImpl.java

@@ -28,7 +28,6 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -524,19 +523,21 @@ public AbstractUser removeRole(AbstractUser user, String roleString) {
     }
 
     @Override
-    public void removeRoleOfDeletedPetriNet(PetriNet petriNet, Collection<String> realmIds) {
-        Set<String> collectionNames = collectionNameProvider.getCollectionNamesForRealms(realmIds);
-        collectionNames.forEach(collection -> {
-            Pageable pageable = PageRequest.of(0, paginationProperties.getBackendPageSize());
-            Page<AbstractUser> users;
-            do {
-                users = findAllByProcessRoles(petriNet.getRoles().values().stream().map(ProcessRole::get_id).collect(Collectors.toSet()), collection, pageable);
-                users.forEach(u -> {
-                    petriNet.getRoles().forEach((k, role) -> removeRole(u, role.get_id()));
-                });
-                pageable = pageable.next();
-            } while (users.hasNext());
-        });
+    public void removeRoleOfDeletedPetriNet(PetriNet petriNet) {
+        removeRoleOfDeletedPetriNet(new HashSet<>(petriNet.getRoles().values()));
+    }
+
+    @Override
+    public void removeRoleOfDeletedPetriNet(Set<ProcessRole> petriNetRoles) {
+        String defaultRealmCollection = collectionNameProvider.getDefaultRealmCollection();
+        Pageable pageable = PageRequest.of(0, paginationProperties.getBackendPageSize());
+        Collection<ProcessResourceId> roleIds = petriNetRoles.stream().map(ProcessRole::get_id).collect(Collectors.toSet());
+        Page<AbstractUser> users;
+        do {
+            users = searchUsersByRoleIds(roleIds, defaultRealmCollection, pageable);
+            users.getContent().forEach(u -> removeRoles(u, petriNetRoles));
+            pageable = pageable.next();
+        } while (users.hasNext());
     }
 
     @Override

nae-user-common/src/main/java/com/netgrif/application/engine/auth/service/UserService.java

@@ -16,6 +16,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 /**
  * Service interface for managing user-related operations in the application.
@@ -351,9 +352,15 @@ Page<AbstractUser> searchAllCoMembers(String query, Collection<ProcessResourceId
      * Removes roles associated with a deleted Petri net from users in specified realms.
      *
      * @param process the deleted Petri net
-     * @param realmIds collection of realm identifiers
      */
-    void removeRoleOfDeletedPetriNet(PetriNet process, Collection<String> realmIds);
+    void removeRoleOfDeletedPetriNet(PetriNet process);
+
+    /**
+     * Removes roles associated with a deleted Petri net from users in specified realms.
+     *
+     * @param petriNetRoles roles of deleted Petri net
+     */
+    void removeRoleOfDeletedPetriNet(Set<ProcessRole> petriNetRoles);
 
     /**
      * Creates a system user.