Merge pull request #520 from axonivy-market/feature/XIVY-13150_change…

…d_API XIVY-13150 Fix OrderProcess to use changed API
axonivy-market · Mar 7, 2024 · 2365b37 · 2365b37
2 parents d4eb879 + 9810412
commit 2365b37
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/workflow/workflow-demos/cms/cms_de.yaml b/workflow/workflow-demos/cms/cms_de.yaml
@@ -129,11 +129,11 @@ Labels:
   TaskUser-Explain: Komma getrennte Liste von Benutzern
   title: Self Service Ad-Hoc Workflow
 Notification:
-  Messages:
-    InvoiceSent: Die Rechnung für die Bestellung {0} wurde versendet
-    OrderDelivered: Bestellung {0} wurde an Kunde {1} {2} ausgeliefert
-    OrderFinished: Die Bestellung {0} wurde erfolgreich abgeschlossen
   business:
+    Messages:
+      InvoiceSent: Die Rechnung für die Bestellung {0} wurde versendet
+      OrderDelivered: Bestellung {0} wurde an Kunde {1} {2} ausgeliefert
+      OrderFinished: Die Bestellung {0} wurde erfolgreich abgeschlossen
     Templates:
       Order:
         Labels:

diff --git a/workflow/workflow-demos/cms/cms_en.yaml b/workflow/workflow-demos/cms/cms_en.yaml
@@ -191,11 +191,11 @@ Labels:
   TaskUser-Explain: Comma separated list of users
   title: Self Service Ad-hoc Workflow
 Notification:
-  Messages:
-    InvoiceSent: The invoice for order {0} was sent
-    OrderDelivered: Order {0} delivered to customer {1} {2}
-    OrderFinished: The order {0} successfully finished
   business:
+    Messages:
+      InvoiceSent: The invoice for order {0} was sent
+      OrderDelivered: Order {0} delivered to customer {1} {2}
+      OrderFinished: The order {0} successfully finished
     Templates:
       Order:
         Labels:

diff --git a/workflow/workflow-demos/processes/BusinessNotification/OrderProcess.p.json b/workflow/workflow-demos/processes/BusinessNotification/OrderProcess.p.json
@@ -75,11 +75,10 @@
             "  with the message \"New Order received\"",
             "  to all users that owns the role \"Processor\"",
             "*/",
-            "IRole processor = ivy.security.roles().find(\"Processor\");",
             "BusinessNotification",
             "    .create()",
             "    .message().text(\"New order received\")",
-            "    .receivers().add(processor)",
+            "    .receivers().addRole(\"Processor\")",
             "    .send();"
           ]
         }
@@ -215,8 +214,8 @@
             "*/",
             "BusinessNotification",
             "    .create()",
-            "    .message().fromCms(\"/Notification/Messages/OrderDelivered\", in.order.product, in.customer.surname, in.customer.name)",
-            "    .receivers().addCase().allInvolved()",
+            "    .message().fromCms(\"OrderDelivered\", in.order.product, in.customer.surname, in.customer.name)",
+            "    .receivers().ofCase().addAllInvolved()",
             "    .send();"
           ]
         }
@@ -281,8 +280,8 @@
             "    .create()",
             "    .template(\"Order\")",
             "    .payload(in.customer)",
-            "    .message().fromCms(\"/Notification/Messages/InvoiceSent\", in.order.product)",
-            "    .receivers().addTask().activator()",
+            "    .message().fromCms(\"InvoiceSent\", in.order.product)",
+            "    .receivers().ofTask().addActivator()",
             "    .send();"
           ]
         }
@@ -350,8 +349,8 @@
             "    .create()",
             "    .template(\"Order\")",
             "    .payload(in.customer)",
-            "    .message().fromCms(\"/Notification/Messages/OrderFinished\", in.order.product)",
-            "    .receivers().addCase().allInvolved()",
+            "    .message().fromCms(\"OrderFinished\", in.order.product)",
+            "    .receivers().ofCase().addAllInvolved()",
             "    .send();"
           ]
         }