Skip to content
This repository was archived by the owner on Oct 6, 2023. It is now read-only.

Commit c8e73b3

Browse files
author
sowerstl
committed
Add Validation on Contributor; (DOECODE-799)
1 parent 9b9d5e9 commit c8e73b3

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

src/main/java/gov/osti/services/Metadata.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2363,8 +2363,11 @@ else if (m.getLicenses().contains(DOECodeMetadata.License.Other.value()) && Stri
23632363
if (!Validation.isValidORCID(contributor.getOrcid()))
23642364
reasons.add("Contributor ORCID \"" + contributor.getOrcid() +"\" is not valid.");
23652365
}
2366+
if (StringUtils.isBlank(contributor.getFirstName()) || StringUtils.isBlank(contributor.getLastName()) || (null == contributor.getContributorType())) {
2367+
reasons.add("Contributor must include first name, last name, and contributor type.");
23662368
}
23672369
}
2370+
}
23682371
// if "OS" accessibility, a REPOSITORY LINK is REQUIRED
23692372
if (DOECodeMetadata.Accessibility.OS.equals(m.getAccessibility())) {
23702373
if (StringUtils.isBlank(m.getRepositoryLink()))
@@ -2377,6 +2380,7 @@ else if (m.getLicenses().contains(DOECodeMetadata.License.Other.value()) && Stri
23772380
// if repository link is present, and not CO, it needs to be valid too
23782381
if (StringUtils.isNotBlank(m.getRepositoryLink()) && !DOECodeMetadata.Accessibility.CO.equals(m.getAccessibility()) && !Validation.isValidRepositoryLink(m.getRepositoryLink()))
23792382
reasons.add("Repository URL is not a valid repository.");
2383+
23802384
return reasons;
23812385
}
23822386

src/main/java/gov/osti/services/Metadata.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,7 @@ metadata fields.
527527
{"email":"[email protected]",
528528
"affiliations":["Testing Services, Inc."],
529529
"first_name":"Tester",
530+
"last_name":"Smith",
530531
"contributor_type":"DataCurator"}],
531532
"sponsoring_organizations":[
532533
{"organization_name":"OSTI",

0 commit comments

Comments
 (0)