#115 map more fields to TaskInformation for C7Enbedded

bpm-crafters · Dec 13, 2024 · 0726115 · 0726115
1 parent d870410
commit 0726115
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/...mcrafters/processengineapi/adapter/c7/embedded/task/delivery/TaskInformationExtensions.kt b/...mcrafters/processengineapi/adapter/c7/embedded/task/delivery/TaskInformationExtensions.kt
@@ -6,9 +6,10 @@ import org.camunda.bpm.engine.delegate.DelegateTask
 import org.camunda.bpm.engine.externaltask.LockedExternalTask
 import org.camunda.bpm.engine.impl.persistence.entity.ExternalTaskEntity
 import org.camunda.bpm.engine.impl.persistence.entity.TaskEntity
+import org.camunda.bpm.engine.task.IdentityLink
 import org.camunda.bpm.engine.task.Task
 
-fun Task.toTaskInformation(processDefinitionKey: String? = null) =
+fun Task.toTaskInformation(candidates: List<IdentityLink>, processDefinitionKey: String? = null) =
   TaskInformation(
     taskId = this.id,
     meta = mapOf(
@@ -18,7 +19,13 @@ fun Task.toTaskInformation(processDefinitionKey: String? = null) =
       CommonRestrictions.PROCESS_INSTANCE_ID to this.processInstanceId,
       "taskName" to this.name,
       "taskDescription" to this.description,
-      "assignee" to this.assignee
+      "assignee" to this.assignee,
+      "creationDate" to this.createTime.toString(), // FIXME -> to zoned iso 8601
+      "followUpDate" to (this.followUpDate?.toString() ?: ""), // FIXME -> to zoned iso 8601
+      "dueDate" to (this.dueDate?.toString() ?: ""), // FIXME -> to zoned iso 8601
+      "formKey" to this.formKey,
+      "candidateUsers" to candidates.mapNotNull { it.userId }.joinToString(","),
+      "candidateGroups" to candidates.mapNotNull { it.groupId }.joinToString(",")
     ).let {
       if (processDefinitionKey != null) {
         it + (CommonRestrictions.PROCESS_DEFINITION_KEY to processDefinitionKey)
@@ -38,7 +45,13 @@ fun TaskEntity.toTaskInformation() =
       CommonRestrictions.PROCESS_INSTANCE_ID to this.processInstanceId,
       "taskName" to this.name,
       "taskDescription" to this.description,
-      "assignee" to this.assignee
+      "assignee" to this.assignee,
+      "creationDate" to this.createTime.toString(), // FIXME -> to zoned iso 8601
+      "followUpDate" to (this.followUpDate?.toString() ?: ""), // FIXME -> to zoned iso 8601
+      "dueDate" to (this.dueDate?.toString() ?: ""), // FIXME -> to zoned iso 8601
+      "formKey" to this.formKey,
+      "candidateUsers" to this.candidates.mapNotNull { it.userId }.joinToString(","),
+      "candidateGroups" to this.candidates.mapNotNull { it.groupId }.joinToString(",")
     )
   )
 
@@ -52,7 +65,12 @@ fun DelegateTask.toTaskInformation() =
       CommonRestrictions.PROCESS_INSTANCE_ID to this.processInstanceId,
       "taskName" to this.name,
       "taskDescription" to this.description,
-      "assignee" to this.assignee
+      "assignee" to this.assignee,
+      "creationDate" to this.createTime.toString(), // FIXME -> to zoned iso 8601
+      "followUpDate" to (this.followUpDate?.toString() ?: ""), // FIXME -> to zoned iso 8601
+      "dueDate" to (this.dueDate?.toString() ?: ""), // FIXME -> to zoned iso 8601,
+      "candidateUsers" to this.candidates.mapNotNull { it.userId }.joinToString(","),
+      "candidateGroups" to this.candidates.mapNotNull { it.groupId }.joinToString(",")
     )
   )
 

diff --git a/...s/processengineapi/adapter/c7/embedded/task/delivery/pull/EmbeddedPullUserTaskDelivery.kt b/...s/processengineapi/adapter/c7/embedded/task/delivery/pull/EmbeddedPullUserTaskDelivery.kt
@@ -38,6 +38,7 @@ class EmbeddedPullUserTaskDelivery(
       logger.trace { "PROCESS-ENGINE-C7-EMBEDDED-036: pulling user tasks for subscriptions: $subscriptions" }
       taskService
         .createTaskQuery()
+        .initializeFormKeys()
         .forSubscriptions(subscriptions)
         .list()
         .parallelStream()
@@ -51,7 +52,7 @@ class EmbeddedPullUserTaskDelivery(
                 try {
                   logger.debug { "PROCESS-ENGINE-C7-EMBEDDED-037: delivering user task ${task.id}." }
                   val processDefinitionKey = cachingProcessDefinitionKeyResolver.getProcessDefinitionKey(task.processDefinitionId)
-                  activeSubscription.action.accept(task.toTaskInformation(processDefinitionKey), variables)
+                  activeSubscription.action.accept(task.toTaskInformation(taskService.getIdentityLinksForTask(task.id), processDefinitionKey), variables)
                 } catch (e: Exception) {
                   logger.error { "PROCESS-ENGINE-C7-EMBEDDED-038: error delivering task ${task.id}: ${e.message}" }
                   subscriptionRepository.deactivateSubscriptionForTask(taskId = task.id)