[NAE-2212] Cluster scope process function caches

application-engine/pom.xml

@@ -270,18 +270,6 @@
             <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
         <!-- Groovy -->
         <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-all -->
         <dependency>

application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy

@@ -2444,9 +2444,13 @@ class ActionDelegate {
                 return [(role.importId + ":" + GLOBAL_ROLE), ("$role.name (🌍 Global role)" as String)]
             } else {
                 if (!temp.containsKey(entry.value)) {
-                    temp.put(entry.value, petriNetService.getNewestVersionByIdentifier(entry.value))
+                    temp.put(entry.value, petriNetService.getActiveVersionByIdentifier(entry.value))
                 }
                 PetriNet net = temp[entry.value]
+                if (net == null) {
+                    throw new IllegalArgumentException("The process with identifier [%s] could not be found when collecting roles."
+                            .formatted(entry.value))
+                }
                 ProcessRole role = net.roles.find { it.value.importId == entry.key }.value
                 return [(role.importId + ":" + net.identifier), ("$role.name ($net.title)" as String)]
             }

application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/FieldActionsRunner.groovy

@@ -77,7 +77,7 @@ abstract class FieldActionsRunner {
         actionsCacheService.getCachedFunctions(functions).each {
             actionDelegate.metaClass."${it.function.name}" << it.code
         }
-        actionsCacheService.getNamespaceFunctionCache().each { entry ->
+        actionsCacheService.getGlobalFunctionsCache().each { entry ->
             def namespace = [:]
             entry.getValue().each {
                 namespace["${it.function.name}"] = it.code.rehydrate(actionDelegate, it.code.owner, it.code.thisObject)

application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/delegate/RoleActionDelegate.groovy

@@ -51,7 +51,10 @@ class RoleActionDelegate extends AbstractActionDelegate<RoleContext> {
     }
 
     AbstractUser assignRole(String roleImportId, String petriNetIdentifier, AbstractUser user = affectedUser) {
-        PetriNet petriNet = petriNetService.getNewestVersionByIdentifier(petriNetIdentifier)
+        PetriNet petriNet = petriNetService.getActiveVersionByIdentifier(petriNetIdentifier)
+        if (petriNet == null) {
+            throw new IllegalArgumentException("The process with identifier [%s] could not be found".formatted(petriNetIdentifier))
+        }
         assignRole(roleImportId, user, petriNet)
     }
 
@@ -75,7 +78,10 @@ class RoleActionDelegate extends AbstractActionDelegate<RoleContext> {
     }
 
     AbstractUser removeRole(String roleImportId, String petriNetIdentifier, AbstractUser user = affectedUser) {
-        PetriNet petriNet = petriNetService.getNewestVersionByIdentifier(petriNetIdentifier)
+        PetriNet petriNet = petriNetService.getActiveVersionByIdentifier(petriNetIdentifier)
+        if (petriNet == null) {
+            throw new IllegalArgumentException("The process with identifier [%s] could not be found".formatted(petriNetIdentifier))
+        }
         removeRole(roleImportId, user, petriNet)
     }
 

application-engine/src/main/groovy/com/netgrif/application/engine/startup/ImportHelper.groovy

@@ -128,7 +128,7 @@ class ImportHelper {
     }
 
     Optional<PetriNet> upsertNet(String filename, String identifier, VersionType release = VersionType.MAJOR, LoggedUser author = ActorTransformer.toLoggedUser(userService.getSystem())) {
-        PetriNet petriNet = petriNetService.getNewestVersionByIdentifier(identifier)
+        PetriNet petriNet = petriNetService.getActiveVersionByIdentifier(identifier)
         if (!petriNet) {
             return createNet(filename, release, author)
         }
@@ -249,7 +249,7 @@ class ImportHelper {
     }
 
     Optional<PetriNet> importProcessOnce(String message, String netIdentifier, String netFileName) {
-        PetriNet filter = petriNetService.getNewestVersionByIdentifier(netIdentifier)
+        PetriNet filter = petriNetService.getActiveVersionByIdentifier(netIdentifier)
         if (filter != null) {
             log.info("${message} has already been imported.")
             return Optional.of(filter)

application-engine/src/main/java/com/netgrif/application/engine/configuration/CacheConfiguration.java

@@ -10,6 +10,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 
+
 @Configuration
 @EnableCaching
 public class CacheConfiguration extends CachingConfigurerSupport {

application-engine/src/main/java/com/netgrif/application/engine/configuration/properties/CacheConfigurationProperties.java

@@ -27,9 +27,14 @@ public class CacheConfigurationProperties {
     private String petriNetByIdentifier = "petriNetByIdentifier";
 
     /**
-     * Default cache name for caching the newest versions of Petri nets.
+     * Default cache name for caching the active versions of Petri nets.
      */
-    private String petriNetNewest = "petriNetNewest";
+    private String petriNetActive = "petriNetActive";
+
+    /**
+     * Default cache name for caching the latest versions of Petri nets.
+     */
+    private String petriNetLatest = "petriNetLatest";
 
     /**
      * Default cache name for general Petri net caching.
@@ -41,6 +46,11 @@ public class CacheConfigurationProperties {
      */
     private String loadedModules = "loadedModules";
 
+    /**
+     * Default cache name for caching namespace functions.
+     */
+    private String globalFunctions = "globalFunctions";
+
     /**
      * A list of additional custom cache names.
      * Allows users to define their own cache names for specific use cases.
@@ -54,7 +64,8 @@ public class CacheConfigurationProperties {
      * @return a {@link Set} of all cache names.
      */
     public Set<String> getAllCaches() {
-        Set<String> caches = new LinkedHashSet<>(Arrays.asList(petriNetById, petriNetByIdentifier, petriNetNewest, petriNetCache, loadedModules));
+        Set<String> caches = new LinkedHashSet<>(Arrays.asList(petriNetById, petriNetByIdentifier, petriNetActive,
+                petriNetLatest, petriNetCache, loadedModules, globalFunctions));
         caches.addAll(additional);
         return caches;
     }

application-engine/src/main/java/com/netgrif/application/engine/configuration/properties/RunnerConfigurationProperties.java

@@ -56,7 +56,7 @@ public static class FieldRunnerProperties {
         /**
          * The size of the cache used for maintaining field runner namespaces.
          */
-        private int namespaceCacheSize = 500;
+        private int globalFunctionsCacheSize = 500;
     }
 
     /**

application-engine/src/main/java/com/netgrif/application/engine/importer/service/FunctionFactory.java

@@ -1,5 +1,6 @@
 package com.netgrif.application.engine.importer.service;
 
+import com.netgrif.application.engine.objects.importer.model.Scope;
 import com.netgrif.application.engine.objects.petrinet.domain.Function;
 import com.netgrif.application.engine.objects.petrinet.domain.FunctionScope;
 import lombok.extern.slf4j.Slf4j;
@@ -9,7 +10,10 @@
 @Slf4j
 public final class FunctionFactory {
 
+    private static final String NAMESPACE = "namespace";
+
     public Function getFunction(com.netgrif.application.engine.objects.importer.model.Function function) {
+        checkDeprecatedAttributes(function);
         Function function1 = new Function();
 
         function1.setDefinition(function.getValue());
@@ -18,4 +22,11 @@ public Function getFunction(com.netgrif.application.engine.objects.importer.mode
 
         return function1;
     }
+
+    private void checkDeprecatedAttributes(com.netgrif.application.engine.objects.importer.model.Function function) {
+        if (function.getScope() != null && function.getScope().value().equals(NAMESPACE)) {
+            log.warn("Function scope [NAMESPACE] is deprecated. Replacing with [GLOBAL].]");
+            function.setScope(Scope.GLOBAL);
+        }
+    }
 }

application-engine/src/main/java/com/netgrif/application/engine/menu/services/DashboardItemServiceImpl.java

@@ -8,6 +8,7 @@
 import com.netgrif.application.engine.objects.auth.domain.AbstractUser;
 import com.netgrif.application.engine.objects.auth.domain.ActorTransformer;
 import com.netgrif.application.engine.objects.auth.domain.LoggedUser;
+import com.netgrif.application.engine.objects.petrinet.domain.PetriNet;
 import com.netgrif.application.engine.objects.petrinet.domain.throwable.TransitionNotExecutableException;
 import com.netgrif.application.engine.objects.utils.MenuItemUtils;
 import com.netgrif.application.engine.objects.workflow.domain.Case;
@@ -62,7 +63,11 @@ public Case getOrCreate(DashboardItemBody body) throws TransitionNotExecutableEx
         }
 
         LoggedUser loggedUser = ActorTransformer.toLoggedUser(userService.getLoggedOrSystem());
-        itemCase = workflowService.createCase(petriNetService.getNewestVersionByIdentifier(DashboardItemConstants.PROCESS_IDENTIFIER).getStringId(), body.getName().getDefaultValue(), "", loggedUser).getCase();
+        PetriNet petriNet = petriNetService.getActiveVersionByIdentifier(DashboardItemConstants.PROCESS_IDENTIFIER);
+        if (petriNet == null) {
+            throw new IllegalStateException("Dashboard item process not found or not active");
+        }
+        itemCase = workflowService.createCase(petriNet.getStringId(), body.getName().getDefaultValue(), "", loggedUser).getCase();
         ToDataSetOutcome outcome = body.toDataSet();
         itemCase = setDataWithExecute(itemCase, DashboardItemConstants.TASK_CONFIGURE, outcome.getDataSet());
         return itemCase;

application-engine/src/main/java/com/netgrif/application/engine/menu/services/DashboardManagementServiceImpl.java

@@ -9,6 +9,7 @@
 import com.netgrif.application.engine.objects.auth.domain.ActorTransformer;
 import com.netgrif.application.engine.objects.auth.domain.LoggedUser;
 import com.netgrif.application.engine.objects.petrinet.domain.I18nString;
+import com.netgrif.application.engine.objects.petrinet.domain.PetriNet;
 import com.netgrif.application.engine.objects.petrinet.domain.throwable.TransitionNotExecutableException;
 import com.netgrif.application.engine.objects.utils.MenuItemUtils;
 import com.netgrif.application.engine.objects.workflow.domain.Case;
@@ -64,7 +65,11 @@ public Case createDashboardManagement(DashboardManagementBody body) throws Trans
         }
         addReferencedMenuItems(body);
         LoggedUser loggedUser = ActorTransformer.toLoggedUser(userService.getLoggedOrSystem());
-        managementCase = workflowService.createCase(petriNetService.getNewestVersionByIdentifier(DashboardManagementConstants.PROCESS_IDENTIFIER).getStringId(), body.getName().getDefaultValue(), "", loggedUser).getCase();
+        PetriNet petriNet = petriNetService.getActiveVersionByIdentifier(DashboardManagementConstants.PROCESS_IDENTIFIER);
+        if (petriNet == null) {
+            throw new IllegalStateException("Dashboard management process not found or not active");
+        }
+        managementCase = workflowService.createCase(petriNet.getStringId(), body.getName().getDefaultValue(), "", loggedUser).getCase();
         ToDataSetOutcome outcome = body.toDataSet();
         managementCase = setDataWithExecute(managementCase, DashboardItemConstants.TASK_CONFIGURE, outcome.getDataSet());
         return managementCase;

application-engine/src/main/java/com/netgrif/application/engine/petrinet/domain/repositories/PetriNetRepository.java

@@ -33,6 +33,15 @@ public interface PetriNetRepository extends MongoRepository<PetriNet, String>, Q
      */
     PetriNet findByIdentifierAndVersion(String identifier, Version version);
 
+    /**
+     * Finds a {@link PetriNet} entity by its identifier and versionActive attribute
+     *
+     * @param identifier the unique identifier of the PetriNet.
+     * @param versionActive if true, the active version will be found, otherwise the inactive version
+     * @return the {@link PetriNet} entity matching the given identifier and versionActive attribute, or {@code null} if none found.
+     */
+    PetriNet findByIdentifierAndVersionActive(String identifier, boolean versionActive);
+
     /**
      * Finds a paginated list of {@link PetriNet} entities by their identifier.
      *