bugfix(#1217): task notifications (#1219)

* apps fix changing components.d.ts * hotfix(#1217): usertask notifications * hotfix(#1217): usertask notifications * bugfix: enable task assignment delete locally too * Revert "bugfix: enable task assignment delete locally too" This reverts commit 05f0629. --------- Co-authored-by: Simon Hirtreiter <[email protected]>
it-at-m · Jan 16, 2024 · 19b03b5 · 19b03b5
1 parent 4d67e5e
commit 19b03b5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/digiwf-apps/packages/apps/digiwf-forms-example/components.d.ts b/digiwf-apps/packages/apps/digiwf-forms-example/components.d.ts
@@ -1,11 +1,9 @@
 // generated by unplugin-vue-components
 // We suggest you to commit this file into source control
 // Read more: https://github.com/vuejs/core/pull/3399
-import '@vue/runtime-core'
-
 export {}
 
-declare module '@vue/runtime-core' {
+declare module 'vue' {
   export interface GlobalComponents {
     Menu: typeof import('./src/components/menu.vue')['default']
     VApp: typeof import('vuetify/lib')['VApp']

diff --git a/.../java/de/muenchen/oss/digiwf/humantask/process/listener/UserTaskNotificationListener.java b/.../java/de/muenchen/oss/digiwf/humantask/process/listener/UserTaskNotificationListener.java
@@ -80,9 +80,9 @@ public void delegateTask(final DelegateTask delegateTask) throws Exception {
             }
         }
         // send notification on task assignment for assignee
-        // assignment event is used for direct user assignment
-        // update event is used for group task assignment
-        else if (delegateTask.getEventName().equals("assignment")) {
+        // Create Event: User Task creation
+        // Assignment: e.g. a Group Task is assigend to the user later on
+        if (delegateTask.getEventName().equals("create") || delegateTask.getEventName().equals("assignment")) {
             log.debug("Notification for created task: {}", delegateTask.getName());
             val notify = NOTIFICATION_SEND.from(delegateTask).getOptional();
             if (notify.isPresent()) {

diff --git a/...a/de/muenchen/oss/digiwf/humantask/process/listener/UserTaskNotificationListenerTest.java b/...a/de/muenchen/oss/digiwf/humantask/process/listener/UserTaskNotificationListenerTest.java
@@ -69,7 +69,7 @@ void testDelegateTask_WithAssignee() throws Exception {
                 "digitalwf_notification_send_candidate_users", "false",
                 "digitalwf_notification_send_candidate_groups", "false",
                 "app_task_assignee", this.user.getLhmObjectId()
-        ), "assignment");
+        ), "create");
         when(task.getCandidates()).thenReturn(Collections.<IdentityLink>emptySet());
 
         final Mail mail = this.notifyUsers(task, this.userTaskDefaultMailContent, 1);

diff --git a/...e/muenchen/oss/digiwf/humantask/process/listener/UserTaskNotificationListenerV02Test.java b/...e/muenchen/oss/digiwf/humantask/process/listener/UserTaskNotificationListenerV02Test.java
@@ -58,7 +58,7 @@ void testDelegateTask_WithNotificationOff() throws Exception {
                 "app_notification_send_candidate_users", "false",
                 "app_notification_send_candidate_groups", "false",
                 "app_task_assignee", this.user.getLhmObjectId()
-        ), "assignment");
+        ), "create");
         this.notifyUsers(task, null, 0);
     }
 
@@ -79,7 +79,7 @@ void testDelegateTask_WithAssignee() throws Exception {
                 "app_notification_send_candidate_users", "false",
                 "app_notification_send_candidate_groups", "false",
                 "app_task_assignee", this.user.getLhmObjectId()
-        ), "assignment");
+        ), "create");
         when(task.getCandidates()).thenReturn(Collections.<IdentityLink>emptySet());
 
         final Mail mail = this.notifyUsers(task, this.userTaskDefaultMailContent, 1);
@@ -129,7 +129,7 @@ void testDelegateTask_WithCustomMailContentForUserTaskNotifications() throws Exc
                 "mail_body", "Email Body",
                 "mail_bottom_text", "Some Bottom Text",
                 "mail_subject", "Email Subject"
-        ), "assignment");
+        ), "create");
         when(task.getCandidates()).thenReturn(Collections.<IdentityLink>emptySet());
         final Map<String, String> customMailContent = Map.of(
                 "%%body_top%%", "Email Body",