Merge remote-tracking branch 'origin/release/7.0.0-rev7' into NAE-2197

Author: machacjozef

application-engine/src/main/java/com/netgrif/application/engine/ApplicationEngine.java

@@ -13,7 +13,9 @@
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.mongodb.config.EnableMongoAuditing;
 import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
@@ -32,7 +34,11 @@
 @EnableMethodSecurity
 @EnableAspectJAutoProxy
 @ConfigurationPropertiesScan
-@EnableMongoRepositories("com.netgrif")
+@EnableMongoRepositories(basePackages = {"com.netgrif"}, excludeFilters = {
+        @ComponentScan.Filter(
+                type = FilterType.REGEX,
+                pattern = "com\\.netgrif\\.application\\.engine\\.module\\.eventlog\\..*"
+        )})
 @SpringBootApplication(
         exclude = {DataSourceAutoConfiguration.class},
         scanBasePackages = {"com.netgrif"})

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

@@ -524,29 +524,20 @@ public AbstractUser removeRole(AbstractUser user, String roleString) {
 
     @Override
     public void removeRoleOfDeletedPetriNet(PetriNet petriNet) {
-        String defaultRealm = collectionNameProvider.getDefaultRealmCollection();
-        Pageable pageable = PageRequest.of(0, paginationProperties.getBackendPageSize());
-        Page<AbstractUser> users;
-        do {
-            users = findAllByProcessRoles(petriNet.getRoles().values().stream().map(ProcessRole::get_id).collect(Collectors.toSet()), defaultRealm, pageable);
-            users.forEach(u -> {
-                petriNet.getRoles().forEach((k, role) -> removeRole(u, role.get_id()));
-            });
-            pageable = pageable.next();
-        } while (users.hasNext());
+        removeRoleOfDeletedPetriNet(new HashSet<>(petriNet.getRoles().values()));
     }
 
     @Override
     public void removeRoleOfDeletedPetriNet(Set<ProcessRole> petriNetRoles) {
-        String defaultRealm = collectionNameProvider.getDefaultRealmCollection();
+        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 = findAllByProcessRoles(petriNetRoles.stream().map(ProcessRole::get_id).collect(Collectors.toSet()), defaultRealm, pageable);
-            users.forEach(u -> {
-                petriNetRoles.forEach(role -> removeRole(u, role.get_id()));
-            });
-        }while (users.hasNext());
+            users = searchUsersByRoleIds(roleIds, defaultRealmCollection, pageable);
+            users.getContent().forEach(u -> removeRoles(u, petriNetRoles));
+            pageable = pageable.next();
+        } while (users.hasNext());
     }
 
     @Override