Merge pull request #357 from netgrif/NAE-2202

machacjozef · web-flow · commit da1c6ad4d2cd · 2025-09-11T00:11:39.000+02:00
[NAE-2202] Post test fixes
diff --git a/application-engine/src/main/java/com/netgrif/application/engine/menu/services/MenuItemService.java b/application-engine/src/main/java/com/netgrif/application/engine/menu/services/MenuItemService.java
@@ -28,6 +28,7 @@
 import com.netgrif.application.engine.workflow.service.interfaces.IDataService;
 import com.netgrif.application.engine.workflow.service.interfaces.ITaskService;
 import com.netgrif.application.engine.workflow.service.interfaces.IWorkflowService;
+import com.querydsl.core.types.Predicate;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -194,9 +195,9 @@ public Case findMenuItem(String identifier) {
 
     @Override
     public Case findMenuItem(String identifier, boolean retry) {
-        String query = String.format("processIdentifier:%s AND dataSet.%s.textValue.keyword:\"%s\"",
-                MenuProcessRunner.MENU_NET_IDENTIFIER, MenuItemConstants.FIELD_IDENTIFIER, identifier);
-        return findCase(MenuProcessRunner.MENU_NET_IDENTIFIER, query);
+        return findCase(QCase.case$.processIdentifier
+                .eq(MenuProcessRunner.MENU_NET_IDENTIFIER)
+                .and(QCase.case$.dataSet.get(MenuItemConstants.FIELD_IDENTIFIER).value.eq(identifier)));
     }
 
     /**
@@ -208,10 +209,10 @@ public Case findMenuItem(String identifier, boolean retry) {
      */
     @Override
     public Case findMenuItem(String path, String name) {
-//        TODO retry
-        String query = String.format("processIdentifier:%s AND title.keyword:\"%s\" AND nodePath:\"%s\"",
-                MenuProcessRunner.MENU_NET_IDENTIFIER, name, path);
-        return findCase(MenuProcessRunner.MENU_NET_IDENTIFIER, query);
+        return findCase(QCase.case$.processIdentifier
+                .eq(MenuProcessRunner.MENU_NET_IDENTIFIER)
+                .and(QCase.case$.title.eq(name))
+                .and(QCase.case$.dataSet.get(MenuItemConstants.FIELD_NODE_PATH).value.eq(path)));
     }
 
     /**
@@ -223,9 +224,9 @@ public Case findMenuItem(String path, String name) {
     @Override
     public Case findFolderCase(String path) {
 //        TODO
-        String query = String.format("processIdentifier:%s AND dataSet.%s.textValue.keyword:\"%s\"",
-                MenuProcessRunner.MENU_NET_IDENTIFIER, MenuItemConstants.FIELD_NODE_PATH, path);
-        return findCase(MenuProcessRunner.MENU_NET_IDENTIFIER, query);
+        return findCase(QCase.case$.processIdentifier
+                .eq(MenuProcessRunner.MENU_NET_IDENTIFIER)
+                .and(QCase.case$.dataSet.get(MenuItemConstants.FIELD_NODE_PATH).value.eq(path)));
     }
 
     /**
@@ -384,6 +385,10 @@ public Case removeChildItemFromParent(String folderId, Case childItem) {
         return workflowService.save(parentFolder);
     }
 
+    protected Case findCase(Predicate predicate) {
+        return workflowService.searchOne(predicate);
+    }
+
     protected Case findCase(String processIdentifier, String query) {
         CaseSearchRequest request = CaseSearchRequest.builder()
                 .process(Collections.singletonList(new CaseSearchRequest.PetriNet(processIdentifier)))
diff --git a/application-engine/src/main/java/com/netgrif/application/engine/workflow/service/CaseEventHandler.java b/application-engine/src/main/java/com/netgrif/application/engine/workflow/service/CaseEventHandler.java
@@ -1,16 +1,22 @@
 package com.netgrif.application.engine.workflow.service;
 
 import com.netgrif.application.engine.elastic.service.interfaces.IElasticCaseService;
+import com.netgrif.application.engine.importer.service.FieldFactory;
+import com.netgrif.application.engine.objects.petrinet.domain.dataset.Field;
 import com.netgrif.application.engine.objects.workflow.domain.Case;
+import com.netgrif.application.engine.workflow.service.interfaces.IWorkflowService;
 import org.bson.Document;
-import org.bson.types.ObjectId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener;
+import org.springframework.data.mongodb.core.mapping.event.AfterConvertEvent;
 import org.springframework.data.mongodb.core.mapping.event.AfterDeleteEvent;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Component
 public class CaseEventHandler extends AbstractMongoEventListener<Case> {
 
@@ -19,6 +25,30 @@ public class CaseEventHandler extends AbstractMongoEventListener<Case> {
     @Autowired
     private IElasticCaseService service;
 
+    @Autowired
+    private FieldFactory fieldFactory;
+
+    @Autowired
+    private IWorkflowService workflowService;
+
+    @Override
+    public void onAfterConvert(AfterConvertEvent<Case> event) {
+        Case useCase = event.getSource();
+        workflowService.setPetriNet(useCase);
+        List<Field<?>> immediateFields = new ArrayList<>();
+        if (useCase.getImmediateDataFields() != null) {
+            useCase.getImmediateDataFields().forEach(fieldId -> {
+                try {
+                    immediateFields.add(fieldFactory.buildImmediateField(useCase, fieldId));
+                } catch (Exception e) {
+                    log.error("Could not build immediate field for case {} and field {}", useCase.getStringId(), fieldId, e);
+                }
+            }
+            );
+            useCase.setImmediateData(immediateFields);
+        }
+    }
+
     @Override
     public void onAfterDelete(AfterDeleteEvent<Case> event) {
         Document document = event.getDocument();
diff --git a/application-engine/src/main/java/com/netgrif/application/engine/workflow/service/WorkflowService.java b/application-engine/src/main/java/com/netgrif/application/engine/workflow/service/WorkflowService.java
@@ -497,6 +497,17 @@ public Map<String, I18nString> listToMap(List<Case> cases) {
         return options;
     }
 
+    @Override
+    public void setPetriNet(Case useCase) {
+        PetriNet model = useCase.getPetriNet();
+        if (model == null) {
+            model = new com.netgrif.application.engine.adapter.spring.petrinet.domain.PetriNet((com.netgrif.application.engine.adapter.spring.petrinet.domain.PetriNet) petriNetService.get(new ObjectId(useCase.getPetriNetId())));
+            useCase.setPetriNet(model);
+        }
+        model.initializeTokens(useCase.getActivePlaces());
+        model.initializeArcs(useCase.getDataSet());
+    }
+
     private void resolveTaskRefs(Case useCase) {
         useCase.getPetriNet().getDataSet().values().stream().filter(f -> f instanceof TaskField).map(TaskField.class::cast).forEach(field -> {
             if (field.getDefaultValue() != null && !field.getDefaultValue().isEmpty() && useCase.getDataField(field.getStringId()).getValue() != null &&
@@ -608,16 +619,6 @@ private Map<DataField, String> getEncryptedDataSet(Case useCase) {
         return encryptedDataSet;
     }
 
-    private void setPetriNet(Case useCase) {
-        PetriNet model = useCase.getPetriNet();
-        if (model == null) {
-            model = new com.netgrif.application.engine.adapter.spring.petrinet.domain.PetriNet((com.netgrif.application.engine.adapter.spring.petrinet.domain.PetriNet) petriNetService.get(new ObjectId(useCase.getPetriNetId())));
-            useCase.setPetriNet(model);
-        }
-        model.initializeTokens(useCase.getActivePlaces());
-        model.initializeArcs(useCase.getDataSet());
-    }
-
     private EventOutcome addMessageToOutcome(PetriNet net, CaseEventType type, EventOutcome outcome) {
         if (net.getCaseEvents().containsKey(type)) {
             outcome.setMessage(net.getCaseEvents().get(type).getMessage());
diff --git a/application-engine/src/main/java/com/netgrif/application/engine/workflow/service/interfaces/IWorkflowService.java b/application-engine/src/main/java/com/netgrif/application/engine/workflow/service/interfaces/IWorkflowService.java
@@ -82,4 +82,6 @@ public interface IWorkflowService {
     boolean removeTasksFromCase(List<Task> tasks, Case useCase);
 
     Page<Case> search(Predicate predicate, Pageable pageable);
+
+    void setPetriNet(Case useCase);
 }
diff --git a/nae-spring-core-adapter/src/main/java/com/netgrif/application/engine/adapter/spring/workflow/domain/Case.java b/nae-spring-core-adapter/src/main/java/com/netgrif/application/engine/adapter/spring/workflow/domain/Case.java
@@ -64,7 +64,9 @@ public Set<String> getEnabledRoles() {
         return super.getEnabledRoles();
     }
 
+
     @Override
+    @Transient
     public List<Field<?>> getImmediateData() {
         return super.getImmediateData();
     }

Original file line number	Diff line number	Diff line change
`@@ -82,4 +82,6 @@ public interface IWorkflowService {`
`82`	`82`	`boolean removeTasksFromCase(List<Task> tasks, Case useCase);`
`83`	`83`
`84`	`84`	`Page<Case> search(Predicate predicate, Pageable pageable);`
	`85`	`+`
	`86`	`+ void setPetriNet(Case useCase);`
`85`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,9 @@ public Set<String> getEnabledRoles() {`
`64`	`64`	`return super.getEnabledRoles();`
`65`	`65`	`}`
`66`	`66`
	`67`	`+`
`67`	`68`	`@Override`
	`69`	`+ @Transient`
`68`	`70`	`public List<Field<?>> getImmediateData() {`
`69`	`71`	`return super.getImmediateData();`
`70`	`72`	`}`