From 3b7017caeb2265472c6b40c805b5d47f2f86512a Mon Sep 17 00:00:00 2001 From: github actions Date: Wed, 9 Oct 2024 13:18:48 +0000 Subject: [PATCH 1/3] v2.66.0 changelog update --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e40966486f..95e0bc328ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## v2.66.0 - 2024-10-09 + +[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.65.6...v2.66.0) + +### Feature + +- map check names to their workflow files to allow for searching + ## v2.65.6 - 2024-10-02 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.65.5...v2.65.6) From bb4e1010bfdcadc1d5e261ac6e416a24a66a9427 Mon Sep 17 00:00:00 2001 From: Camelia Dumitru <62257307+Camelia-Orcid@users.noreply.github.com> Date: Wed, 9 Oct 2024 18:49:06 +0100 Subject: [PATCH 2/3] Added the date verified when verifying an email address (#7101) Co-authored-by: Angel Montenegro --- .../orcid/persistence/dao/impl/EmailDaoImpl.java | 2 +- .../persistence/jpa/entities/EmailEntity.java | 14 +++++++++++++- orcid-persistence/src/main/resources/db-master.xml | 1 + .../db/updates/add_date_verified_to_email.xml | 14 ++++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 orcid-persistence/src/main/resources/db/updates/add_date_verified_to_email.xml diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/EmailDaoImpl.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/EmailDaoImpl.java index a0effb50ab8..3df5afeb243 100644 --- a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/EmailDaoImpl.java +++ b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/EmailDaoImpl.java @@ -123,7 +123,7 @@ public void addSourceToEmail(String sourceId, String email) { @Transactional @UpdateProfileLastModified public boolean verifyEmail(String email) { - Query query = entityManager.createNativeQuery("update email set is_verified = true, is_current=true, last_modified=now() where trim(lower(email)) = trim(lower(:email))"); + Query query = entityManager.createNativeQuery("update email set is_verified = true, is_current=true, last_modified=now(), date_verified=now() where trim(lower(email)) = trim(lower(:email))"); query.setParameter("email", email); return query.executeUpdate() > 0; } diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/EmailEntity.java b/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/EmailEntity.java index d9dbd1b5a8e..6977ec86502 100644 --- a/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/EmailEntity.java +++ b/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/EmailEntity.java @@ -3,6 +3,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; +import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; @@ -24,7 +25,8 @@ public class EmailEntity extends SourceAwareEntity implements OrcidAware private Boolean primary; private Boolean current; private Boolean verified; - private String visibility; + private String visibility; + private Date dateVerified; @Override @Id @@ -90,6 +92,15 @@ public String getVisibility() { public void setVisibility(String visibility) { this.visibility = visibility; } + + @Column(name = "date_verified") + public Date getDateVerified() { + return dateVerified; + } + + public void setDateVerified(Date dateVerified) { + this.dateVerified = dateVerified; + } public static Map mapByLowerCaseEmail(Collection emailEntities) { Map map = new HashMap<>(); @@ -109,5 +120,6 @@ public void clean() { visibility= null; verified = null; visibility = null; + dateVerified = null; } } \ No newline at end of file diff --git a/orcid-persistence/src/main/resources/db-master.xml b/orcid-persistence/src/main/resources/db-master.xml index c1a531b9bb3..65dfe060bf5 100644 --- a/orcid-persistence/src/main/resources/db-master.xml +++ b/orcid-persistence/src/main/resources/db-master.xml @@ -404,4 +404,5 @@ + \ No newline at end of file diff --git a/orcid-persistence/src/main/resources/db/updates/add_date_verified_to_email.xml b/orcid-persistence/src/main/resources/db/updates/add_date_verified_to_email.xml new file mode 100644 index 00000000000..2b1327cf016 --- /dev/null +++ b/orcid-persistence/src/main/resources/db/updates/add_date_verified_to_email.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file From 7ab48afeed59201ebbf7fcf0e5576cd2dd596c9d Mon Sep 17 00:00:00 2001 From: github actions Date: Wed, 9 Oct 2024 18:03:48 +0000 Subject: [PATCH 3/3] v2.66.1 changelog update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95e0bc328ff..c427584637c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v2.66.1 - 2024-10-09 + +[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.66.0...v2.66.1) + ## v2.66.0 - 2024-10-09 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.65.6...v2.66.0)