diff --git a/annotation-service/annotation-web/src/main/resources/config/cache.yml b/annotation-service/annotation-web/src/main/resources/config/cache.yml index e1863d7e8..946d03447 100644 --- a/annotation-service/annotation-web/src/main/resources/config/cache.yml +++ b/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 diff --git a/dmp-db-scema/updates/00.01.029_addQueueOutbox.sql b/dmp-db-scema/updates/00.01.028_addQueueOutbox.sql similarity index 90% rename from dmp-db-scema/updates/00.01.029_addQueueOutbox.sql rename to dmp-db-scema/updates/00.01.028_addQueueOutbox.sql index 3409653d8..3019a4ec0 100644 --- a/dmp-db-scema/updates/00.01.029_addQueueOutbox.sql +++ b/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$$; \ No newline at end of file diff --git a/dmp-db-scema/updates/00.01.030_addQueueInbox.sql b/dmp-db-scema/updates/00.01.029_addQueueInbox.sql similarity index 90% rename from dmp-db-scema/updates/00.01.030_addQueueInbox.sql rename to dmp-db-scema/updates/00.01.029_addQueueInbox.sql index e2296b850..09baa5cb4 100644 --- a/dmp-db-scema/updates/00.01.030_addQueueInbox.sql +++ b/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$$; \ No newline at end of file diff --git a/dmp-db-scema/updates/00.01.031_add_ntf_Tenant_and_ntf_TenantConfiguration.sql b/dmp-db-scema/updates/00.01.030_add_ntf_Tenant_and_ntf_TenantConfiguration.sql similarity index 91% rename from dmp-db-scema/updates/00.01.031_add_ntf_Tenant_and_ntf_TenantConfiguration.sql rename to dmp-db-scema/updates/00.01.030_add_ntf_Tenant_and_ntf_TenantConfiguration.sql index ebdb63d12..8f0fbb6f3 100644 --- a/dmp-db-scema/updates/00.01.031_add_ntf_Tenant_and_ntf_TenantConfiguration.sql +++ b/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$$; \ No newline at end of file diff --git a/dmp-db-scema/updates/00.01.032_Add_ntf_User.sql b/dmp-db-scema/updates/00.01.031_Add_ntf_User.sql similarity index 83% rename from dmp-db-scema/updates/00.01.032_Add_ntf_User.sql rename to dmp-db-scema/updates/00.01.031_Add_ntf_User.sql index d22582d58..a607eabe7 100644 --- a/dmp-db-scema/updates/00.01.032_Add_ntf_User.sql +++ b/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$$; \ No newline at end of file diff --git a/dmp-db-scema/updates/00.01.028_add_ntf_Notification.sql b/dmp-db-scema/updates/00.01.032_add_ntf_Notification.sql similarity index 92% rename from dmp-db-scema/updates/00.01.028_add_ntf_Notification.sql rename to dmp-db-scema/updates/00.01.032_add_ntf_Notification.sql index 0e55830b0..d4dafe60b 100644 --- a/dmp-db-scema/updates/00.01.028_add_ntf_Notification.sql +++ b/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$$; \ No newline at end of file diff --git a/dmp-db-scema/updates/00.01.039_add_ntf_InAppNotification.sql b/dmp-db-scema/updates/00.01.039_add_ntf_InAppNotification.sql index 6437225ca..af4f273fd 100644 --- a/dmp-db-scema/updates/00.01.039_add_ntf_InAppNotification.sql +++ b/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") diff --git a/dmp-db-scema/updates/00.01.060_Insert_values.sql b/dmp-db-scema/updates/00.01.060_Insert_values.sql index 11ee2055f..6f89e1ff3 100644 --- a/dmp-db-scema/updates/00.01.060_Insert_values.sql +++ b/dmp-db-scema/updates/00.01.060_Insert_values.sql @@ -16,23 +16,23 @@ BEGIN INSERT INTO public."Language" VALUES ('110d2e49-1580-4ee3-b1df-84da966f97a8', 'pt', null, '2024-02-29 16:35:18.114652', '2024-02-29 16:35:18.114652', 1, 9, null); INSERT INTO public."Language" VALUES ('3b865f61-a863-43de-98cd-da86fc3f5940', 'pl', null, '2024-02-29 16:35:18.114652', '2024-02-29 16:35:18.114652', 1, 10, null); - INSERT INTO public."PrefillingSource" VALUES ('7a1ef5db-8833-45e1-85d8-476cea3d4f7a', 'Openaire', 'openaire10falseapplication/jsonremote00$['meta']['pagination']['page','pages','count']{like}likereference_idoriginalIdlabeltitledescriptiondescription$['results'][*]['result']['metadata']['oaf:entity']['oaf:result']https://services.openaire.eu/search/v2/api/datasets/?q={like}&page={page}&size={pageSize}&format=jsonopenaire10falseapplication/jsonremote00$['meta']['pagination']['page','pages','count']{like}liketitle.content['title']['content']descriptiondescriptionchildren.instance.license['children']['instance']['license']subject.content['subject']['content']publisherpublisherlanguage.classid['language']['classid']issued.content['issued']['content']bestaccessright.classid['bestaccessright']['classid']pid.content['pid']['content']pid.classid['pid']['classid']$['results'][*]['result']['metadata']['oaf:entity']['oaf:result']https://services.openaire.eu/search/v2/api/datasets/?q={like}&page={page}&size={pageSize}&format=jsontitle.contentrda.dataset.distribution.titlelabeldescriptionrda.dataset.distribution.descriptiondescriptionchildren.instance.licenserda.dataset.distribution.license.license_refsubject.contentrda.dataset.keywordtagspublisherrda.dataset.distribution.host.titlelanguage.classidrda.dataset.metadata.languageissued.contentrda.dataset.issuedbestaccessright.classidrda.dataset.distribution.data_accesspid.contentrda.dataset.dataset_idpid.contentrda.dataset.dataset_id.identifierpid.classidrda.dataset.dataset_id.type' '2023-11-28 16:35:18.114652', '2023-11-29 15:50:57.253892', 1, '2024-02-28 09:12:41.051733', '2024-02-28 09:55:20.251234', null); - INSERT INTO public."PrefillingSource" VALUES ('d79952bf-cfd9-4af4-b7b4-5a83d68890a5', 'Zenodo', 'zenodo search20falseapplication/jsonremote10$['hits']['total']{like}likereference_ididlabeltitledescriptiondescription$['hits']['hits']https://zenodo.org/api/records/?page={page}&size={pageSize}&q=title:"{like}" doi:"{like}" conceptdoi:"{like}"zenodo get10falseapplication/jsonremote0${like}likemetadata.title['metadata']['title']metadata.description['metadata']['description']metadata.license.id['metadata']['license']['id']metadata.keywords['metadata']['keywords']metadata.filesize['metadata']['files']['size']metadata.language['metadata']['language']metadata.dates.valid['metadata']['dates']['type']metadata.license.created['metadata']['license']['created']metadata.embargo_date['metadata']['embargo_date']metadata.publication_date['metadata']['publication_date']metadata.access_right['metadata']['access_right']files['files']['key']doidoi$https://zenodo.org/api/records/{like}metadata.titlerda.dataset.distribution.titlelabelmetadata.descriptionrda.dataset.distribution.descriptiondescriptionmetadata.license.idrda.dataset.distribution.license.license_refmetadata.keywordsrda.dataset.keywordtagsmetadata.filesizerda.dataset.distribution.byte_sizemetadata.languagerda.dataset.metadata.languagemetadata.dates.validrda.dataset.distribution.available_untilmetadata.license.createdrda.dataset.distribution.license.start_datemetadata.embargo_daterda.dataset.distribution.license.start_datemetadata.publication_daterda.dataset.issuedmetadata.access_rightrda.dataset.distribution.data_accessfilesrda.dataset.distribution.format^.*\.doirda.dataset.dataset_iddoirda.dataset.dataset_id.identifierZenodorda.dataset.distribution.host.titleMore than 99% uptime yearlyrda.dataset.distribution.host.availabilityCHrda.dataset.distribution.host.geo_locationAll files uploaded to Zenodo are stored in CERN’s EOS service in an 18 petabytes disk cluster.rda.dataset.distribution.host.storage_typedoirda.dataset.dataset_id.typehttps://schema.datacite.org/meta/kernel-4.4/rda.dataset.metadata.metadata_standard_id.identifierurlrda.dataset.metadata.metadata_standard_id.typeengrda.dataset.metadata.languageDataCite Metadata Schemarda.dataset.metadata.descriptionHourlyrda.dataset.distribution.host.backup_frequencyIncremental backuprda.dataset.distribution.host.backup_typeRepository hosted by Zenodorda.dataset.distribution.host.descriptionhttps://zenodo.orgrda.dataset.distribution.host.urldoirda.dataset.distribution.host.pid_system', 1, '2024-02-28 10:20:50.570055', '2024-03-05 07:31:31.567298', null); + INSERT INTO public."PrefillingSource" VALUES ('7a1ef5db-8833-45e1-85d8-476cea3d4f7a', 'Openaire', 'openaire10falseapplication/jsonremote00$[''meta''][''pagination''][''page'',''pages'',''count'']{like}likereference_idoriginalIdlabeltitledescriptiondescription$[''results''][*][''result''][''metadata''][''oaf:entity''][''oaf:result'']https://services.openaire.eu/search/v2/api/datasets/?q={like}&page={page}&size={pageSize}&format=jsonopenaire10falseapplication/jsonremote00$[''meta''][''pagination''][''page'',''pages'',''count'']{like}liketitle.content[''title''][''content'']descriptiondescriptionchildren.instance.license[''children''][''instance''][''license'']subject.content[''subject''][''content'']publisherpublisherlanguage.classid[''language''][''classid'']issued.content[''issued''][''content'']bestaccessright.classid[''bestaccessright''][''classid'']pid.content[''pid''][''content'']pid.classid[''pid''][''classid'']$[''results''][*][''result''][''metadata''][''oaf:entity''][''oaf:result'']https://services.openaire.eu/search/v2/api/datasets/?q={like}&page={page}&size={pageSize}&format=jsontitle.contentrda.dataset.distribution.titlelabeldescriptionrda.dataset.distribution.descriptiondescriptionchildren.instance.licenserda.dataset.distribution.license.license_refsubject.contentrda.dataset.keywordtagspublisherrda.dataset.distribution.host.titlelanguage.classidrda.dataset.metadata.languageissued.contentrda.dataset.issuedbestaccessright.classidrda.dataset.distribution.data_accesspid.contentrda.dataset.dataset_idpid.contentrda.dataset.dataset_id.identifierpid.classidrda.dataset.dataset_id.type', 1, '2024-02-28 09:12:41.051733', '2024-02-28 09:55:20.251234', NULL); + INSERT INTO public."PrefillingSource" VALUES ('d79952bf-cfd9-4af4-b7b4-5a83d68890a5', 'Zenodo', 'zenodo search20falseapplication/jsonremote10$[''hits''][''total'']{like}likereference_ididlabeltitledescriptiondescription$[''hits''][''hits'']https://zenodo.org/api/records/?page={page}&size={pageSize}&q=title:"{like}" doi:"{like}" conceptdoi:"{like}"zenodo get10falseapplication/jsonremote0${like}likemetadata.title[''metadata''][''title'']metadata.description[''metadata''][''description'']metadata.license.id[''metadata''][''license''][''id'']metadata.keywords[''metadata''][''keywords'']metadata.filesize[''metadata''][''files''][''size'']metadata.language[''metadata''][''language'']metadata.dates.valid[''metadata''][''dates''][''type'']metadata.license.created[''metadata''][''license''][''created'']metadata.embargo_date[''metadata''][''embargo_date'']metadata.publication_date[''metadata''][''publication_date'']metadata.access_right[''metadata''][''access_right'']files[''files''][''key'']doidoi$https://zenodo.org/api/records/{like}metadata.titlerda.dataset.distribution.titlelabelmetadata.descriptionrda.dataset.distribution.descriptiondescriptionmetadata.license.idrda.dataset.distribution.license.license_refmetadata.keywordsrda.dataset.keywordtagsmetadata.filesizerda.dataset.distribution.byte_sizemetadata.languagerda.dataset.metadata.languagemetadata.dates.validrda.dataset.distribution.available_untilmetadata.license.createdrda.dataset.distribution.license.start_datemetadata.embargo_daterda.dataset.distribution.license.start_datemetadata.publication_daterda.dataset.issuedmetadata.access_rightrda.dataset.distribution.data_accessfilesrda.dataset.distribution.format^.*\.doirda.dataset.dataset_iddoirda.dataset.dataset_id.identifierZenodorda.dataset.distribution.host.titleMore than 99% uptime yearlyrda.dataset.distribution.host.availabilityCHrda.dataset.distribution.host.geo_locationAll files uploaded to Zenodo are stored in CERN’s EOS service in an 18 petabytes disk cluster.rda.dataset.distribution.host.storage_typedoirda.dataset.dataset_id.typehttps://schema.datacite.org/meta/kernel-4.4/rda.dataset.metadata.metadata_standard_id.identifierurlrda.dataset.metadata.metadata_standard_id.typeengrda.dataset.metadata.languageDataCite Metadata Schemarda.dataset.metadata.descriptionHourlyrda.dataset.distribution.host.backup_frequencyIncremental backuprda.dataset.distribution.host.backup_typeRepository hosted by Zenodorda.dataset.distribution.host.descriptionhttps://zenodo.orgrda.dataset.distribution.host.urldoirda.dataset.distribution.host.pid_system', 1, '2024-02-28 10:20:50.570055', '2024-03-05 07:31:31.567298', NULL); - INSERT INTO public."ReferenceType" VALUES ('2baab1e8-561f-4c15-84c3-571b811c52f6', 'licenses', 'licenses', 'opendefinition100falseapplication/vnd.api+json; charset=utf-8remote10$[*]reference_ididlabeltitledescriptionmaintaineruriurl$[*]https://licenses.opendefinition.org/licenses/groups/all.json' , 1, '2023-11-16 16:24:12.162675', '2024-02-16 09:14:22.723311', null); - INSERT INTO public."ReferenceType" VALUES ('2beacaad-3223-43ad-ad99-1e5f21328e7b', 'registries','registries','rda-metadata-schemes100falseapplication/json; charset=utf-8remote10$['meta']['pagination']['page','pages','count']{like}likereference_idmscidlabeltitledescriptiondescriptionurluri$['data']['items'][*]https://rdamsc.bath.ac.uk/api2/m?q={like}&start=1&pageSize={pageSize}', 1, '2023-11-16 10:08:21.240804', '2024-02-16 09:16:50.456347', null); - INSERT INTO public."ReferenceType" VALUES ('3d372db5-a456-45e6-a845-e41e1a8311f8', 'projects','projects', 'cite11', 1, '2023-11-16 16:24:12.162675', '2024-02-16 09:14:22.723311', null); - INSERT INTO public."ReferenceType" VALUES ('51225b6a-86a6-48ac-9192-f15096dbcb8a', 'publications','publications', 'openaire100falseapplication/json;charset=UTF-8remote00$['meta']['pagination']['page','pages','count']{like}*likereference_idoriginalIdlabeltitledescriptiontitlepid['pid']['content']pidTypeField['pid']['classid']$['results'][*]['result']['metadata']['oaf:entity']['oaf:result']https://services.openaire.eu/search/v2/api/resources?query=oaftype exact result and {like}&page={page}&size={pageSize}&format=json', 1, '2023-11-16 16:24:12.162675', '2024-02-16 09:14:22.723311', null); - INSERT INTO public."ReferenceType" VALUES ('538928bb-c7c6-452e-b66d-08e539f5f082', 'funders','funders', 'openaire101falseapplication/json; charset=utf-8local00$[*]reference_ididlabelnamedescriptionname$['refineResults']['relfunder'][*]https://services.openaire.eu/search/v2/api/publications?&refine=true&fields=relfunder&page={page}&size=0&format=json', 1, '2023-11-16 16:24:12.162675', '2024-02-16 09:14:22.723311', null); - INSERT INTO public."ReferenceType" VALUES ('5a2112e7-ea99-4cfe-98a1-68665e26726e', 'researchers','researchers', 'orcid100falseapplication/json; charset=UTF-8remote00$['num-found']{like}*likereference_idorcid-idlabelinstitution-namedescriptioninstitution-namefistNamefamily-nameslastNamegiven-names$['expanded-result'][*]https://pub.orcid.org/v3.0/expanded-search/?q={like}&start={page}&rows={pageSize}', 1, '2023-11-16 16:24:12.162675', '2024-02-16 09:14:22.723311', null); - INSERT INTO public."ReferenceType" VALUES ('5b9c284f-f041-4995-96cc-fad7ad13289c', 'grants','grants', 'openaire1538928bb-c7c6-452e-b66d-08e539f5f08200falseapplication/json; charset=utf-8remote00$['meta']['pagination']['page','pages','count']538928bb-c7c6-452e-b66d-08e539f5f082openaire{like}*likereference_idoriginalIdlabeltitledescriptiontitle$['results'][*]['result']['metadata']['oaf:entity']['oaf:project']https://services.openaire.eu/search/v2/api/resources?query=((oaftype exact project) and ((projectcode_nt exact "{like}")or({like})))&page={page}&size={pageSize}&format=json', 1, '2023-11-16 16:24:12.162675', '2024-02-16 09:14:22.723311', null); - INSERT INTO public."ReferenceType" VALUES ('7eeffb98-58fb-4921-82ec-e27f32f8e738', 'organisations','organisations', 'openaire100falseapplication/json; charset=utf-8remote00$['meta']['pagination']['page','pages','count']{like}likereference_idoriginalIdlabellegalnamedescriptionlegalnamepid['pid']['content']pidTypeField['pid']['classid']$['results'][*]['result']['metadata']['oaf:entity']['oaf:organization']https://services.openaire.eu/search/v2/api/organizations/?q={like}&page={page}&size={pageSize}&format=json', 1, '2023-11-16 16:24:12.162675', '2024-02-16 09:14:22.723311', null); - INSERT INTO public."ReferenceType" VALUES ('8ec7556b-749d-4c4a-a4b9-43d064693795', 'journals','journals', 'openaire100falseapplication/jsonremote01$['meta']['pagination']['page','pages','count']{like}like{"officialname": "{like}", "typology":"journal"}reference_ididlabelofficialnamedescriptionofficialname$['datasourceInfo'][*]https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDING', 1, '2023-11-16 16:24:12.162675', '2024-02-16 09:14:22.723311', null); - INSERT INTO public."ReferenceType" VALUES ('9ec2000d-95c7-452e-b356-755fc8e2574c', 'services','services', 'eosc100falseapplication/json; charset=utf-8remote00$['from','to','total']{like}likereference_ididlabelnamedescriptiondescriptionuriwebpage$['results'][*]https://providers.eosc-portal.eu/api/service/all?query={like}&from={page}&quantity={pageSize}', 1, '2023-11-16 16:24:12.162675', '2024-02-16 09:14:22.723311', null); - INSERT INTO public."ReferenceType" VALUES ('a3ce0fb2-d72c-48bb-b322-7401940cb802', 'datasets','datasets', 'openaire100falseapplication/json; charset=utf-8remote00$['meta']['pagination']['page','pages','count']{like}likereference_idoriginalIdlabeltitledescriptiontitlepid['pid']['content']pidTypeField['pid']['classid']$['results'][*]['result']['metadata']['oaf:entity']['oaf:result']https://services.openaire.eu/search/v2/api/datasets/?q={like}&page={page}&size={pageSize}&format=json', 1, '2023-11-16 16:24:12.162675', '2024-02-16 09:14:22.723311', null); - INSERT INTO public."ReferenceType" VALUES ('ab7cdd93-bea2-440d-880d-3846dad80b21', 'taxonomies','taxonomies', 'taxonomy11', 1, '2023-11-16 16:24:12.162675', '2024-02-16 09:14:22.723311', null); - INSERT INTO public."ReferenceType" VALUES ('d26b64ba-fda0-4b14-b3ef-9856a492d55a', 'repositories','repositories', 'openaire100falseapplication/jsonremote01$['meta']['pagination']['page','pages','count']{like}like{"officialname": "{like}", "typology":"data"}reference_ididlabelofficialnamedescriptionofficialname$['datasourceInfo'][*]https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDING', 1, '2023-11-16 16:24:12.162675', '2024-02-16 09:14:22.723311', null); - INSERT INTO public."ReferenceType" VALUES ('1e927daa-b856-443f-96da-22f325f7322f', 'Publication Repositories','pubRepositories', 'openaire100falseapplication/jsonremote01$['meta']['pagination']['page','pages','count']{like}like{"officialname": "{like}", "typology":"pubsrepository::institutional"}reference_ididlabelofficialnamedescriptionofficialname$['datasourceInfo'][*]https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDINGopenaire200falseapplication/jsonremote01$['meta']['pagination']['page','pages','count']{like}like{"officialname": "{like}", "typology":"pubsrepository::thematic"}reference_ididlabelofficialnamedescriptioncount$['datasourceInfo'][*]https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDINGopenaire300falseapplication/jsonremote01$['meta']['pagination']['page','pages','count']{like}like{"officialname": "{like}", "typology":"pubsrepository::unknown"}reference_ididlabelofficialnamedescriptionofficialname$['datasourceInfo'][*]https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDING', 1, '2023-11-16 16:24:12.162675', '2024-02-16 09:14:22.723311', null); + INSERT INTO public."ReferenceType" VALUES ('2baab1e8-561f-4c15-84c3-571b811c52f6', 'licenses', 'licenses', 'opendefinition100falseapplication/vnd.api+json; charset=utf-8remote10$[*]reference_ididlabeltitledescriptionmaintaineruriurl$[*]https://licenses.opendefinition.org/licenses/groups/all.json', 1, '2023-11-16 16:24:12.162675', '2024-02-16 09:14:22.723311', NULL); + INSERT INTO public."ReferenceType" VALUES ('2beacaad-3223-43ad-ad99-1e5f21328e7b', 'registries', 'registries', 'rda-metadata-schemes100falseapplication/json; charset=utf-8remote10$[''meta''][''pagination''][''page'',''pages'',''count'']{like}likereference_idmscidlabeltitledescriptiondescriptionurluri$[''data''][''items''][*]https://rdamsc.bath.ac.uk/api2/m?q={like}&start=1&pageSize={pageSize}', 1, '2023-11-16 10:08:21.240804', '2024-02-16 09:16:50.456347', NULL); + INSERT INTO public."ReferenceType" VALUES ('3d372db5-a456-45e6-a845-e41e1a8311f8', 'projects', 'projects', 'cite11', 1, '2023-11-17 08:55:05.190807', '2023-11-17 08:56:23.012619', NULL); + INSERT INTO public."ReferenceType" VALUES ('51225b6a-86a6-48ac-9192-f15096dbcb8a', 'publications', 'publications', 'openaire100falseapplication/json;charset=UTF-8remote00$[''meta''][''pagination''][''page'',''pages'',''count'']{like}*likereference_idoriginalIdlabeltitledescriptiontitlepid[''pid''][''content'']pidTypeField[''pid''][''classid'']$[''results''][*][''result''][''metadata''][''oaf:entity''][''oaf:result'']https://services.openaire.eu/search/v2/api/resources?query=oaftype exact result and {like}&page={page}&size={pageSize}&format=json', 1, '2023-11-16 13:07:20.591433', '2024-02-19 08:23:49.91191', NULL); + INSERT INTO public."ReferenceType" VALUES ('538928bb-c7c6-452e-b66d-08e539f5f082', 'funders', 'funders', 'openaire101falseapplication/json; charset=utf-8local00$[*]reference_ididlabelnamedescriptionname$[''refineResults''][''relfunder''][*]https://services.openaire.eu/search/v2/api/publications?&refine=true&fields=relfunder&page={page}&size=0&format=json', 1, '2023-11-16 11:22:57.942097', '2024-02-16 09:16:19.195353', NULL); + INSERT INTO public."ReferenceType" VALUES ('5a2112e7-ea99-4cfe-98a1-68665e26726e', 'researchers', 'researchers', 'orcid100falseapplication/json; charset=UTF-8remote00$[''num-found'']{like}*likereference_idorcid-idlabelinstitution-namedescriptioninstitution-namefistNamefamily-nameslastNamegiven-names$[''expanded-result''][*]https://pub.orcid.org/v3.0/expanded-search/?q={like}&start={page}&rows={pageSize}', 1, '2023-11-16 18:21:43.272982', '2024-02-16 14:43:03.12758', NULL); + INSERT INTO public."ReferenceType" VALUES ('5b9c284f-f041-4995-96cc-fad7ad13289c', 'grants', 'grants', 'openaire1538928bb-c7c6-452e-b66d-08e539f5f08200falseapplication/json; charset=utf-8remote00$[''meta''][''pagination''][''page'',''pages'',''count'']538928bb-c7c6-452e-b66d-08e539f5f082openaire{like}*likereference_idoriginalIdlabeltitledescriptiontitle$[''results''][*][''result''][''metadata''][''oaf:entity''][''oaf:project'']https://services.openaire.eu/search/v2/api/resources?query=((oaftype exact project) and ((projectcode_nt exact "{like}")or({like})))&page={page}&size={pageSize}&format=json', 1, '2023-11-16 16:41:53.106646', '2024-02-19 12:33:49.420526', NULL); + INSERT INTO public."ReferenceType" VALUES ('7eeffb98-58fb-4921-82ec-e27f32f8e738', 'organisations', 'organisations', 'openaire100falseapplication/json; charset=utf-8remote00$[''meta''][''pagination''][''page'',''pages'',''count'']{like}likereference_idoriginalIdlabellegalnamedescriptionlegalnamepid[''pid''][''content'']pidTypeField[''pid''][''classid'']$[''results''][*][''result''][''metadata''][''oaf:entity''][''oaf:organization'']https://services.openaire.eu/search/v2/api/organizations/?q={like}&page={page}&size={pageSize}&format=json', 1, '2023-11-17 10:13:15.873808', '2024-02-16 15:35:47.874131', NULL); + INSERT INTO public."ReferenceType" VALUES ('8ec7556b-749d-4c4a-a4b9-43d064693795', 'journals', 'journals', 'openaire100falseapplication/jsonremote01$[''meta''][''pagination''][''page'',''pages'',''count'']{like}like{"officialname": "{like}", "typology":"journal"}reference_ididlabelofficialnamedescriptionofficialname$[''datasourceInfo''][*]https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDING', 1, '2023-11-16 17:40:12.811667', '2024-02-16 09:09:22.816978', NULL); + INSERT INTO public."ReferenceType" VALUES ('9ec2000d-95c7-452e-b356-755fc8e2574c', 'services', 'services', 'eosc100falseapplication/json; charset=utf-8remote00$[''from'',''to'',''total'']{like}likereference_ididlabelnamedescriptiondescriptionuriwebpage$[''results''][*]https://providers.eosc-portal.eu/api/service/all?query={like}&from={page}&quantity={pageSize}', 1, '2023-11-16 17:57:22.081053', '2024-02-16 09:07:13.944104', NULL); + INSERT INTO public."ReferenceType" VALUES ('a3ce0fb2-d72c-48bb-b322-7401940cb802', 'datasets', 'datasets', 'openaire100falseapplication/json; charset=utf-8remote00$[''meta''][''pagination''][''page'',''pages'',''count'']{like}likereference_idoriginalIdlabeltitledescriptiontitlepid[''pid''][''content'']pidTypeField[''pid''][''classid'']$[''results''][*][''result''][''metadata''][''oaf:entity''][''oaf:result'']https://services.openaire.eu/search/v2/api/datasets/?q={like}&page={page}&size={pageSize}&format=json', 1, '2023-11-17 10:26:55.332111', '2024-02-16 15:33:35.025025', NULL); + INSERT INTO public."ReferenceType" VALUES ('ab7cdd93-bea2-440d-880d-3846dad80b21', 'taxonomies', 'taxonomies', 'taxonomy11', 1, '2023-11-16 17:48:09.769599', '2023-11-16 17:48:09.780609', NULL); + INSERT INTO public."ReferenceType" VALUES ('d26b64ba-fda0-4b14-b3ef-9856a492d55a', 'repositories', 'repositories', 'openaire100falseapplication/jsonremote01$[''meta''][''pagination''][''page'',''pages'',''count'']{like}like{"officialname": "{like}", "typology":"data"}reference_ididlabelofficialnamedescriptionofficialname$[''datasourceInfo''][*]https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDING', 1, '2023-11-16 17:10:33.849688', '2024-02-16 12:45:18.66016', NULL); + INSERT INTO public."ReferenceType" VALUES ('1e927daa-b856-443f-96da-22f325f7322f', 'Publication Repositories', 'pubRepositories', 'openaire100falseapplication/jsonremote01$[''meta''][''pagination''][''page'',''pages'',''count'']{like}like{"officialname": "{like}", "typology":"pubsrepository::institutional"}reference_ididlabelofficialnamedescriptionofficialname$[''datasourceInfo''][*]https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDINGopenaire200falseapplication/jsonremote01$[''meta''][''pagination''][''page'',''pages'',''count'']{like}like{"officialname": "{like}", "typology":"pubsrepository::thematic"}reference_ididlabelofficialnamedescriptioncount$[''datasourceInfo''][*]https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDINGopenaire300falseapplication/jsonremote01$[''meta''][''pagination''][''page'',''pages'',''count'']{like}like{"officialname": "{like}", "typology":"pubsrepository::unknown"}reference_ididlabelofficialnamedescriptionofficialname$[''datasourceInfo''][*]https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDING', 1, '2023-11-16 17:17:40.882679', '2024-02-19 09:53:35.61152', NULL); INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.060', '2024-03-26 12:00:00.000000+02', now(), 'Add Language, Prefilling Source, Reference Type values.'); diff --git a/notification-service/notification-web/src/main/resources/config/cache.yml b/notification-service/notification-web/src/main/resources/config/cache.yml index ec7370d42..bbbcc0614 100644 --- a/notification-service/notification-web/src/main/resources/config/cache.yml +++ b/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: ------ diff --git a/notification-service/notification-web/src/main/resources/config/notification-devel.yml b/notification-service/notification-web/src/main/resources/config/notification-devel.yml index fff9c2a54..d89f86b2e 100644 --- a/notification-service/notification-web/src/main/resources/config/notification-devel.yml +++ b/notification-service/notification-web/src/main/resources/config/notification-devel.yml @@ -3,4 +3,488 @@ notification: fields: - key: "{installation-url}" type: "String" - value: "http://localhost:42000" \ No newline at end of file + 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" \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/config/notification.yml b/notification-service/notification-web/src/main/resources/config/notification.yml index 7192cf334..fd0d90609 100644 --- a/notification-service/notification-web/src/main/resources/config/notification.yml +++ b/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:}