Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

annotation-service/annotation-web/src/main/resources/config/cache.yml

@@ -41,19 +41,19 @@ cache:
     mapCaches:
   apiKey:
     name: apikey
-    keyPattern: resolve_$keyhash$:v0
+    keyPattern: ant_resolve_$keyhash$:v0
   userBySubjectId:
     name: userBySubjectId
-    keyPattern: user_by_subject_$subject$:v0
+    keyPattern: ant_user_by_subject_$subject$:v0
   tenantByCode:
     name: tenantByCode
-    keyPattern: tenant_by_code_$code$:v0
+    keyPattern: ant_tenant_by_code_$code$:v0
   tenantById:
     name: tenantById
-    keyPattern: tenant_by_id_$tenantId$:v0
+    keyPattern: ant_tenant_by_id_$tenantId$:v0
   userAllowedTenant:
     name: userAccessTenant
-    keyPattern: user_access_tenant_$user_id$_$tenant_id$:v0
+    keyPattern: ant_user_access_tenant_$user_id$_$tenant_id$:v0
   affiliation:
     name: affiliation
-    keyPattern: affiliation_$entity$_$user$_$type$:v0
+    keyPattern: ant_affiliation_$entity$_$user$_$type$:v0

dmp-db-scema/updates/00.01.028_addQueueOutbox.sql

@@ -1,5 +1,5 @@
 DO $$DECLARE
-   this_version CONSTANT varchar := '00.01.029';
+   this_version CONSTANT varchar := '00.01.028';
 BEGIN
    PERFORM * FROM "DBVersion" WHERE version = this_version;
    IF FOUND THEN RETURN; END IF;
@@ -26,6 +26,6 @@ BEGIN
             ON DELETE NO ACTION
     );
 
-    INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.029', '2023-12-05 12:00:00.000000+02', now(), 'Add table QueueOutbox.');
+    INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.028', '2023-12-05 12:00:00.000000+02', now(), 'Add table QueueOutbox.');
 
 END$$;

dmp-db-scema/updates/00.01.029_addQueueInbox.sql

@@ -1,5 +1,5 @@
 DO $$DECLARE
-   this_version CONSTANT varchar := '00.01.030';
+   this_version CONSTANT varchar := '00.01.029';
 BEGIN
    PERFORM * FROM "DBVersion" WHERE version = this_version;
    IF FOUND THEN RETURN; END IF;
@@ -27,6 +27,6 @@ BEGIN
             NOT VALID
     );
 
-    INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.030', '2023-12-05 12:00:00.000000+02', now(), 'Add table QueueInbox.');
+    INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.029', '2023-12-05 12:00:00.000000+02', now(), 'Add table QueueInbox.');
 
 END$$;

dmp-db-scema/updates/00.01.030_add_ntf_Tenant_and_ntf_TenantConfiguration.sql

@@ -1,5 +1,5 @@
 DO $$DECLARE
-   this_version CONSTANT varchar := '00.01.031';
+   this_version CONSTANT varchar := '00.01.030';
 BEGIN
    PERFORM * FROM "DBVersion" WHERE version = this_version;
    IF FOUND THEN RETURN; END IF;
@@ -30,6 +30,6 @@ BEGIN
             ON DELETE NO ACTION
     );
 
-    INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.031', '2023-12-05 12:00:00.000000+02', now(), 'Add tables ntf_Tenant and ntf_TenantConfiguration.');
+    INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.030', '2023-12-05 12:00:00.000000+02', now(), 'Add tables ntf_Tenant and ntf_TenantConfiguration.');
 
 END$$;

dmp-db-scema/updates/00.01.031_Add_ntf_User.sql

@@ -1,5 +1,5 @@
 DO $$DECLARE
-   this_version CONSTANT varchar := '00.01.032';
+   this_version CONSTANT varchar := '00.01.031';
 BEGIN
    PERFORM * FROM "DBVersion" WHERE version = this_version;
    IF FOUND THEN RETURN; END IF;
@@ -15,6 +15,6 @@ BEGIN
     CONSTRAINT "Ntf_User_pkey" PRIMARY KEY (id)
 );
 
-    INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.032', '2024-01-24 12:00:00.000000+02', now(), 'Add table ntf_User.');
+    INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.031', '2024-01-24 12:00:00.000000+02', now(), 'Add table ntf_User.');
 
 END$$;

dmp-db-scema/updates/00.01.032_add_ntf_Notification.sql

@@ -1,5 +1,5 @@
 DO $$DECLARE
-   this_version CONSTANT varchar := '00.01.028';
+   this_version CONSTANT varchar := '00.01.032';
 BEGIN
    PERFORM * FROM "DBVersion" WHERE version = this_version;
    IF FOUND THEN RETURN; END IF;
@@ -35,6 +35,6 @@ BEGIN
             ON DELETE NO ACTION
     );
 
-    INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.028', '2023-12-05 12:00:00.000000+02', now(), 'Add table ntf_Notification.');
+    INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.032', '2023-12-05 12:00:00.000000+02', now(), 'Add table ntf_Notification.');
 
 END$$;

dmp-db-scema/updates/00.01.039_add_ntf_InAppNotification.sql

@@ -21,7 +21,7 @@ BEGIN
         is_active smallint NOT NULL,
         CONSTRAINT "ntf_InAppNotification_pkey" PRIMARY KEY (id),
         CONSTRAINT "ntf_InAppNotification_tenant_fkey" FOREIGN KEY (tenant)
-            REFERENCES public."ntf_tenant" (id) MATCH SIMPLE
+            REFERENCES public."ntf_Tenant" (id) MATCH SIMPLE
             ON UPDATE NO ACTION
             ON DELETE NO ACTION,
         CONSTRAINT "ntf_InAppNotification_user_fkey" FOREIGN KEY ("user")

notification-service/notification-web/src/main/resources/config/cache.yml

@@ -41,22 +41,22 @@ cache:
     mapCaches:
   apiKey:
     name: apikey
-    keyPattern: resolve_$keyhash$:v0
+    keyPattern: ntf_resolve_$keyhash$:v0
   userBySubjectId:
     name: userBySubjectId
-    keyPattern: user_by_subject_$subject$:v0
+    keyPattern: ntf_user_by_subject_$subject$:v0
   tenantByCode:
     name: tenantByCode
-    keyPattern: tenant_by_code_$code$:v0
+    keyPattern: ntf_tenant_by_code_$code$:v0
   tenantById:
     name: tenantById
-    keyPattern: tenant_by_id_$tenantId$:v0
+    keyPattern: ntf_tenant_by_id_$tenantId$:v0
   userAllowedTenant:
     name: userAccessTenant
-    keyPattern: user_access_tenant_$user_id$_$tenant_id$:v0
+    keyPattern: ntf_user_access_tenant_$user_id$_$tenant_id$:v0
   formattingUserProfileCache:
     name: formattingUserProfile
-    keyPattern: formatting_user_profile$user_id$:v0
+    keyPattern: ntf_formatting_user_profile$user_id$:v0
   template:
     name: template
     key-pattern: ------

notification-service/notification-web/src/main/resources/config/notification-devel.yml

@@ -4,3 +4,487 @@ notification:
       - key: "{installation-url}"
         type: "String"
         value: "http://localhost:42000"
+  resolver:
+    global-policies:
+      - #dmpInvitationExternalUser
+        type: 065DEECD-21BB-44AF-9983-E660FDF24BC4
+        contacts: [ email ]
+      - #dmpInvitationExistingUser
+        type: 4904dea2-5079-46d3-83be-3a19c9ab45dc
+        contacts: [ inapp, email ]
+      - #dpmModified
+        type: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB
+        contacts: [ email ]
+      - #dmpFinalised
+        type: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E
+        contacts: [ email ]
+      - #descriptionModified
+        type: 4FDBFA80-7A71-4A69-B854-67CBB70648F1
+        contacts: [ email ]
+      - #descriptionFinalised
+        type: 33790bad-94d4-488a-8ee2-7f6295ca18ea
+        contacts: [ email ]
+      - #mergeAcountConfirmation
+        type: BFE68845-CB05-4C5A-A03D-29161A7C9660
+        contacts: [ email ]
+      - #removeCredentialConfirmation
+        type: C9BC3F16-057E-4BBA-8A5F-36BD835E5604
+        contacts: [ email ]
+      - #dmpDeposit
+        type: 55736F7A-83AB-4190-AF43-9D031A6F9612
+        contacts: [ email ]
+      - #descriptionTemplateInvitation
+        type: 223BB607-EFA1-4CE7-99EC-4BEABFEF9A8B
+        contacts: [ email ]
+      - #contactSupportType
+        type: 5B1D6C52-88F9-418B-9B8A-6F1F963D9EAD
+        contacts: [ email ]
+      - #publicContactSupportType
+        type: B542B606-ACC6-4629-ADEF-4D8EE2F01222
+        contacts: [ email ]
+  message:
+    email:
+      flows:
+        - #dmpInvitationExternalUser
+          key: 065DEECD-21BB-44AF-9983-E660FDF24BC4
+          subject-path: classpath:notification_templates/dmpinvitationexternaluser/email/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/dmpinvitationexternaluser/email/body.{language}.html
+          body-field-options:
+            mandatory: [ "{dmpname}", "{dmprole}", "{installation-url}", "{confirmationToken}" ]
+            optional:
+              - key: "{recipient}"
+                value:
+            formatting:
+              '[{dmpname}]': null
+              '[{dmprole}]': null
+              '[{recipient}]': null
+          cc: [ ]
+          cc-mode: 0
+          bcc: [ ]
+          bcc-mode: 0
+          allow-attachments: false
+          cipher-fields: [ ]
+        - #dmpInvitationExistingUser
+          key: 4904dea2-5079-46d3-83be-3a19c9ab45dc
+          subject-path: classpath:notification_templates/dmpinvitationexistinguser/email/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/dmpinvitationexistinguser/email/body.{language}.html
+          body-field-options:
+            mandatory: [ "{dmpname}", "{dmprole}", "{reasonName}", "{installation-url}", "{id}"]
+            optional:
+              - key: "{recipient}"
+                value:
+            formatting:
+              '[{dmpname}]': null
+              '[{dmprole}]': null
+              '[{reasonName}]': null
+              '[{recipient}]': null
+          cc: [ ]
+          cc-mode: 0
+          bcc: [ ]
+          bcc-mode: 0
+          allow-attachments: false
+          cipher-fields: [ ]
+        - #dmpModified
+          key: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB
+          subject-path: classpath:notification_templates/dmpmodified/email/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/dmpmodified/email/body.{language}.html
+          body-field-options:
+            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
+            optional:
+              - key: "{recipient}"
+                value:
+            formatting:
+              '[{reasonName}]': null
+              '[{name}]': null
+              '[{recipient}]': null
+          cc: [ ]
+          cc-mode: 0
+          bcc: [ ]
+          bcc-mode: 0
+          allow-attachments: false
+          cipher-fields: [ ]
+        - #dmpFinalised
+          key: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E
+          subject-path: classpath:notification_templates/dmpfinalised/email/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/dmpfinalised/email/body.{language}.html
+          body-field-options:
+            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
+            optional:
+              - key: "{recipient}"
+                value:
+            formatting:
+              '[{reasonName}]': null
+              '[{name}]': null
+              '[{recipient}]': null
+          cc: [ ]
+          cc-mode: 0
+          bcc: [ ]
+          bcc-mode: 0
+          allow-attachments: false
+          cipher-fields: [ ]
+        - #desriptionModified
+          key: 4FDBFA80-7A71-4A69-B854-67CBB70648F1
+          subject-path: classpath:notification_templates/descriptionmodified/email/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/descriptionmodified/email/body.{language}.html
+          body-field-options:
+            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
+            optional:
+              - key: "{recipient}"
+                value:
+            formatting:
+              '[{reasonName}]': null
+              '[{name}]': null
+              '[{recipient}]': null
+          cc: [ ]
+          cc-mode: 0
+          bcc: [ ]
+          bcc-mode: 0
+          allow-attachments: false
+          cipher-fields: [ ]
+        - #descriptionFinalised
+          key: 33790bad-94d4-488a-8ee2-7f6295ca18ea
+          subject-path: classpath:notification_templates/descriptionfinalised/email/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/descriptionfinalised/email/body.{language}.html
+          body-field-options:
+            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
+            optional:
+              - key: "{recipient}"
+                value:
+            formatting:
+              '[{reasonName}]': null
+              '[{name}]': null
+              '[{recipient}]': null
+          cc: [ ]
+          cc-mode: 0
+          bcc: [ ]
+          bcc-mode: 0
+          allow-attachments: false
+          cipher-fields: [ ]
+        -  #mergeAccountConfirmation
+          key: BFE68845-CB05-4C5A-A03D-29161A7C9660
+          subject-path: classpath:notification_templates/mergeacountconfirmation/email/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/mergeacountconfirmation/email/body.{language}.html
+          body-field-options:
+            mandatory: [ "{userName}", "{installation-url}", "{confirmationToken}" ]
+            optional:
+              - key: "{expiration_time}"
+                value: ---
+            formatting:
+              '[{userName}]': null
+              '[{installation-url}]': null
+              '[{expiration_time}]': null
+          cc: [ ]
+          cc-mode: 0
+          bcc: [ ]
+          bcc-mode: 0
+          allow-attachments: false
+          cipher-fields: [ ]
+        - #removeCredentialConfirmation
+          key: C9BC3F16-057E-4BBA-8A5F-36BD835E5604
+          subject-path: classpath:notification_templates/removecredentialconfirmation/email/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ "{installation-url}", "{confirmationToken}" ]
+            optional: [ ]
+          body-path: classpath:notification_templates/removecredentialconfirmation/email/body.{language}.html
+          body-field-options:
+            mandatory: [ ]
+            optional:
+              - key: "{email}"
+                value: email
+              - key: "{expiration_time}"
+                value: --
+            formatting:
+              '[{email}]': null
+          cc: [ ]
+          cc-mode: 0
+          bcc: [ ]
+          bcc-mode: 0
+          allow-attachments: false
+          cipher-fields: [ ]
+        -   #dmpDeposit
+          key: 55736F7A-83AB-4190-AF43-9D031A6F9612
+          subject-path: classpath:notification_templates/dmpdeposit/email/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/dmpdeposit/email/body.{language}.html
+          body-field-options:
+            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
+            optional:
+              - key: "{recipient}"
+                value:
+            formatting:
+              '[{reasonName}]': null
+              '[{name}]': null
+              '[{recipient}]': null
+          cc: [ ]
+          cc-mode: 0
+          bcc: [ ]
+          bcc-mode: 0
+          allow-attachments: false
+          cipher-fields: [ ]
+        -    #descriptionTemplateInvitation
+          key: 223BB607-EFA1-4CE7-99EC-4BEABFEF9A8B
+          subject-path: classpath:notification_templates/descriptiontemplateinvitation/email/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/descriptiontemplateinvitation/email/body.{language}.html
+          body-field-options:
+            mandatory: [ "{templateName}", "{installation-url}", "{templateID}" ]
+            optional:
+              - key: "{recipient}"
+                value:
+            formatting:
+              '[{templateName}]': null
+              '[{recipient}]': null
+          cc: [ ]
+          cc-mode: 0
+          bcc: [ ]
+          bcc-mode: 0
+          allow-attachments: false
+          cipher-fields: [ ]
+        -    #contactSupportType
+          key: 5B1D6C52-88F9-418B-9B8A-6F1F963D9EAD
+          subject-path: classpath:notification_templates/contactsupport/email/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ "{subject}" ]
+            optional: [ ]
+          body-path: classpath:notification_templates/contactsupport/email/body.{language}.html
+          body-field-options:
+            mandatory: [ "{description}", "{email}" ]
+            formatting:
+              '[{subject}]': null
+              '[{description}]': null
+              '[{email}]': null
+          cc: [ ]
+          cc-mode: 0
+          bcc: [ ]
+          bcc-mode: 0
+          allow-attachments: false
+          cipher-fields: [ ]
+        -    #publicContactSupportType
+          key: B542B606-ACC6-4629-ADEF-4D8EE2F01222
+          subject-path: classpath:notification_templates/publiccontactsupport/email/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ "{subject}" ]
+            optional: [ ]
+          body-path: classpath:notification_templates/publiccontactsupport/email/body.{language}.html
+          body-field-options:
+            mandatory: [ "{description}", "{email}", "{name}" ]
+            formatting:
+              '[{subject}]': null
+              '[{description}]': null
+              '[{email}]': null
+              '[{name}]': null
+          cc: [ ]
+          cc-mode: 0
+          bcc: [ ]
+          bcc-mode: 0
+          allow-attachments: false
+          cipher-fields: [ ]
+      template-cache:
+        prefix: ${CACHE_DISAMBIGUATION:}
+        key-pattern: "{prefix}:Notification_Message_Email_Template:{key}:v0"
+    in-app:
+      flows:
+        - #dmpInvitationExistingUser
+          key: 4904dea2-5079-46d3-83be-3a19c9ab45dc
+          subject-path: classpath:notification_templates/dmpinvitationexistinguser/inapp/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/dmpinvitationexistinguser/inapp/body.{language}.html
+          body-field-options:
+            mandatory: [ "{dmpname}", "{dmprole}", "{reasonName}", "{installation-url}", "{id}" ]
+            optional:
+              - key: "{recipient}"
+                value:
+            formatting:
+              '[{dmpname}]': null
+              '[{dmprole}]': null
+              '[{reasonName}]': null
+              '[{recipient}]': null
+          priority-key: null
+          cipher-fields: [ ]
+        - #dmpModified
+          key: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB
+          subject-path: classpath:notification_templates/dmpmodified/inapp/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/dmpmodified/inapp/body.{language}.html
+          body-field-options:
+            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
+            optional:
+              - key: "{recipient}"
+                value:
+            formatting:
+              '[{reasonName}]': null
+              '[{name}]': null
+              '[{installation-url}]': null
+              '[{id}]': null
+              '[{recipient}]': null
+          priority-key: null
+          cipher-fields: [ ]
+        - #dmpFinalised
+          key: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E
+          subject-path: classpath:notification_templates/dmpfinalised/inapp/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/dmpfinalised/inapp/body.{language}.html
+          body-field-options:
+            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
+            optional:
+              - key: "{recipient}"
+                value:
+            formatting:
+              '[{reasonName}]': null
+              '[{name}]': null
+              '[{installation-url}]': null
+              '[{id}]': null
+              '[{recipient}]': null
+          priority-key: null
+          cipher-fields: [ ]
+        - #desriptionModified
+          key: 4FDBFA80-7A71-4A69-B854-67CBB70648F1
+          subject-path: classpath:notification_templates/descriptionmodified/inapp/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/descriptionmodified/inapp/body.{language}.html
+          body-field-options:
+            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
+            optional:
+              - key: "{recipient}"
+                value:
+            formatting:
+              '[{reasonName}]': null
+              '[{name}]': null
+              '[{installation-url}]': null
+              '[{id}]': null
+              '[{recipient}]': null
+          priority-key: null
+          cipher-fields: [ ]
+        - #descriptionFinalised
+          key: 33790bad-94d4-488a-8ee2-7f6295ca18ea
+          subject-path: classpath:notification_templates/descriptionfinalised/inapp/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/descriptionfinalised/inapp/body.{language}.html
+          body-field-options:
+            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
+            optional:
+              - key: "{recipient}"
+                value:
+            formatting:
+              '[{reasonName}]': null
+              '[{name}]': null
+              '[{installation-url}]': null
+              '[{id}]': null
+              '[{recipient}]': null
+          priority-key: null
+          cipher-fields: [ ]
+        - #mergeAccountConfirmation
+          key: BFE68845-CB05-4C5A-A03D-29161A7C9660
+          subject-path: classpath:notification_templates/mergeacountconfirmation/inapp/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/mergeacountconfirmation/inapp/body.{language}.html
+          body-field-options:
+            mandatory: [ "{userName}", "{installation-url}", "{confirmationToken}" ]
+            optional:
+              - key: "{expiration_time}"
+                value: ---
+            formatting:
+              '[{userName}]': null
+              '[{installation-url}]': null
+              '[{confirmationToken}]': null
+              '[{expiration_time}]': null
+          priority-key: null
+          cipher-fields: [ ]
+        - #removeCredentialConfirmation
+          key: C9BC3F16-057E-4BBA-8A5F-36BD835E5604
+          subject-path: classpath:notification_templates/removecredentialconfirmation/inapp/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ "{installation-url}", "{confirmationToken}" ]
+            optional: [ ]
+          body-path: classpath:notification_templates/removecredentialconfirmation/inapp/body.{language}.html
+          body-field-options:
+            mandatory: [ ]
+            optional:
+              - key: "{email}"
+                value: email
+              - key: "{expiration_time}"
+                value: --
+            formatting:
+              '[{email}]': null
+              '[{expiration_time}]': null
+          priority-key: null
+          cipher-fields: [ ]
+        - #dmpDeposit
+          key: 55736F7A-83AB-4190-AF43-9D031A6F9612
+          subject-path: classpath:notification_templates/dmpdeposit/inapp/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/dmpdeposit/inapp/body.{language}.html
+          body-field-options:
+            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
+            optional:
+              - key: "{recipient}"
+                value:
+            formatting:
+              '[{reasonName}]': null
+              '[{name}]': null
+              '[{installation-url}]': null
+              '[{id}]': null
+              '[{recipient}]': null
+          priority-key: null
+          cipher-fields: [ ]
+        - #descriptionTemplateInvitation
+          key: 223BB607-EFA1-4CE7-99EC-4BEABFEF9A8B
+          subject-path: classpath:notification_templates/descriptiontemplateinvitation/inapp/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/descriptiontemplateinvitation/inapp/body.{language}.html
+          body-field-options:
+            mandatory: [ "{templateName}", "{installation-url}", "{templateID}" ]
+            optional:
+              - key: "{recipient}"
+                value:
+            formatting:
+              '[{templateName}]': null
+              '[{installation-url}]': null
+              '[{templateID}]': null
+              '[{recipient}]': null
+          priority-key: null
+          cipher-fields: [ ]
+      template-cache:
+        prefix: ${CACHE_DISAMBIGUATION:}
+        key-pattern: "{prefix}:Notification_Message_InApp_Template:{key}:v0"

notification-service/notification-web/src/main/resources/config/notification.yml

@@ -2,499 +2,15 @@ notification:
   task:
     processor:
       enable: true
-      interval-seconds: 30
+      interval-seconds: 3
       options:
         retry-threshold: 300
         max-retry-delay-seconds: 10800
         too-old-to-send-seconds: 36000
         too-old-to-track-seconds: 604800
       overrides: []
-  resolver:
-    global-policies:
-        - #dmpInvitationExternalUser
-          type: 065DEECD-21BB-44AF-9983-E660FDF24BC4
-          contacts: [ email ]
-        - #dmpInvitationExistingUser
-          type: 4904dea2-5079-46d3-83be-3a19c9ab45dc
-          contacts: [ inapp, email ]
-        - #dpmModified
-          type: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB
-          contacts: [ email ]
-        - #dmpFinalised
-          type: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E
-          contacts: [ email ]
-        - #descriptionModified
-          type: 4FDBFA80-7A71-4A69-B854-67CBB70648F1
-          contacts: [ email ]
-        - #descriptionFinalised
-          type: 33790bad-94d4-488a-8ee2-7f6295ca18ea
-          contacts: [ email ]
-        - #mergeAcountConfirmation
-          type: BFE68845-CB05-4C5A-A03D-29161A7C9660
-          contacts: [ email ]
-        - #removeCredentialConfirmation
-          type: C9BC3F16-057E-4BBA-8A5F-36BD835E5604
-          contacts: [ email ]
-        - #dmpDeposit
-          type: 55736F7A-83AB-4190-AF43-9D031A6F9612
-          contacts: [ email ]
-        - #descriptionTemplateInvitation
-          type: 223BB607-EFA1-4CE7-99EC-4BEABFEF9A8B
-          contacts: [ email ]
-        - #contactSupportType
-          type: 5B1D6C52-88F9-418B-9B8A-6F1F963D9EAD
-          contacts: [ email ]
-        - #publicContactSupportType
-          type: B542B606-ACC6-4629-ADEF-4D8EE2F01222
-          contacts: [ email ]
   ad-hoc-config:
     ad-hoc-notification-type: null
-  message:
-    email:
-      flows:
-          - #dmpInvitationExternalUser
-            key: 065DEECD-21BB-44AF-9983-E660FDF24BC4
-            subject-path: classpath:notification_templates/dmpinvitationexternaluser/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/dmpinvitationexternaluser/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{dmpname}", "{dmprole}", "{installation-url}", "{confirmationToken}" ]
-              optional:
-                - key: "{recipient}"
-                  value:
-              formatting:
-                '[{dmpname}]': null
-                '[{dmprole}]': null
-                '[{recipient}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          - #dmpInvitationExistingUser
-            key: 4904dea2-5079-46d3-83be-3a19c9ab45dc
-            subject-path: classpath:notification_templates/dmpinvitationexistinguser/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/dmpinvitationexistinguser/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{dmpname}", "{dmprole}", "{reasonName}", "{installation-url}", "{id}"]
-              optional:
-                - key: "{recipient}"
-                  value:
-              formatting:
-                '[{dmpname}]': null
-                '[{dmprole}]': null
-                '[{reasonName}]': null
-                '[{recipient}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          - #dmpModified
-            key: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB
-            subject-path: classpath:notification_templates/dmpmodified/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/dmpmodified/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-              optional:
-                - key: "{recipient}"
-                  value:
-              formatting:
-                '[{reasonName}]': null
-                '[{name}]': null
-                '[{recipient}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          - #dmpFinalised
-            key: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E
-            subject-path: classpath:notification_templates/dmpfinalised/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/dmpfinalised/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-              optional:
-                - key: "{recipient}"
-                  value:
-              formatting:
-                '[{reasonName}]': null
-                '[{name}]': null
-                '[{recipient}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          - #desriptionModified
-            key: 4FDBFA80-7A71-4A69-B854-67CBB70648F1
-            subject-path: classpath:notification_templates/descriptionmodified/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/descriptionmodified/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-              optional:
-                - key: "{recipient}"
-                  value:
-              formatting:
-                '[{reasonName}]': null
-                '[{name}]': null
-                '[{recipient}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          - #descriptionFinalised
-            key: 33790bad-94d4-488a-8ee2-7f6295ca18ea
-            subject-path: classpath:notification_templates/descriptionfinalised/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/descriptionfinalised/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-              optional:
-                - key: "{recipient}"
-                  value:
-              formatting:
-                '[{reasonName}]': null
-                '[{name}]': null
-                '[{recipient}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          -  #mergeAccountConfirmation
-            key: BFE68845-CB05-4C5A-A03D-29161A7C9660
-            subject-path: classpath:notification_templates/mergeacountconfirmation/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/mergeacountconfirmation/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{userName}", "{installation-url}", "{confirmationToken}" ]
-              optional:
-                - key: "{expiration_time}"
-                  value: ---
-              formatting:
-                '[{userName}]': null
-                '[{installation-url}]': null
-                '[{expiration_time}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          - #removeCredentialConfirmation
-            key: C9BC3F16-057E-4BBA-8A5F-36BD835E5604
-            subject-path: classpath:notification_templates/removecredentialconfirmation/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ "{installation-url}", "{confirmationToken}" ]
-              optional: [ ]
-            body-path: classpath:notification_templates/removecredentialconfirmation/email/body.{language}.html
-            body-field-options:
-              mandatory: [ ]
-              optional:
-                - key: "{email}"
-                  value: email
-                - key: "{expiration_time}"
-                  value: --
-              formatting:
-                '[{email}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          -   #dmpDeposit
-            key: 55736F7A-83AB-4190-AF43-9D031A6F9612
-            subject-path: classpath:notification_templates/dmpdeposit/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/dmpdeposit/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-              optional:
-                - key: "{recipient}"
-                  value:
-              formatting:
-                '[{reasonName}]': null
-                '[{name}]': null
-                '[{recipient}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          -    #descriptionTemplateInvitation
-            key: 223BB607-EFA1-4CE7-99EC-4BEABFEF9A8B
-            subject-path: classpath:notification_templates/descriptiontemplateinvitation/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/descriptiontemplateinvitation/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{templateName}", "{installation-url}", "{templateID}" ]
-              optional:
-                - key: "{recipient}"
-                  value:
-              formatting:
-                '[{templateName}]': null
-                '[{recipient}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          -    #contactSupportType
-            key: 5B1D6C52-88F9-418B-9B8A-6F1F963D9EAD
-            subject-path: classpath:notification_templates/contactsupport/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ "{subject}" ]
-              optional: [ ]
-            body-path: classpath:notification_templates/contactsupport/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{description}", "{email}" ]
-              formatting:
-                '[{subject}]': null
-                '[{description}]': null
-                '[{email}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          -    #publicContactSupportType
-            key: B542B606-ACC6-4629-ADEF-4D8EE2F01222
-            subject-path: classpath:notification_templates/publiccontactsupport/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ "{subject}" ]
-              optional: [ ]
-            body-path: classpath:notification_templates/publiccontactsupport/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{description}", "{email}", "{name}" ]
-              formatting:
-                '[{subject}]': null
-                '[{description}]': null
-                '[{email}]': null
-                '[{name}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-      template-cache:
-        prefix: ${CACHE_DISAMBIGUATION:}
-        key-pattern: "{prefix}:Notification_Message_Email_Template:{key}:v0"
-    in-app:
-      flows:
-        - #dmpInvitationExistingUser
-          key: 4904dea2-5079-46d3-83be-3a19c9ab45dc
-          subject-path: classpath:notification_templates/dmpinvitationexistinguser/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ ]
-            optional: [ ]
-          body-path: classpath:notification_templates/dmpinvitationexistinguser/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ "{dmpname}", "{dmprole}", "{reasonName}", "{installation-url}", "{id}" ]
-            optional:
-              - key: "{recipient}"
-                value:
-            formatting:
-              '[{dmpname}]': null
-              '[{dmprole}]': null
-              '[{reasonName}]': null
-              '[{recipient}]': null
-          priority-key: null
-          cipher-fields: [ ]
-        - #dmpModified
-          key: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB
-          subject-path: classpath:notification_templates/dmpmodified/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ ]
-            optional: [ ]
-          body-path: classpath:notification_templates/dmpmodified/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-            optional:
-              - key: "{recipient}"
-                value:
-            formatting:
-              '[{reasonName}]': null
-              '[{name}]': null
-              '[{installation-url}]': null
-              '[{id}]': null
-              '[{recipient}]': null
-          priority-key: null
-          cipher-fields: [ ]
-        - #dmpFinalised
-          key: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E
-          subject-path: classpath:notification_templates/dmpfinalised/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ ]
-            optional: [ ]
-          body-path: classpath:notification_templates/dmpfinalised/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-            optional:
-              - key: "{recipient}"
-                value:
-            formatting:
-              '[{reasonName}]': null
-              '[{name}]': null
-              '[{installation-url}]': null
-              '[{id}]': null
-              '[{recipient}]': null
-          priority-key: null
-          cipher-fields: [ ]
-        - #desriptionModified
-          key: 4FDBFA80-7A71-4A69-B854-67CBB70648F1
-          subject-path: classpath:notification_templates/descriptionmodified/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ ]
-            optional: [ ]
-          body-path: classpath:notification_templates/descriptionmodified/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-            optional:
-              - key: "{recipient}"
-                value:
-            formatting:
-              '[{reasonName}]': null
-              '[{name}]': null
-              '[{installation-url}]': null
-              '[{id}]': null
-              '[{recipient}]': null
-          priority-key: null
-          cipher-fields: [ ]
-        - #descriptionFinalised
-          key: 33790bad-94d4-488a-8ee2-7f6295ca18ea
-          subject-path: classpath:notification_templates/descriptionfinalised/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ ]
-            optional: [ ]
-          body-path: classpath:notification_templates/descriptionfinalised/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-            optional:
-              - key: "{recipient}"
-                value:
-            formatting:
-              '[{reasonName}]': null
-              '[{name}]': null
-              '[{installation-url}]': null
-              '[{id}]': null
-              '[{recipient}]': null
-          priority-key: null
-          cipher-fields: [ ]
-        - #mergeAccountConfirmation
-          key: BFE68845-CB05-4C5A-A03D-29161A7C9660
-          subject-path: classpath:notification_templates/mergeacountconfirmation/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ ]
-            optional: [ ]
-          body-path: classpath:notification_templates/mergeacountconfirmation/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ "{userName}", "{installation-url}", "{confirmationToken}" ]
-            optional:
-              - key: "{expiration_time}"
-                value: ---
-            formatting:
-              '[{userName}]': null
-              '[{installation-url}]': null
-              '[{confirmationToken}]': null
-              '[{expiration_time}]': null
-          priority-key: null
-          cipher-fields: [ ]
-        - #removeCredentialConfirmation
-          key: C9BC3F16-057E-4BBA-8A5F-36BD835E5604
-          subject-path: classpath:notification_templates/removecredentialconfirmation/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ "{installation-url}", "{confirmationToken}" ]
-            optional: [ ]
-          body-path: classpath:notification_templates/removecredentialconfirmation/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ ]
-            optional:
-              - key: "{email}"
-                value: email
-              - key: "{expiration_time}"
-                value: --
-            formatting:
-              '[{email}]': null
-              '[{expiration_time}]': null
-          priority-key: null
-          cipher-fields: [ ]
-        - #dmpDeposit
-          key: 55736F7A-83AB-4190-AF43-9D031A6F9612
-          subject-path: classpath:notification_templates/dmpdeposit/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ ]
-            optional: [ ]
-          body-path: classpath:notification_templates/dmpdeposit/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-            optional:
-              - key: "{recipient}"
-                value:
-            formatting:
-              '[{reasonName}]': null
-              '[{name}]': null
-              '[{installation-url}]': null
-              '[{id}]': null
-              '[{recipient}]': null
-          priority-key: null
-          cipher-fields: [ ]
-        - #descriptionTemplateInvitation
-          key: 223BB607-EFA1-4CE7-99EC-4BEABFEF9A8B
-          subject-path: classpath:notification_templates/descriptiontemplateinvitation/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ ]
-            optional: [ ]
-          body-path: classpath:notification_templates/descriptiontemplateinvitation/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ "{templateName}", "{installation-url}", "{templateID}" ]
-            optional:
-              - key: "{recipient}"
-                value:
-            formatting:
-              '[{templateName}]': null
-              '[{installation-url}]': null
-              '[{templateID}]': null
-              '[{recipient}]': null
-          priority-key: null
-          cipher-fields: [ ]
-      template-cache:
-        prefix: ${CACHE_DISAMBIGUATION:}
-        key-pattern: "{prefix}:Notification_Message_InApp_Template:{key}:v0"
   override-cache:
     template-cache:
       prefix: ${CACHE_DISAMBIGUATION:}