Refactor Petri net initialization and improve error handling.

Moved Petri net initialization logic to IWorkflowService for better encapsulation and reuse. Enhanced error handling in immediate field processing to avoid failures during case conversion.

Author: renczesstefan

application-engine/src/main/java/com/netgrif/application/engine/workflow/service/CaseEventHandler.java

@@ -4,8 +4,8 @@
 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;
@@ -16,7 +16,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.LongStream;
 
 @Component
 public class CaseEventHandler extends AbstractMongoEventListener<Case> {
@@ -29,14 +28,25 @@ public class CaseEventHandler extends AbstractMongoEventListener<Case> {
     @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<>();
-        useCase.getImmediateDataFields().forEach(fieldId ->
-                immediateFields.add(fieldFactory.buildImmediateField(useCase, fieldId))
-        );
-        useCase.setImmediateData(immediateFields);
+        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

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());

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);
 }