Merge remote-tracking branch 'origin/master'

CHANGELOG.md

@@ -5,7 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-Full Changelog: [https://github.com/netgrif/application-engine/commits/v6.3.1](https://github.com/netgrif/application-engine/commits/v6.3.1)
+Full Changelog: [https://github.com/netgrif/application-engine/commits/v6.3.2](https://github.com/netgrif/application-engine/commits/v6.3.2)
+
+## [6.3.2](https://github.com/netgrif/application-engine/releases/tag/v6.3.1) (2023-11-08)
+
+### Fixed
+
+- [NAE-1910] Event log is missing change in case's active places
 
 ## [6.3.1](https://github.com/netgrif/application-engine/releases/tag/v6.3.1) (2023-07-18)
 

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.netgrif</groupId>
     <artifactId>application-engine</artifactId>
-    <version>6.3.1</version>
+    <version>6.3.2</version>
     <packaging>jar</packaging>
 
     <name>NETGRIF Application Engine</name>
@@ -19,10 +19,12 @@
             <distribution>repo</distribution>
         </license>
     </licenses>
+
     <organization>
         <name>NETGRIF, s.r.o.</name>
         <url>https://netgrif.com</url>
     </organization>
+
     <developers>
         <developer>
             <name>Netgrif</name>
@@ -31,11 +33,13 @@
             <organizationUrl>https://netgrif.com</organizationUrl>
         </developer>
     </developers>
+
     <scm>
         <connection>scm:git:git://github.com/netgrif/application-engine.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/netgrif/application-engine.git</developerConnection>
         <url>https://github.com/netgrif/application-engine</url>
     </scm>
+
     <issueManagement>
         <system>GitHub</system>
         <url>https://github.com/netgrif/application-engine/issues</url>

src/main/java/com/netgrif/application/engine/history/domain/caseevents/CaseEventLog.java

@@ -3,45 +3,37 @@
 import com.netgrif.application.engine.history.domain.petrinetevents.PetriNetEventLog;
 import com.netgrif.application.engine.petrinet.domain.events.EventPhase;
 import com.netgrif.application.engine.workflow.domain.Case;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.bson.types.ObjectId;
 
+import java.util.Map;
+
+@Data
 @EqualsAndHashCode(callSuper = true)
 public abstract class CaseEventLog extends PetriNetEventLog {
 
     protected String caseId;
 
     protected String caseTitle;
 
+    private Map<String, Integer> activePlaces;
+
+    private Map<String, Integer> consumedTokens;
+
     protected CaseEventLog() {
         super();
     }
 
-    protected CaseEventLog(ObjectId triggerId, Case useCase, EventPhase eventPhase) {
-        super(triggerId, eventPhase, useCase.getPetriNetObjectId());
-        this.caseId = useCase.getStringId();
-        this.caseTitle = useCase.getTitle();
-    }
-
     protected CaseEventLog(Case useCase, EventPhase eventPhase) {
         this(useCase.get_id(), useCase, eventPhase);
-        this.caseId = useCase.getStringId();
-        this.caseTitle = useCase.getTitle();
     }
 
-    public String getCaseId() {
-        return caseId;
-    }
-
-    public void setCaseId(String caseId) {
-        this.caseId = caseId;
-    }
-
-    public String getCaseTitle() {
-        return caseTitle;
-    }
-
-    public void setCaseTitle(String caseTitle) {
-        this.caseTitle = caseTitle;
+    protected CaseEventLog(ObjectId triggerId, Case useCase, EventPhase eventPhase) {
+        super(triggerId, eventPhase, useCase.getPetriNetObjectId());
+        this.caseId = useCase.getStringId();
+        this.caseTitle = useCase.getTitle();
+        this.activePlaces = useCase.getActivePlaces();
+        this.consumedTokens = useCase.getConsumedTokens();
     }
 }

src/main/java/com/netgrif/application/engine/history/domain/caseevents/CreateCaseEventLog.java

@@ -13,9 +13,6 @@
 @EqualsAndHashCode(callSuper = true)
 public class CreateCaseEventLog extends CaseEventLog {
 
-    @Field("activePlaces")
-    private Map<String, Integer> activePlaces;
-
     @Field("dataSetValues")
     private Map<String, DataField> dataSetValues;
 
@@ -25,18 +22,9 @@ public CreateCaseEventLog() {
 
     public CreateCaseEventLog(Case useCase, EventPhase eventPhase) {
         super(useCase, eventPhase);
-        this.activePlaces = useCase.getActivePlaces();
         this.dataSetValues = useCase.getDataSet();
     }
 
-    public Map<String, Integer> getActivePlaces() {
-        return activePlaces;
-    }
-
-    public void setActivePlaces(Map<String, Integer> places) {
-        this.activePlaces = places;
-    }
-
     public Map<String, DataField> getDataSetValues() {
         return dataSetValues;
     }