${(digestEmail.notificationsBySourceId[sourceId].source.sourceName.content)!sourceId}: <#if notification.notificationSubject??>${notification.notificationSubject} <#if notification.createdDate??>(${notification.createdDate.year?c}-<#if notification.createdDate.month?string?length == 1>0${notification.createdDate.month?c}<#else>${notification.createdDate.month?c}-<#if notification.createdDate.day?string?length == 1>0${notification.createdDate.day?c}<#else>${notification.createdDate.day?c}) <#else><@emailMacros.msg "email.digest.requesttoadd" /> <#if notification.createdDate??>(${notification.createdDate.year?c}-<#if notification.createdDate.month?string?length == 1>0${notification.createdDate.month?c}<#else>${notification.createdDate.month?c}-<#if notification.createdDate.day?string?length == 1>0${notification.createdDate.day?c}<#else>${notification.createdDate.day?c}) diff --git a/orcid-core/src/main/resources/org/orcid/core/template/digest_notification.ftl b/orcid-core/src/main/resources/org/orcid/core/template/digest_notification.ftl index 20a0a05974c..6c2ceddd54a 100644 --- a/orcid-core/src/main/resources/org/orcid/core/template/digest_notification.ftl +++ b/orcid-core/src/main/resources/org/orcid/core/template/digest_notification.ftl @@ -39,6 +39,7 @@ ${'\n'}${emailName}<@emailMacros.space /><@emailMacros.msg "notification.digest. <#else> <#if notification.notificationIntro??>${notification.notificationIntro} ${(digestEmail.notificationsBySourceId[sourceId].source.sourceName.content)!sourceId}: <#if notification.notificationSubject??>${notification.notificationSubject} <#if notification.createdDate??>(${notification.createdDate.year?c}-<#if notification.createdDate.month?string?length == 1>0${notification.createdDate.month?c}<#else>${notification.createdDate.month?c}-<#if notification.createdDate.day?string?length == 1>0${notification.createdDate.day?c}<#else>${notification.createdDate.day?c})<#else><@emailMacros.msg "email.digest.requesttoadd" /> <#if notification.createdDate??>(${notification.createdDate.year?c}-<#if notification.createdDate.month?string?length == 1>0${notification.createdDate.month?c}<#else>${notification.createdDate.month?c}-<#if notification.createdDate.day?string?length == 1>0${notification.createdDate.day?c}<#else>${notification.createdDate.day?c}) + <#if notification.items?? && notification.items.itemsByType?has_content> <#assign itemsByType=notification.items.itemsByType> <#list itemsByType?keys?sort as itemType> <@emailMacros.msg "email.common.recordsection." + itemType /> (${itemsByType[itemType]?size}) @@ -49,6 +50,10 @@ ${'\n'}${emailName}<@emailMacros.space /><@emailMacros.msg "notification.digest. <@emailMacros.msg "email.digest.plaintext.addnow" /><@emailMacros.space />${baseUri}/inbox/encrypted/${notification.encryptedPutCode}/action <@emailMacros.msg "email.digest.plaintext.moreinfo" /><@emailMacros.space />${baseUri}/inbox#${notification.putCode} + <#else> + <@emailMacros.msg "email.digest.plaintext.addnow" /><@emailMacros.space />${baseUri}/inbox/encrypted/${notification.encryptedPutCode}/action + <@emailMacros.msg "email.digest.plaintext.moreinfo" /><@emailMacros.space />${baseUri}/inbox#${notification.putCode} + <#elseif notificationType == 'AMENDED' && !verboseNotifications> <#assign amendedSection><@emailMacros.msg "email.common.recordsection." + notification.amendedSection /> diff --git a/orcid-core/src/main/resources/org/orcid/core/template/digest_notification_html.ftl b/orcid-core/src/main/resources/org/orcid/core/template/digest_notification_html.ftl index 68b792b10d8..26e7d1f6276 100644 --- a/orcid-core/src/main/resources/org/orcid/core/template/digest_notification_html.ftl +++ b/orcid-core/src/main/resources/org/orcid/core/template/digest_notification_html.ftl @@ -110,6 +110,7 @@ <#else> <#if notification.notificationIntro??>
${notification.notificationIntro}
<#if notification.notificationSubject??>${notification.notificationSubject} <#if notification.createdDate??>(${notification.createdDate.year?c}-<#if notification.createdDate.month?string?length == 1>0${notification.createdDate.month?c}<#else>${notification.createdDate.month?c}-<#if notification.createdDate.day?string?length == 1>0${notification.createdDate.day?c}<#else>${notification.createdDate.day?c})<#else><@emailMacros.msg "email.digest.requesttoadd" /> <#if notification.createdDate??>(${notification.createdDate.year?c}-<#if notification.createdDate.month?string?length == 1>0${notification.createdDate.month?c}<#else>${notification.createdDate.month?c}-<#if notification.createdDate.day?string?length == 1>0${notification.createdDate.day?c}<#else>${notification.createdDate.day?c})
+ <#if notification.items??> <#assign itemsByType=notification.items.itemsByType> <#list itemsByType?keys?sort as itemType>
@@ -125,6 +126,7 @@
+
ItemType.WORK.equals(i.getItemType()))
+ .findFirst().orElse(null);
+ assertNotNull(item1);
+ assertEquals("101", item1.getPutCode());
+ assertEquals("Work Title", item1.getItemName());
+ assertNotNull(item1.getExternalIdentifier());
+ assertEquals("doi", item1.getExternalIdentifier().getType());
+ assertEquals("10.1234/test", item1.getExternalIdentifier().getValue());
+ assertEquals("https://doi.org/10.1234/test", item1.getExternalIdentifier().getUrl().getValue());
+ assertEquals(org.orcid.jaxb.model.record_v2.Relationship.SELF, item1.getExternalIdentifier().getRelationship());
+
+ Item item2 = permissionNotification.getItems().getItems().stream()
+ .filter(i -> ItemType.EMPLOYMENT.equals(i.getItemType()))
+ .findFirst().orElse(null);
+ assertNotNull(item2);
+ assertEquals("102", item2.getPutCode());
+ assertEquals("University of Testing", item2.getItemName());
+ assertNull(item2.getExternalIdentifier());
+ }
+
@Test
public void testToNotificationPermissionEntity() {
NotificationPermission notification = new NotificationPermission();
diff --git a/orcid-core/src/test/java/org/orcid/core/adapter/v3/JpaJaxbNotificationAdapterTest.java b/orcid-core/src/test/java/org/orcid/core/adapter/v3/JpaJaxbNotificationAdapterTest.java
index 7b7335a99df..c871d2fb326 100644
--- a/orcid-core/src/test/java/org/orcid/core/adapter/v3/JpaJaxbNotificationAdapterTest.java
+++ b/orcid-core/src/test/java/org/orcid/core/adapter/v3/JpaJaxbNotificationAdapterTest.java
@@ -155,6 +155,7 @@ public void testEntityToNotificationWithSource() {
Notification amendedNotification = jpaJaxbNotificationAdapter.toNotification(amendedEntity);
assertNotNull(amendedNotification);
assertTrue(amendedNotification instanceof NotificationAmended);
+ assertNotNull(((NotificationAmended) amendedNotification).getItems());
assertNotNull(amendedNotification.getSource());
assertNotNull(amendedNotification.getSource().getSourceClientId());
assertEquals(CLIENT_SOURCE_ID, amendedNotification.getSource().getSourceClientId().getPath());
@@ -169,6 +170,7 @@ public void testEntityToNotificationWithSource() {
Notification permissionNotification = jpaJaxbNotificationAdapter.toNotification(addItemsEntity);
assertNotNull(permissionNotification);
assertTrue(permissionNotification instanceof NotificationPermission);
+ assertNotNull(((NotificationPermission) permissionNotification).getItems());
assertNotNull(permissionNotification.getSource());
assertNotNull(permissionNotification.getSource().getSourceClientId());
assertEquals(CLIENT_SOURCE_ID, permissionNotification.getSource().getSourceClientId().getPath());
@@ -176,6 +178,60 @@ public void testEntityToNotificationWithSource() {
assertEquals("Client name", permissionNotification.getSource().getSourceName().getContent());
}
+ @Test
+ public void testToNotificationPermissionWithItems() {
+ NotificationAddItemsEntity addItemsEntity = new NotificationAddItemsEntity();
+ addItemsEntity.setId(125L);
+ addItemsEntity.setNotificationType(org.orcid.jaxb.model.notification_v2.NotificationType.PERMISSION.name());
+ addItemsEntity.setClientSourceId(CLIENT_SOURCE_ID);
+ addItemsEntity.setAuthorizationUrl("https://orcid.org/oauth/authorize?client_id=APP-1234");
+
+ NotificationItemEntity itemEntity1 = new NotificationItemEntity();
+ itemEntity1.setId(101L);
+ itemEntity1.setItemType("WORK");
+ itemEntity1.setItemName("Work Title");
+ itemEntity1.setExternalIdType("DOI");
+ itemEntity1.setExternalIdValue("10.1234/test");
+ itemEntity1.setExternalIdUrl("https://doi.org/10.1234/test");
+ itemEntity1.setExternalIdRelationship("SELF");
+
+ NotificationItemEntity itemEntity2 = new NotificationItemEntity();
+ itemEntity2.setId(102L);
+ itemEntity2.setItemType("EMPLOYMENT");
+ itemEntity2.setItemName("University of Testing");
+
+ addItemsEntity.setNotificationItems(java.util.Set.of(itemEntity1, itemEntity2));
+
+ Notification notification = jpaJaxbNotificationAdapter.toNotification(addItemsEntity);
+ assertNotNull(notification);
+ assertTrue(notification instanceof NotificationPermission);
+ NotificationPermission permissionNotification = (NotificationPermission) notification;
+ assertNotNull(permissionNotification.getItems());
+ assertNotNull(permissionNotification.getItems().getItems());
+ assertEquals(2, permissionNotification.getItems().getItems().size());
+ assertEquals(2, permissionNotification.getItems().getItemsByType().size());
+
+ Item item1 = permissionNotification.getItems().getItems().stream()
+ .filter(i -> ItemType.WORK.equals(i.getItemType()))
+ .findFirst().orElse(null);
+ assertNotNull(item1);
+ assertEquals("101", item1.getPutCode());
+ assertEquals("Work Title", item1.getItemName());
+ assertNotNull(item1.getExternalIdentifier());
+ assertEquals("doi", item1.getExternalIdentifier().getType());
+ assertEquals("10.1234/test", item1.getExternalIdentifier().getValue());
+ assertEquals("https://doi.org/10.1234/test", item1.getExternalIdentifier().getUrl().getValue());
+ assertEquals(Relationship.SELF, item1.getExternalIdentifier().getRelationship());
+
+ Item item2 = permissionNotification.getItems().getItems().stream()
+ .filter(i -> ItemType.EMPLOYMENT.equals(i.getItemType()))
+ .findFirst().orElse(null);
+ assertNotNull(item2);
+ assertEquals("102", item2.getPutCode());
+ assertEquals("University of Testing", item2.getItemName());
+ assertNull(item2.getExternalIdentifier());
+ }
+
@Test
public void testToNotificationPermissionEntity() {
NotificationPermission notification = new NotificationPermission();
diff --git a/orcid-core/src/test/java/org/orcid/core/utils/ContributorUtilsTest.java b/orcid-core/src/test/java/org/orcid/core/utils/ContributorUtilsTest.java
index 39864ed1dde..567eec90471 100644
--- a/orcid-core/src/test/java/org/orcid/core/utils/ContributorUtilsTest.java
+++ b/orcid-core/src/test/java/org/orcid/core/utils/ContributorUtilsTest.java
@@ -25,14 +25,18 @@
import org.orcid.core.manager.ProfileEntityCacheManager;
import org.orcid.core.manager.ProfileEntityManager;
import org.orcid.jaxb.model.common_v2.Contributor;
+import org.orcid.jaxb.model.common_v2.ContributorAttributes;
import org.orcid.jaxb.model.common_v2.ContributorEmail;
import org.orcid.jaxb.model.common_v2.ContributorOrcid;
+import org.orcid.jaxb.model.common_v2.ContributorRole;
import org.orcid.jaxb.model.common_v2.CreditName;
import org.orcid.jaxb.model.common_v2.Title;
+import org.orcid.jaxb.model.error_v2.OrcidError;
import org.orcid.jaxb.model.record_v2.Funding;
import org.orcid.jaxb.model.record_v2.FundingContributor;
import org.orcid.jaxb.model.record_v2.FundingContributors;
import org.orcid.jaxb.model.record_v2.FundingTitle;
+import org.orcid.jaxb.model.record_v2.SequenceType;
import org.orcid.jaxb.model.record_v2.Work;
import org.orcid.jaxb.model.record_v2.WorkBulk;
import org.orcid.jaxb.model.record_v2.WorkContributors;
@@ -131,6 +135,60 @@ public void testFilterContributorPrivateDataForFundingWithoutContributors() {
assertNotNull(funding); // test no failures
}
+ @Test
+ public void testFilterContributorPrivateDataForWork() {
+ // A public name is available, so a name replacement would be visible
+ when(profileEntityManager.orcidExists(anyString())).thenReturn(true);
+ when(cacheManager.getPublicCreditName(any(String.class))).thenReturn("a public name");
+
+ Work work = getWorkWithOrcidContributor();
+ ContributorAttributes attributes = new ContributorAttributes();
+ attributes.setContributorRole(ContributorRole.AUTHOR);
+ attributes.setContributorSequence(SequenceType.FIRST);
+ work.getWorkContributors().getContributor().get(0).setContributorAttributes(attributes);
+
+ contributorUtils.filterContributorPrivateData(work);
+
+ Contributor contributor = work.getWorkContributors().getContributor().get(0);
+ assertNull(contributor.getContributorEmail());
+ assertEquals("original credit name", contributor.getCreditName().getContent());
+ assertEquals("0000-0003-4902-6327", contributor.getContributorOrcid().getPath());
+ assertEquals(ContributorRole.AUTHOR, contributor.getContributorAttributes().getContributorRole());
+ assertEquals(SequenceType.FIRST, contributor.getContributorAttributes().getContributorSequence());
+ }
+
+ @Test
+ public void testFilterContributorPrivateDataForWorkWithNoOrcidRecord() {
+ Work work = getWorkWithContributorWithoutOrcid();
+ contributorUtils.filterContributorPrivateData(work);
+
+ Contributor contributor = work.getWorkContributors().getContributor().get(0);
+ assertNull(contributor.getContributorEmail());
+ assertEquals("original credit name", contributor.getCreditName().getContent());
+ }
+
+ @Test
+ public void testFilterContributorPrivateDataForWorkWithoutContributors() {
+ Work work = getWorkWithoutContributors();
+ contributorUtils.filterContributorPrivateData(work);
+ assertNull(work.getWorkContributors());
+ }
+
+ @Test
+ public void testFilterContributorPrivateDataForBulkWork() {
+ OrcidError error = new OrcidError();
+ error.setDeveloperMessage("not a work");
+ WorkBulk bulk = new WorkBulk();
+ bulk.setBulk(new ArrayList<>(Arrays.asList(getWorkWithOrcidContributor(), error, getWorkWithContributorWithoutOrcid())));
+
+ contributorUtils.filterContributorPrivateData(bulk);
+
+ assertEquals(3, bulk.getBulk().size());
+ assertNull(((Work) bulk.getBulk().get(0)).getWorkContributors().getContributor().get(0).getContributorEmail());
+ assertEquals("not a work", ((OrcidError) bulk.getBulk().get(1)).getDeveloperMessage());
+ assertNull(((Work) bulk.getBulk().get(2)).getWorkContributors().getContributor().get(0).getContributorEmail());
+ }
+
private Work getWorkWithoutContributors() {
Work work = new Work();
WorkTitle workTitle = new WorkTitle();
diff --git a/orcid-core/src/test/java/org/orcid/core/utils/v3/ContributorUtilsTest.java b/orcid-core/src/test/java/org/orcid/core/utils/v3/ContributorUtilsTest.java
index 00dcaeb5445..38597193ef7 100644
--- a/orcid-core/src/test/java/org/orcid/core/utils/v3/ContributorUtilsTest.java
+++ b/orcid-core/src/test/java/org/orcid/core/utils/v3/ContributorUtilsTest.java
@@ -25,11 +25,14 @@
import org.orcid.core.manager.v3.ActivityManager;
import org.orcid.core.manager.v3.ProfileEntityManager;
import org.orcid.core.manager.v3.read_only.RecordNameManagerReadOnly;
+import org.orcid.jaxb.model.common.SequenceType;
import org.orcid.jaxb.model.v3.release.common.Contributor;
+import org.orcid.jaxb.model.v3.release.common.ContributorAttributes;
import org.orcid.jaxb.model.v3.release.common.ContributorEmail;
import org.orcid.jaxb.model.v3.release.common.ContributorOrcid;
import org.orcid.jaxb.model.v3.release.common.CreditName;
import org.orcid.jaxb.model.v3.release.common.Title;
+import org.orcid.jaxb.model.v3.release.error.OrcidError;
import org.orcid.jaxb.model.v3.release.record.Funding;
import org.orcid.jaxb.model.v3.release.record.FundingContributor;
import org.orcid.jaxb.model.v3.release.record.FundingContributors;
@@ -130,6 +133,60 @@ public void testFilterContributorPrivateDataForFundingWithoutContributors() {
assertNotNull(funding); // test no failures
}
+ @Test
+ public void testFilterContributorPrivateDataForWork() {
+ // A public name is available, so a name replacement would be visible
+ when(profileEntityManager.orcidExists(anyString())).thenReturn(true);
+ when(recordNameManagerReadOnlyV3.fetchDisplayablePublicName(anyString())).thenReturn("a public name");
+
+ Work work = getWorkWithOrcidContributor();
+ ContributorAttributes attributes = new ContributorAttributes();
+ attributes.setContributorRole("author");
+ attributes.setContributorSequence(SequenceType.FIRST);
+ work.getWorkContributors().getContributor().get(0).setContributorAttributes(attributes);
+
+ contributorUtils.filterContributorPrivateData(work);
+
+ Contributor contributor = work.getWorkContributors().getContributor().get(0);
+ assertNull(contributor.getContributorEmail());
+ assertEquals("original credit name", contributor.getCreditName().getContent());
+ assertEquals("0000-0003-4902-6327", contributor.getContributorOrcid().getPath());
+ assertEquals("author", contributor.getContributorAttributes().getContributorRole());
+ assertEquals(SequenceType.FIRST, contributor.getContributorAttributes().getContributorSequence());
+ }
+
+ @Test
+ public void testFilterContributorPrivateDataForWorkWithNoOrcidRecord() {
+ Work work = getWorkWithContributorWithoutOrcid();
+ contributorUtils.filterContributorPrivateData(work);
+
+ Contributor contributor = work.getWorkContributors().getContributor().get(0);
+ assertNull(contributor.getContributorEmail());
+ assertEquals("original credit name", contributor.getCreditName().getContent());
+ }
+
+ @Test
+ public void testFilterContributorPrivateDataForWorkWithoutContributors() {
+ Work work = getWorkWithoutContributors();
+ contributorUtils.filterContributorPrivateData(work);
+ assertNull(work.getWorkContributors());
+ }
+
+ @Test
+ public void testFilterContributorPrivateDataForBulkWork() {
+ OrcidError error = new OrcidError();
+ error.setDeveloperMessage("not a work");
+ WorkBulk bulk = new WorkBulk();
+ bulk.setBulk(new ArrayList<>(Arrays.asList(getWorkWithOrcidContributor(), error, getWorkWithContributorWithoutOrcid())));
+
+ contributorUtils.filterContributorPrivateData(bulk);
+
+ assertEquals(3, bulk.getBulk().size());
+ assertNull(((Work) bulk.getBulk().get(0)).getWorkContributors().getContributor().get(0).getContributorEmail());
+ assertEquals("not a work", ((OrcidError) bulk.getBulk().get(1)).getDeveloperMessage());
+ assertNull(((Work) bulk.getBulk().get(2)).getWorkContributors().getContributor().get(0).getContributorEmail());
+ }
+
private Work getWorkWithoutContributors() {
Work work = new Work();
WorkTitle workTitle = new WorkTitle();
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ClientDetailsDaoImpl.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ClientDetailsDaoImpl.java
index 11d0ac2b613..ba95e030c93 100644
--- a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ClientDetailsDaoImpl.java
+++ b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ClientDetailsDaoImpl.java
@@ -100,9 +100,8 @@ public void updateLastModified(String clientId) {
/**
* Update the last modified dates of given client ids
- *
- * @param clientIds
- * A list of client ids
+ *
+ * @param clientIds A list of client ids
* @return the amount of modified rows
*/
@@ -194,9 +193,8 @@ public void removeClient(String clientId) {
/**
* Get the public client that belongs to the given orcid ID
- *
- * @param ownerId
- * The user or group id
+ *
+ * @param ownerId The user or group id
* @return the public client that belongs to the given user
*/
@Override
@@ -216,9 +214,8 @@ public ClientDetailsEntity getPublicClient(String ownerId) {
/**
* Get member name
- *
- * @param clientId
- * The client id
+ *
+ * @param clientId The client id
* @return the name of the member owner of the given client
*/
@Override
@@ -269,7 +266,7 @@ public ListHello from "));
}
+ @Test
+ public void testPermissionNotificationEmail() {
+ NotificationPermission notification = new NotificationPermission();
+ notification.setPutCode(100L);
+ notification.setNotificationType(NotificationType.PERMISSION);
+ notification.setSubject("Connect with your organization");
+ notification.setNotificationSubject("Connect with your organization");
+ notification.setNotificationIntro("University of Testing");
+ notification.setAuthorizationUrl(new AuthorizationUrl("https://orcid.org/oauth/authorize?client_id=APP-1234"));
+ notification.setCreatedDate(DateUtils.convertToXMLGregorianCalendar("2026-10-01T12:00:00"));
+ Source source = new Source();
+ source.setSourceName(new SourceName("University of Testing"));
+ source.setSourceClientId(new SourceClientId("APP-1234567890123456"));
+ notification.setSource(source);
+
+ List