Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add null checks to summaries #7160

Merged
merged 4 commits into from
Dec 18, 2024
Merged

add null checks to summaries #7160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8417ce
add missing null check to summaries
auumgn Dec 18, 2024
8468db9
Merge branch 'main' into add-null-checks-to-summaries
auumgn Dec 18, 2024
c516430
Merge branch 'main' into add-null-checks-to-summaries
auumgn Dec 18, 2024
9a6473c
??
amontenegro Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions orcid-core/src/main/java/org/orcid/core/common/manager/impl/SummaryManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
Expand Down
1 change: 0 additions & 1 deletion orcid-persistence/src/test/java/org/orcid/persistence/dao/NotificationDaoTest.java
View file
Open in desktop
Original file line number Diff 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
Loading