replace verification date cutoff with new flag

ORCID · Dec 17, 2024 · 5e57abc · 5e57abc
1 parent 645cf88
commit 5e57abc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 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
@@ -73,7 +73,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 
-import static org.orcid.core.constants.EmailConstants.VERIFICATION_DATE_CUTOFF;
 
 public class SummaryManagerImpl implements SummaryManager {
     @Resource(name = "recordNameManagerReadOnlyV3")
@@ -284,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 && ed.getVerificationDate().after(VERIFICATION_DATE_CUTOFF)) {
+                    if (ed.getVerificationDate() != null) {
                         eds.setVerificationDate(ed.getVerificationDate().toString());
                     }
                     emailDomains.add(eds);
@@ -525,8 +524,8 @@ public void generateEmailDomainsSummary(RecordSummary recordSummary, String orci
                 for (ProfileEmailDomainEntity ped : emailDomains) {
                     ed = new EmailDomain();
                     ed.setValue(ped.getEmailDomain());
-                    VerificationDate verificationDate = new VerificationDate(DateUtils.convertToXMLGregorianCalendar(ped.getDateCreated()));
-                    if (verificationDate.after(VERIFICATION_DATE_CUTOFF)) {
+                    if (!ped.getGeneratedByScript()) {
+                        VerificationDate verificationDate = new VerificationDate(DateUtils.convertToXMLGregorianCalendar(ped.getDateCreated()));
                         ed.setVerificationDate(verificationDate);
                     }
                     edList.add(ed);

diff --git a/orcid-core/src/main/java/org/orcid/core/constants/EmailConstants.java b/orcid-core/src/main/java/org/orcid/core/constants/EmailConstants.java
@@ -28,8 +28,6 @@ public class EmailConstants {
 
     public static final String DO_NOT_REPLY_VERIFY_ORCID_ORG = "ORCID - Do not reply <[email protected]>";
 
-    public static final VerificationDate VERIFICATION_DATE_CUTOFF;
-
     static {
         XMLGregorianCalendar gregorianCutoffDate = null;
         VerificationDate verificationDate = null;
@@ -46,6 +44,5 @@ public class EmailConstants {
             throw new RuntimeException("Error initializing XMLGregorianCalendar", e);
         }
 
-        VERIFICATION_DATE_CUTOFF = verificationDate;
     }
 }