Made the taskDefinitionKey of a UserTask required to be the same as i…

…n the BPMN - new in API doc and Simulation.
pme123 · Jan 20, 2025 · dfd801d · dfd801d
1 parent c85dd2b
commit dfd801d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/02-bpmn/src/main/scala/camundala/bpmn/BpmnDsl.scala b/02-bpmn/src/main/scala/camundala/bpmn/BpmnDsl.scala
@@ -6,20 +6,17 @@ trait BpmnDsl:
   def companyDescr: String = ""
 
   private[bpmn] def msgNameDescr(messageName: String) =
-    Some(s"""
-            |$descr
-            |
-            |- _messageName_: `$messageName`
-            |
-            |---
-            |
-            |$companyDescr
-            |""".stripMargin)
+    bpmnDescr(s"- _messageName_: `$messageName`")
 
-  private[bpmn] lazy val defaultDescr =
+  private[bpmn] def userTaskDescr(messageName: String) =
+    bpmnDescr(s"- _taskDefinitionKey_: `$messageName`")
+
+  private def bpmnDescr(keyLabel: String) =
     Some(s"""
             |$descr
             |
+            |$keyLabel
+            |
             |---
             |
             |$companyDescr

diff --git a/02-bpmn/src/main/scala/camundala/bpmn/BpmnUserTaskDsl.scala b/02-bpmn/src/main/scala/camundala/bpmn/BpmnUserTaskDsl.scala
@@ -16,7 +16,7 @@ trait BpmnUserTaskDsl extends BpmnDsl:
       out: Out = NoOutput()
   ): UserTask[In, Out] =
     UserTask(
-      InOutDescr(name, in, out, defaultDescr)
+      InOutDescr(name, in, out, userTaskDescr(name))
     )
 
 end BpmnUserTaskDsl
diff --git a/03-simulation/src/main/scala/camundala/simulation/custom/SUserTaskExtensions.scala b/03-simulation/src/main/scala/camundala/simulation/custom/SUserTaskExtensions.scala
@@ -23,18 +23,19 @@ trait SUserTaskExtensions extends SimulationHelper:
 
     private def task()(using data: ScenarioData): ResultType =
       def getTask(
-          processInstanceId: Any
+          processInstanceId: Any,
+          taskDefinitionKey: String
       )(data: ScenarioData): ResultType =
         val uri =
-          uri"${config.endpoint}/task?processInstanceId=$processInstanceId"
+          uri"${config.endpoint}/task?processInstanceId=$processInstanceId&taskDefinitionKey=$taskDefinitionKey"
         val request = basicRequest
           .auth()
           .get(uri)
         given ScenarioData = data
           .info(
             s"UserTask '${userTask.name}' get"
           )
-          .debug(s"- URI: $uri")
+          .info(s"- URI: $uri")
 
         request
           .extractBody()
@@ -53,13 +54,13 @@ trait SUserTaskExtensions extends SimulationHelper:
               }
               .left
               .flatMap { _ =>
-                userTask.tryOrFail(getTask(processInstanceId))
+                userTask.tryOrFail(getTask(processInstanceId, userTask.id))
               }
           )
       end getTask
 
       val processInstanceId = data.context.processInstanceId
-      getTask(processInstanceId)(data.withRequestCount(0))
+      getTask(processInstanceId, userTask.id)(data.withRequestCount(0))
     end task
 
     def checkForm()(using data: ScenarioData): ResultType =

diff --git a/03-worker/src/main/scala/camundala/worker/Handler.scala b/03-worker/src/main/scala/camundala/worker/Handler.scala
@@ -13,9 +13,9 @@ trait WorkerHandler:
   def worker: Worker[?, ?, ?]
   def topic: String
 
-  def projectName: String
+  def applicationName: String
   def registerHandler( register: => Unit): Unit =
-    val appPackageName = projectName.replace("-", ".")
+    val appPackageName = applicationName.replace("-", ".")
     val testMode       = sys.env.get("WORKER_TEST_MODE").contains("true") // did not work with lazy val
     if testMode || getClass.getName.startsWith(appPackageName)
     then

diff --git a/04-worker-c7spring/src/main/scala/camundala/camunda7/worker/C7WorkerHandler.scala b/04-worker-c7spring/src/main/scala/camundala/camunda7/worker/C7WorkerHandler.scala
@@ -21,7 +21,7 @@ import scala.util.{Failure, Success}
 trait C7WorkerHandler extends camunda.ExternalTaskHandler, WorkerHandler:
 
   @Value("${spring.application.name}")
-  var projectName: String = scala.compiletime.uninitialized
+  var applicationName: String = scala.compiletime.uninitialized
 
   @Autowired()
   protected var engineContext: EngineContext = scala.compiletime.uninitialized