Merge branch 'main' into 9418-start-storing-email-verification-date

.github/workflows/maven_test_publish.yml

@@ -165,7 +165,7 @@ jobs:
         uses: dorny/test-reporter@e9fa2f582c0ebbe2e263fd18fad744d52e0b0203
         if: always()
         with:
-          name: "${{ inputs.project }}: Unit tests results"
+          name: "maven_test_publish_${{ inputs.project }}"
           path: ${{ inputs.project }}/target/surefire-reports/*.xml
           reporter: java-junit
           fail-on-error: true

.github/workflows/maven_test_report.yml

@@ -24,7 +24,7 @@ jobs:
     - uses: dorny/test-reporter@e9fa2f582c0ebbe2e263fd18fad744d52e0b0203
       with:
         artifact: ${{ inputs.project }}
-        name: "${{ inputs.project }} Unit Tests"   # Name of the check run which will be created
+        name: "maven_test_report_${{ inputs.project }}"   # Name of the check run which will be created
         path: '*.xml'                              # Path to test results (inside artifact .zip)
         reporter: java-junit                       # Format of test results
 

CHANGELOG.md

@@ -1,3 +1,11 @@
+## v2.65.6 - 2024-10-02
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.65.5...v2.65.6)
+
+- [#7093](https://github.com/ORCID/ORCID-Source/pull/7093): Revert "Added the code to store deleted items in panoply dw_deleted_items table"
+- [#7091](https://github.com/ORCID/ORCID-Source/pull/7091): Added the code to store deleted items in panoply dw_deleted_items table
+- [#7090](https://github.com/ORCID/ORCID-Source/pull/7090): Removed all created date, last modified  from email domain summary
+
 ## v2.65.5 - 2024-09-23
 
 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.65.4...v2.65.5)

orcid-core/src/main/java/org/orcid/core/common/manager/impl/SummaryManagerImpl.java

@@ -524,17 +524,13 @@ public void generateEmailDomainsSummary(RecordSummary recordSummary, String orci
                 for (ProfileEmailDomainEntity ped : emailDomains) {
                     ed = new EmailDomain();
                     ed.setValue(ped.getEmailDomain());
-                    ed.setCreatedDate(Date.valueOf(ped.getDateCreated()));
-                    ed.setLastModified(Date.valueOf(ped.getLastModified()));
                     edList.add(ed);
                 }
             }
             List<EmailDomain> emailDomainsTop3 = new ArrayList<EmailDomain>();
             edList.stream().limit(3).forEach(t -> {
                 EmailDomain ed = new EmailDomain();
                 ed.setValue(t.getValue());
-                ed.setCreatedDate(t.getCreatedDate());
-                ed.setLastModified(t.getLastModified());
                 emailDomainsTop3.add(ed);
             });
 

orcid-core/src/main/java/org/orcid/core/model/EmailDomain.java

@@ -15,16 +15,12 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(propOrder = { "value", "createdDate","lastModified"})
+@XmlType(propOrder = { "value"})
 @XmlRootElement(name = "email-domain", namespace = "http://www.orcid.org/ns/summary")
 @Schema(description = "Email Domain")
 public class EmailDomain {
     @XmlElement(name = "value", namespace = "http://www.orcid.org/ns/summary")
     protected String value;
-    @XmlElement(name = "created-date", namespace = "http://www.orcid.org/ns/common")
-    protected Date createdDate;
-    @XmlElement(name = "last-modified-date", namespace = "http://www.orcid.org/ns/common")
-    protected Date lastModified;
 
     public String getValue() {
         return value;
@@ -34,27 +30,10 @@ public void setValue(String value) {
         this.value = value;
     }
 
-    @XmlTransient
-    public Date getCreatedDate() {
-        return createdDate;
-    }
-
-    public void setCreatedDate(Date createdDate) {
-        this.createdDate = createdDate;
-    }
-
-    @XmlTransient
-    public Date getLastModified() {
-        return lastModified;
-    }
-
-    public void setLastModified(Date lastModified) {
-        this.lastModified = lastModified;
-    }
 
     @Override
     public int hashCode() {
-        return Objects.hash(value, createdDate, lastModified);
+        return Objects.hash(value);
     }
 
     @Override
@@ -66,6 +45,6 @@ public boolean equals(Object obj) {
         if (getClass() != obj.getClass())
             return false;
         EmailDomain other = (EmailDomain) obj;
-        return Objects.equals(createdDate, other.createdDate) && Objects.equals(lastModified, other.lastModified) && Objects.equals(value, other.value);
+        return Objects.equals(value, other.value);
     }
 }

orcid-core/src/test/java/org/orcid/core/model/RecordSummaryMarshallingTest.java

@@ -97,7 +97,7 @@ private RecordSummary getRecordSummary() {
         EmailDomains emailDomains = new EmailDomains();
         emailDomains.setCount(4);
         emailDomains.setEmailDomains(new ArrayList<EmailDomain>());
-        emailDomains.getEmailDomains().add(getEmailDomain("sometrusted.org", getEmailDomainCreatedDate(), getEmailDomainLastModified()));
+        emailDomains.getEmailDomains().add(getEmailDomain("sometrusted.org"));
         record.setEmailDomains(emailDomains);
 
         //Set education/qualifications
@@ -163,7 +163,7 @@ private EducationQualification getEducationQualification(int putCode, String rol
         return eq;
     }
 
-    private EmailDomain getEmailDomain(String domainValue, Date created, Date modified) {
+    private EmailDomain getEmailDomain(String domainValue) {
         EmailDomain emailDomain = new EmailDomain();
         emailDomain.setValue(domainValue);
         //emailDomain.setCreatedDate(created);