Zeeqs 2.0.0 (#135)

* feat(hazelcast): import process instead of deployment records * refactor(hazelcast): import only events * feat(hazelcast): import subscriptions with key * feat(hazelcast): map all BPMN element types * refactor(data/graphql): rename workflow to process * feat(data): import message variables * feat(graphql): find message subscription by process * build(maven): fix scm links
camunda-community-hub · May 28, 2021 · e7e1fef · e7e1fef
1 parent 779ca0e
commit e7e1fef
Show file tree

Hide file tree

Showing 75 changed files with 976 additions and 773 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ A query can be send via HTTP POST request and a JSON body containing the `query`
 curl \
   -X POST \
   -H "Content-Type: application/json" \
-  --data '{ "query": "{ workflows { nodes { key } } }" }' \
+  --data '{ "query": "{ processes { nodes { key } } }" }' \
   http://localhost:9000/graphql
 ```
 
@@ -30,14 +30,14 @@ http://localhost:9000/graphiql
 ### Queries
 
 The API provide the following queries:
-* workflows
-* workflowInstances
+* processes
+* processInstances
 * jobs
 * messages 
 * incidents
 * errors
 
-And additional queries to request a single object by its key (e.g. `workflow(key: "2251799813685249")`).
+And additional queries to request a single object by its key (e.g. `process(key: "2251799813685249")`).
 
 ### Pagination
 
@@ -47,7 +47,7 @@ In addition to the items, the query result contains also the total count of the
 
 ```graphql
 {
-  workflows(perPage: 10, page: 0) {
+  processes(perPage: 10, page: 0) {
     totalCount
     nodes {
       key
@@ -62,7 +62,7 @@ Some queries allow to filter the result by passing arguments in the query.
 
 ```graphql
 {
-  workflowInstances(stateIn: [ACTIVATED]) {
+  processInstances(stateIn: [ACTIVATED]) {
     nodes {
       key
     }
@@ -72,17 +72,17 @@ Some queries allow to filter the result by passing arguments in the query.
 
 ### Examples
 
-Get workflows including their workflow instance count: 
+Get processes including their process instance count: 
 
 ```graphql
 {
-  workflows {
+  processes {
     totalCount
     nodes {
       key
       bpmnProcessId
       version
-      workflowInstances {
+      processInstances {
         totalCount
       }
     }
@@ -97,30 +97,30 @@ Get workflows including their workflow instance count:
 ```
 {
   "data": {
-    "workflows": {
+    "processes": {
       "totalCount": 3,
       "nodes": [
         {
           "key": "2251799813685249",
           "bpmnProcessId": "demo-process",
           "version": 1,
-          "workflowInstances": {
+          "processInstances": {
             "totalCount": 3
           }
         },
         {
           "key": "2251799813685251",
           "bpmnProcessId": "demo-2",
           "version": 1,
-          "workflowInstances": {
+          "processInstances": {
             "totalCount": 2
           }
         },
         {
           "key": "2251799813685269",
           "bpmnProcessId": "demo-3",
           "version": 1,
-          "workflowInstances": {
+          "processInstances": {
             "totalCount": 1
           }
         }
@@ -133,16 +133,16 @@ Get workflows including their workflow instance count:
   </p>
 </details>
 
-Get workflow instances that are active including their active element instances:
+Get process instances that are active including their active element instances:
 
 ```graphql
 {
-  workflowInstances(stateIn: [ACTIVATED]) {
+  processInstances(stateIn: [ACTIVATED]) {
     totalCount
     nodes {
       key
       state
-      workflow {
+      process {
         bpmnProcessId
       }
       elementInstances(stateIn: [ACTIVATED]) {
@@ -163,13 +163,13 @@ Get workflow instances that are active including their active element instances:
 ```
 {
   "data": {
-    "workflowInstances": {
+    "processInstances": {
       "totalCount": 6,
       "nodes": [
         {
           "key": "2251799813685261",
           "state": "ACTIVATED",
-          "workflow": {
+          "process": {
             "bpmnProcessId": "demo-process"
           },
           "elementInstances": [
@@ -190,7 +190,7 @@ Get workflow instances that are active including their active element instances:
         {
           "key": "2251799813685271",
           "state": "ACTIVATED",
-          "workflow": {
+          "process": {
             "bpmnProcessId": "demo-2"
           },
           "elementInstances": [
@@ -211,7 +211,7 @@ Get workflow instances that are active including their active element instances:
         {
           "key": "2251799813685277",
           "state": "ACTIVATED",
-          "workflow": {
+          "process": {
             "bpmnProcessId": "demo-2"
           },
           "elementInstances": [
@@ -232,7 +232,7 @@ Get workflow instances that are active including their active element instances:
         {
           "key": "2251799813685287",
           "state": "ACTIVATED",
-          "workflow": {
+          "process": {
             "bpmnProcessId": "demo-3"
           },
           "elementInstances": [
@@ -253,7 +253,7 @@ Get workflow instances that are active including their active element instances:
         {
           "key": "2251799813685304",
           "state": "ACTIVATED",
-          "workflow": {
+          "process": {
             "bpmnProcessId": "demo-process"
           },
           "elementInstances": [
@@ -274,7 +274,7 @@ Get workflow instances that are active including their active element instances:
         {
           "key": "2251799813685310",
           "state": "ACTIVATED",
-          "workflow": {
+          "process": {
             "bpmnProcessId": "demo-process"
           },
           "elementInstances": [
@@ -314,9 +314,9 @@ Get jobs that are activate (i.e. not completed or canceled) and have one of the
       elementInstance {
         elementId
         elementName
-        workflowInstance {
+        processInstance {
           key
-          workflow {
+          process {
             key
             bpmnProcessId
           }
@@ -344,9 +344,9 @@ Get jobs that are activate (i.e. not completed or canceled) and have one of the
           "elementInstance": {
             "elementId": "ServiceTask_19bf066",
             "elementName": "task 1",
-            "workflowInstance": {
+            "processInstance": {
               "key": "2251799813685277",
-              "workflow": {
+              "process": {
                 "key": "2251799813685251",
                 "bpmnProcessId": "demo-2"
               }
@@ -360,9 +360,9 @@ Get jobs that are activate (i.e. not completed or canceled) and have one of the
           "elementInstance": {
             "elementId": "ServiceTask_0t5azxx",
             "elementName": "task 2",
-            "workflowInstance": {
+            "processInstance": {
               "key": "2251799813685287",
-              "workflow": {
+              "process": {
                 "key": "2251799813685269",
                 "bpmnProcessId": "demo-3"
               }
@@ -376,9 +376,9 @@ Get jobs that are activate (i.e. not completed or canceled) and have one of the
           "elementInstance": {
             "elementId": "ServiceTask_0m7fzva",
             "elementName": "task 1",
-            "workflowInstance": {
+            "processInstance": {
               "key": "2251799813685310",
-              "workflow": {
+              "process": {
                 "key": "2251799813685249",
                 "bpmnProcessId": "demo-process"
               }
@@ -392,9 +392,9 @@ Get jobs that are activate (i.e. not completed or canceled) and have one of the
           "elementInstance": {
             "elementId": "ServiceTask_0f8l2yf",
             "elementName": "task 3",
-            "workflowInstance": {
+            "processInstance": {
               "key": "2251799813685261",
-              "workflow": {
+              "process": {
                 "key": "2251799813685249",
                 "bpmnProcessId": "demo-process"
               }
@@ -408,9 +408,9 @@ Get jobs that are activate (i.e. not completed or canceled) and have one of the
           "elementInstance": {
             "elementId": "ServiceTask_01flslu",
             "elementName": "task 2",
-            "workflowInstance": {
+            "processInstance": {
               "key": "2251799813685304",
-              "workflow": {
+              "process": {
                 "key": "2251799813685249",
                 "bpmnProcessId": "demo-process"
               }

diff --git a/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/BpmnElementType.kt b/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/BpmnElementType.kt
@@ -4,6 +4,7 @@ enum class BpmnElementType {
     UNSPECIFIED,
     PROCESS,
     SUB_PROCESS,
+    EVENT_SUB_PROCESS,
     START_EVENT,
     INTERMEDIATE_CATCH_EVENT,
     BOUNDARY_EVENT,

diff --git a/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/ElementInstance.kt b/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/ElementInstance.kt
@@ -1,22 +1,23 @@
 package io.zeebe.zeeqs.data.entity
 
 import javax.persistence.Entity
-import javax.persistence.Id
-import javax.persistence.Enumerated
 import javax.persistence.EnumType
+import javax.persistence.Enumerated
+import javax.persistence.Id
 
 @Entity
 class ElementInstance(
-        @Id val key: Long,
-        val elementId: String,
-        @Enumerated(EnumType.STRING)
-        val bpmnElementType: BpmnElementType,
-        val workflowInstanceKey: Long,
-        val workflowKey: Long,
-        val scopeKey: Long?
+    @Id val key: Long,
+    val position: Long,
+    val elementId: String,
+    @Enumerated(EnumType.STRING)
+    val bpmnElementType: BpmnElementType,
+    val processInstanceKey: Long,
+    val processDefinitionKey: Long,
+    val scopeKey: Long?
 ) {
 
-    
+
     var state: ElementInstanceState = ElementInstanceState.ACTIVATING
 
     var startTime: Long? = null

diff --git a/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/ElementInstanceState.kt b/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/ElementInstanceState.kt
@@ -10,6 +10,5 @@ enum class ElementInstanceState {
     TERMINATING,
     TERMINATED,
 
-    EVENT_OCCURRED,
     TAKEN
 }
diff --git a/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/Error.kt b/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/Error.kt
@@ -9,5 +9,5 @@ class Error(@Id val position: Long,
             val errorEventPosition: Long,
             @Lob val exceptionMessage: String,
             @Lob val stacktrace:String,
-            val workflowInstanceKey: Long?
+            val processInstanceKey: Long?
             )
diff --git a/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/Incident.kt b/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/Incident.kt
@@ -8,12 +8,13 @@ import javax.persistence.Lob
 
 @Entity
 class Incident(
-        @Id val key: Long,
-        val errorType: String,
-        @Lob val errorMessage: String,
-        val workflowInstanceKey: Long,
-        val elementInstanceKey: Long,
-        val jobKey: Long?
+    @Id val key: Long,
+    val position: Long,
+    val errorType: String,
+    @Lob val errorMessage: String,
+    val processInstanceKey: Long,
+    val elementInstanceKey: Long,
+    val jobKey: Long?
 ) {
 
     @Enumerated(EnumType.STRING)

diff --git a/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/Job.kt b/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/Job.kt
@@ -7,10 +7,11 @@ import javax.persistence.Id
 
 @Entity
 class Job(
-        @Id val key: Long,
-        val jobType: String,
-        val workflowInstanceKey: Long,
-        val elementInstanceKey: Long
+    @Id val key: Long,
+    val position: Long,
+    val jobType: String,
+    val processInstanceKey: Long,
+    val elementInstanceKey: Long
 ) {
 
     @Enumerated(EnumType.STRING)

diff --git a/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/JobState.kt b/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/JobState.kt
@@ -2,7 +2,6 @@ package io.zeebe.zeeqs.data.entity
 
 enum class JobState {
     ACTIVATABLE,
-    ACTIVATED,
     FAILED,
     COMPLETED,
     CANCELED,

diff --git a/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/Message.kt b/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/Message.kt
@@ -8,6 +8,7 @@ import javax.persistence.Id
 @Entity
 class Message(
         @Id val key: Long,
+        val position: Long,
         val name: String,
         val correlationKey: String?,
         val messageId: String?,

diff --git a/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/MessageCorrelation.kt b/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/MessageCorrelation.kt
@@ -7,7 +7,10 @@ import javax.persistence.Id
 class MessageCorrelation(
         @Id val position: Long,
         val messageKey: Long,
-        val messageName: String, // would favor subscriptionKey over message name + element instance key
-        val elementInstanceKey: Long,
-        val timestamp: Long
+        val messageName: String,
+        val timestamp: Long,
+        val processInstanceKey: Long,
+        val elementInstanceKey: Long?,
+        val elementId: String?,
+        val processDefinitionKey: Long?
 )
diff --git a/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/MessageState.kt b/data/src/main/kotlin/io/zeebe/zeeqs/data/entity/MessageState.kt
@@ -2,5 +2,5 @@ package io.zeebe.zeeqs.data.entity
 
 enum class MessageState {
     PUBLISHED,
-    DELETED
+    EXPIRED
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,5 +2,5 @@ package io.zeebe.zeeqs.data.entity @@
     enum class MessageState {
         PUBLISHED,
-        DELETED
+        EXPIRED
     }