Merge branch 'main' into remove-custom-date-created-in-profile-email-…

…domain-entity
ORCID · Dec 18, 2024 · a984db2 · a984db2
2 parents 3eb03ed + 6f3e1e5
commit a984db2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/orcid-core/src/main/java/org/orcid/core/common/manager/impl/SummaryManagerImpl.java b/orcid-core/src/main/java/org/orcid/core/common/manager/impl/SummaryManagerImpl.java
@@ -283,7 +283,7 @@ public RecordSummaryPojo getRecordSummaryPojo(String orcid) {
                 for (EmailDomain ed : recordSummary.getEmailDomains().getEmailDomains()) {
                     EmailDomainSummary eds = new EmailDomainSummary();
                     eds.setValue(ed.getValue());
-                    if (ed.getVerificationDate() != null) {
+                    if (ed.getVerificationDate() != null && ed.getVerificationDate().getValue() != null) {
                         eds.setVerificationDate(ed.getVerificationDate().toString());
                     }
                     emailDomains.add(eds);
@@ -524,7 +524,7 @@ public void generateEmailDomainsSummary(RecordSummary recordSummary, String orci
                 for (ProfileEmailDomainEntity ped : emailDomains) {
                     ed = new EmailDomain();
                     ed.setValue(ped.getEmailDomain());
-                    if (!ped.getGeneratedByScript()) {
+                    if (!ped.getGeneratedByScript() && ped.getDateCreated() != null) {
                         VerificationDate verificationDate = new VerificationDate(DateUtils.convertToXMLGregorianCalendar(ped.getDateCreated()));
                         ed.setVerificationDate(verificationDate);
                     }

diff --git a/orcid-persistence/src/test/java/org/orcid/persistence/dao/NotificationDaoTest.java b/orcid-persistence/src/test/java/org/orcid/persistence/dao/NotificationDaoTest.java
@@ -242,7 +242,6 @@ public void testFindNotificationsToSendLegacy() {
         for (Long id : ids) {
             notificationDao.remove(id);
         }
-
     }
 
     private Long createNotification(String orcid, Date sentDate) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -242,7 +242,6 @@ public void testFindNotificationsToSendLegacy() { @@
             for (Long id : ids) {
                 notificationDao.remove(id);
             }
         }
         private Long createNotification(String orcid, Date sentDate) {
@@ Expand Down @@