Sync with latest main

ORCID · Dec 10, 2024 · d8b2e38 · d8b2e38
2 parents 6e15775 + d3ccb64
commit d8b2e38
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## v2.69.0 - 2024-12-09
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.68.14...v2.69.0)
+
+## v2.68.14 - 2024-12-09
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.68.13...v2.68.14)
+
 ## v2.68.13 - 2024-12-02
 
 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.68.12...v2.68.13)

diff --git a/...in/java/org/orcid/api/memberV2/server/delegator/impl/MemberV2ApiServiceDelegatorImpl.java b/...in/java/org/orcid/api/memberV2/server/delegator/impl/MemberV2ApiServiceDelegatorImpl.java
@@ -62,6 +62,7 @@
 import org.orcid.core.utils.SourceUtils;
 import org.orcid.core.version.impl.Api2_0_LastModifiedDatesHelper;
 import org.orcid.jaxb.model.client_v2.ClientSummary;
+import org.orcid.jaxb.model.common_v2.Source;
 import org.orcid.jaxb.model.groupid_v2.GroupIdRecord;
 import org.orcid.jaxb.model.groupid_v2.GroupIdRecords;
 import org.orcid.jaxb.model.message.ScopePathType;
@@ -1120,6 +1121,9 @@ private void processProfessionalEmails(Emails emails) {
                 // Set appropriate source name and source id for professional emails
                 for(EmailDomainEntity domainInfo: domainInfos) {
                     if (domainInfo != null && domainInfo.getCategory().equals(EmailDomainEntity.DomainCategory.PROFESSIONAL)) {
+                        if (email.getSource() == null) {
+                            email.setSource(new Source());
+                        }
                         email.setSource(sourceEntityUtils.convertEmailSourceToOrcidValidator(email.getSource()));
                         break;
                     }

diff --git a/...src/main/java/org/orcid/core/manager/read_only/impl/PersonDetailsManagerReadOnlyImpl.java b/...src/main/java/org/orcid/core/manager/read_only/impl/PersonDetailsManagerReadOnlyImpl.java
@@ -15,6 +15,7 @@
 import org.orcid.core.manager.read_only.RecordNameManagerReadOnly;
 import org.orcid.core.manager.read_only.ResearcherUrlManagerReadOnly;
 import org.orcid.core.utils.SourceEntityUtils;
+import org.orcid.jaxb.model.common_v2.Source;
 import org.orcid.jaxb.model.common_v2.Visibility;
 import org.orcid.jaxb.model.record_v2.Address;
 import org.orcid.jaxb.model.record_v2.Addresses;
@@ -222,8 +223,11 @@ private void processProfessionalEmails(Emails emails) {
                         }
                     }
                     if(StringUtils.equalsIgnoreCase(category, EmailDomainEntity.DomainCategory.PROFESSIONAL.name())) {
-                    email.setSource(sourceEntityUtils.convertEmailSourceToOrcidValidator(email.getSource()));
-                }
+                        if(email.getSource() == null) {
+                            email.setSource(new Source());
+                        }
+                        email.setSource(sourceEntityUtils.convertEmailSourceToOrcidValidator(email.getSource()));
+                    }
                 }
             }
         }

diff --git a/...in/java/org/orcid/api/publicV2/server/delegator/impl/PublicV2ApiServiceDelegatorImpl.java b/...in/java/org/orcid/api/publicV2/server/delegator/impl/PublicV2ApiServiceDelegatorImpl.java
@@ -51,6 +51,7 @@
 import org.orcid.core.utils.SourceUtils;
 import org.orcid.core.version.impl.Api2_0_LastModifiedDatesHelper;
 import org.orcid.jaxb.model.client_v2.ClientSummary;
+import org.orcid.jaxb.model.common_v2.Source;
 import org.orcid.jaxb.model.common_v2.Visibility;
 import org.orcid.jaxb.model.groupid_v2.GroupIdRecord;
 import org.orcid.jaxb.model.groupid_v2.GroupIdRecords;
@@ -638,6 +639,9 @@ private void processProfessionalEmails(Emails emails) {
                         }
                     }
                     if (StringUtils.equalsIgnoreCase(category, EmailDomainEntity.DomainCategory.PROFESSIONAL.name())) {
+                        if(email.getSource() == null) {
+                            email.setSource(new Source());
+                        }
                         email.setSource(sourceEntityUtils.convertEmailSourceToOrcidValidator(email.getSource()));
                     }
                 }