diff --git a/orcid-core/src/main/java/org/orcid/pojo/summary/AffiliationSummary.java b/orcid-core/src/main/java/org/orcid/pojo/summary/AffiliationSummary.java index 11fab722cda..0d0a0aaac05 100644 --- a/orcid-core/src/main/java/org/orcid/pojo/summary/AffiliationSummary.java +++ b/orcid-core/src/main/java/org/orcid/pojo/summary/AffiliationSummary.java @@ -14,7 +14,7 @@ public class AffiliationSummary { public String endDate; public String role; public String type; - public boolean validatedOrSelfAsserted; + public boolean validated; public String getOrganizationName() { return organizationName; @@ -64,12 +64,12 @@ public void setType(String type) { this.type = type; } - public boolean isValidatedOrSelfAsserted() { - return validatedOrSelfAsserted; + public boolean isValidated() { + return validated; } - public void setValidatedOrSelfAsserted(boolean validatedOrSelfAsserted) { - this.validatedOrSelfAsserted = validatedOrSelfAsserted; + public void setValidated(boolean validated) { + this.validated = validated; } public static List valueOf(List affiliationGroupForms, String orcid, String type) { @@ -109,7 +109,7 @@ public static AffiliationSummary valueOf(org.orcid.jaxb.model.v3.release.record. form.setType(type); if (as.getSource() != null) { - form.setValidatedOrSelfAsserted(SourceUtils.isSelfAsserted(as.getSource(), orcid)); + form.setValidated(SourceUtils.isSelfAsserted(as.getSource(), orcid)); } } return form; diff --git a/orcid-core/src/main/java/org/orcid/pojo/summary/RecordSummary.java b/orcid-core/src/main/java/org/orcid/pojo/summary/RecordSummary.java index 27950432a11..1b8e3d9ad57 100644 --- a/orcid-core/src/main/java/org/orcid/pojo/summary/RecordSummary.java +++ b/orcid-core/src/main/java/org/orcid/pojo/summary/RecordSummary.java @@ -12,7 +12,7 @@ public class RecordSummary { private String lastModified; private int validatedWorks; private int selfAssertedWorks; - private int reviews; + private int peerReviewsTotal; private int peerReviewPublicationGrants; private int validatedFunds; private int selfAssertedFunds; @@ -85,12 +85,12 @@ public void setSelfAssertedWorks(int selfAssertedWorks) { this.selfAssertedWorks = selfAssertedWorks; } - public int getReviews() { - return reviews; + public int getPeerReviewsTotal() { + return peerReviewsTotal; } - public void setReviews(int reviews) { - this.reviews = reviews; + public void setPeerReviewsTotal(int peerReviewsTotal) { + this.peerReviewsTotal = peerReviewsTotal; } public int getPeerReviewPublicationGrants() { diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/PublicRecordController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/PublicRecordController.java index ddb373b0ea4..e7895de7977 100644 --- a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/PublicRecordController.java +++ b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/PublicRecordController.java @@ -362,7 +362,7 @@ RecordSummary getSummary(String orcid) { Record record = recordManagerReadOnly.getPublicRecord(orcid, false); Person person = record.getPerson(); if (person != null) { - String displayName = "Name is private or limited"; + String displayName = "undefined"; Name name = person.getName(); if (name != null) { if (name.getVisibility().equals(org.orcid.jaxb.model.v3.release.common.Visibility.PUBLIC)) { @@ -466,10 +466,10 @@ RecordSummary getSummary(String orcid) { peerReviewMinimizedSummaryList.forEach(peerReviewMinimizedSummary -> { publicationGrants.set(publicationGrants.intValue() + peerReviewMinimizedSummary.getPutCodes().size()); }); - recordSummary.setReviews(peerReviewMinimizedSummaryList.size()); + recordSummary.setPeerReviewsTotal(peerReviewMinimizedSummaryList.size()); recordSummary.setPeerReviewPublicationGrants(publicationGrants.intValue()); } else { - recordSummary.setReviews(0); + recordSummary.setPeerReviewsTotal(0); recordSummary.setPeerReviewPublicationGrants(0); } diff --git a/orcid-web/src/test/java/org/orcid/frontend/web/controllers/PublicRecordControllerTest.java b/orcid-web/src/test/java/org/orcid/frontend/web/controllers/PublicRecordControllerTest.java index ca676b71e2a..f454aa763ab 100644 --- a/orcid-web/src/test/java/org/orcid/frontend/web/controllers/PublicRecordControllerTest.java +++ b/orcid-web/src/test/java/org/orcid/frontend/web/controllers/PublicRecordControllerTest.java @@ -172,7 +172,7 @@ public void testGetRecordSummary() { assertEquals(1, record.getValidatedWorks()); assertEquals(0, record.getSelfAssertedWorks()); - assertEquals(0, record.getReviews()); + assertEquals(0, record.getPeerReviewsTotal()); assertEquals(0, record.getPeerReviewPublicationGrants()); assertEquals(1, record.getValidatedFunds());