Search in sources :

Example 26 with ResearcherUrls

use of org.orcid.jaxb.model.record_v2.ResearcherUrls in project ORCID-Source by ORCID.

the class MemberV2ApiServiceDelegator_ReadPersonTest method assertAllPublicButEmails.

private void assertAllPublicButEmails(Person p) {
    assertNotNull(p);
    Utils.verifyLastModified(p.getLastModifiedDate());
    // Address
    assertNotNull(p.getAddresses());
    Addresses a = p.getAddresses();
    assertNotNull(a);
    Utils.verifyLastModified(a.getLastModifiedDate());
    assertEquals(1, a.getAddress().size());
    assertEquals(Long.valueOf(9), a.getAddress().get(0).getPutCode());
    assertEquals(Visibility.PUBLIC, a.getAddress().get(0).getVisibility());
    // Biography
    assertNotNull(p.getBiography());
    Biography b = p.getBiography();
    assertNotNull(b);
    Utils.verifyLastModified(b.getLastModifiedDate());
    assertEquals("Biography for 0000-0000-0000-0003", b.getContent());
    // External identifiers
    assertNotNull(p.getExternalIdentifiers());
    PersonExternalIdentifiers extIds = p.getExternalIdentifiers();
    assertNotNull(extIds);
    Utils.verifyLastModified(extIds.getLastModifiedDate());
    assertEquals(1, extIds.getExternalIdentifiers().size());
    assertEquals(Long.valueOf(13), extIds.getExternalIdentifiers().get(0).getPutCode());
    assertEquals(Visibility.PUBLIC, extIds.getExternalIdentifiers().get(0).getVisibility());
    // Keywords
    assertNotNull(p.getKeywords());
    Keywords k = p.getKeywords();
    assertNotNull(k);
    Utils.verifyLastModified(k.getLastModifiedDate());
    assertEquals(1, k.getKeywords().size());
    assertEquals(Long.valueOf(9), k.getKeywords().get(0).getPutCode());
    assertEquals(Visibility.PUBLIC, k.getKeywords().get(0).getVisibility());
    // Name
    assertNotNull(p.getName());
    assertEquals("Credit Name", p.getName().getCreditName().getContent());
    assertEquals("Given Names", p.getName().getGivenNames().getContent());
    assertEquals("Family Name", p.getName().getFamilyName().getContent());
    // Other names
    assertNotNull(p.getOtherNames());
    OtherNames o = p.getOtherNames();
    assertNotNull(o);
    Utils.verifyLastModified(o.getLastModifiedDate());
    assertEquals(1, o.getOtherNames().size());
    assertEquals(Long.valueOf(13), o.getOtherNames().get(0).getPutCode());
    assertEquals(Visibility.PUBLIC, o.getOtherNames().get(0).getVisibility());
    // Researcher urls
    assertNotNull(p.getResearcherUrls());
    ResearcherUrls ru = p.getResearcherUrls();
    assertNotNull(ru);
    Utils.verifyLastModified(ru.getLastModifiedDate());
    assertEquals(1, ru.getResearcherUrls().size());
    assertEquals(Long.valueOf(13), ru.getResearcherUrls().get(0).getPutCode());
    assertEquals(Visibility.PUBLIC, ru.getResearcherUrls().get(0).getVisibility());
}
Also used : Addresses(org.orcid.jaxb.model.record_v2.Addresses) Keywords(org.orcid.jaxb.model.record_v2.Keywords) PersonExternalIdentifiers(org.orcid.jaxb.model.record_v2.PersonExternalIdentifiers) OtherNames(org.orcid.jaxb.model.record_v2.OtherNames) Biography(org.orcid.jaxb.model.record_v2.Biography) ResearcherUrls(org.orcid.jaxb.model.record_v2.ResearcherUrls)

Example 27 with ResearcherUrls

use of org.orcid.jaxb.model.record_v2.ResearcherUrls in project ORCID-Source by ORCID.

the class MemberV2ApiServiceDelegator_ReadRecordTest method assertAllPublicButEmails.

private void assertAllPublicButEmails(Person p) {
    assertNotNull(p);
    Utils.verifyLastModified(p.getLastModifiedDate());
    // Address
    assertNotNull(p.getAddresses());
    Addresses a = p.getAddresses();
    assertNotNull(a);
    Utils.verifyLastModified(a.getLastModifiedDate());
    assertEquals(1, a.getAddress().size());
    assertEquals(Long.valueOf(9), a.getAddress().get(0).getPutCode());
    assertEquals(Visibility.PUBLIC, a.getAddress().get(0).getVisibility());
    // Biography
    assertNotNull(p.getBiography());
    Biography b = p.getBiography();
    assertNotNull(b);
    Utils.verifyLastModified(b.getLastModifiedDate());
    assertEquals("Biography for 0000-0000-0000-0003", b.getContent());
    // External identifiers
    assertNotNull(p.getExternalIdentifiers());
    PersonExternalIdentifiers extIds = p.getExternalIdentifiers();
    assertNotNull(extIds);
    Utils.verifyLastModified(extIds.getLastModifiedDate());
    assertEquals(1, extIds.getExternalIdentifiers().size());
    assertEquals(Long.valueOf(13), extIds.getExternalIdentifiers().get(0).getPutCode());
    assertEquals(Visibility.PUBLIC, extIds.getExternalIdentifiers().get(0).getVisibility());
    // Keywords
    assertNotNull(p.getKeywords());
    Keywords k = p.getKeywords();
    assertNotNull(k);
    Utils.verifyLastModified(k.getLastModifiedDate());
    assertEquals(1, k.getKeywords().size());
    assertEquals(Long.valueOf(9), k.getKeywords().get(0).getPutCode());
    assertEquals(Visibility.PUBLIC, k.getKeywords().get(0).getVisibility());
    // Name
    assertNotNull(p.getName());
    assertEquals("Credit Name", p.getName().getCreditName().getContent());
    assertEquals("Given Names", p.getName().getGivenNames().getContent());
    assertEquals("Family Name", p.getName().getFamilyName().getContent());
    // Other names
    assertNotNull(p.getOtherNames());
    OtherNames o = p.getOtherNames();
    assertNotNull(o);
    Utils.verifyLastModified(o.getLastModifiedDate());
    assertEquals(1, o.getOtherNames().size());
    assertEquals(Long.valueOf(13), o.getOtherNames().get(0).getPutCode());
    assertEquals(Visibility.PUBLIC, o.getOtherNames().get(0).getVisibility());
    // Researcher urls
    assertNotNull(p.getResearcherUrls());
    ResearcherUrls ru = p.getResearcherUrls();
    assertNotNull(ru);
    Utils.verifyLastModified(ru.getLastModifiedDate());
    assertEquals(1, ru.getResearcherUrls().size());
    assertEquals(Long.valueOf(13), ru.getResearcherUrls().get(0).getPutCode());
    assertEquals(Visibility.PUBLIC, ru.getResearcherUrls().get(0).getVisibility());
}
Also used : Addresses(org.orcid.jaxb.model.record_v2.Addresses) Keywords(org.orcid.jaxb.model.record_v2.Keywords) PersonExternalIdentifiers(org.orcid.jaxb.model.record_v2.PersonExternalIdentifiers) OtherNames(org.orcid.jaxb.model.record_v2.OtherNames) Biography(org.orcid.jaxb.model.record_v2.Biography) ResearcherUrls(org.orcid.jaxb.model.record_v2.ResearcherUrls)

Example 28 with ResearcherUrls

use of org.orcid.jaxb.model.record_v2.ResearcherUrls in project ORCID-Source by ORCID.

the class MemberV2ApiServiceDelegator_ReadRecordTest method testPerson.

private void testPerson(Person p, String orcid) {
    // This is more an utility that will work only for 0000-0000-0000-0003
    assertEquals("0000-0000-0000-0003", orcid);
    assertNotNull(p);
    assertEquals("/0000-0000-0000-0003/person", p.getPath());
    Utils.verifyLastModified(p.getLastModifiedDate());
    // Address
    assertNotNull(p.getAddresses());
    Addresses a = p.getAddresses();
    assertNotNull(a);
    Utils.verifyLastModified(a.getLastModifiedDate());
    assertEquals(3, a.getAddress().size());
    boolean found1 = false, found2 = false, found3 = false;
    for (Address element : a.getAddress()) {
        Utils.verifyLastModified(element.getLastModifiedDate());
        if (element.getPutCode() == 9) {
            found1 = true;
        } else if (element.getPutCode() == 10) {
            found2 = true;
        } else if (element.getPutCode() == 11) {
            found3 = true;
        } else {
            fail("Invalid put code " + element.getPutCode());
        }
    }
    assertTrue(found1);
    assertTrue(found2);
    assertTrue(found3);
    // Biography
    assertNotNull(p.getBiography());
    Biography b = p.getBiography();
    assertNotNull(b);
    Utils.verifyLastModified(b.getLastModifiedDate());
    assertEquals("Biography for 0000-0000-0000-0003", b.getContent());
    // Email
    assertNotNull(p.getEmails());
    Emails email = p.getEmails();
    assertNotNull(email);
    Utils.verifyLastModified(email.getLastModifiedDate());
    assertEquals(3, email.getEmails().size());
    assertEquals("public_0000-0000-0000-0003@test.orcid.org", email.getEmails().get(0).getEmail());
    found1 = false;
    found2 = false;
    found3 = false;
    for (Email element : email.getEmails()) {
        if (element.getEmail().equals("public_0000-0000-0000-0003@test.orcid.org")) {
            found1 = true;
        } else if (element.getEmail().equals("limited_0000-0000-0000-0003@test.orcid.org")) {
            found2 = true;
        } else if (element.getEmail().equals("private_0000-0000-0000-0003@test.orcid.org")) {
            found3 = true;
        } else {
            fail("Invalid email " + element.getEmail());
        }
    }
    assertTrue(found1);
    assertTrue(found2);
    assertTrue(found3);
    // External identifiers
    assertNotNull(p.getExternalIdentifiers());
    PersonExternalIdentifiers extIds = p.getExternalIdentifiers();
    assertNotNull(extIds);
    Utils.verifyLastModified(extIds.getLastModifiedDate());
    assertEquals(3, extIds.getExternalIdentifiers().size());
    found1 = false;
    found2 = false;
    found3 = false;
    for (PersonExternalIdentifier element : extIds.getExternalIdentifiers()) {
        Utils.verifyLastModified(element.getLastModifiedDate());
        if (element.getPutCode() == 13) {
            found1 = true;
        } else if (element.getPutCode() == 14) {
            found2 = true;
        } else if (element.getPutCode() == 15) {
            found3 = true;
        } else {
            fail("Invalid put code " + element.getPutCode());
        }
    }
    assertTrue(found1);
    assertTrue(found2);
    assertTrue(found3);
    // Keywords
    assertNotNull(p.getKeywords());
    Keywords k = p.getKeywords();
    assertNotNull(k);
    Utils.verifyLastModified(k.getLastModifiedDate());
    assertEquals(3, k.getKeywords().size());
    found1 = false;
    found2 = false;
    found3 = false;
    for (Keyword element : k.getKeywords()) {
        Utils.verifyLastModified(element.getLastModifiedDate());
        if (element.getPutCode() == 9) {
            found1 = true;
        } else if (element.getPutCode() == 10) {
            found2 = true;
        } else if (element.getPutCode() == 11) {
            found3 = true;
        } else {
            fail("Invalid put code " + element.getPutCode());
        }
    }
    assertTrue(found1);
    assertTrue(found2);
    assertTrue(found3);
    // Name
    assertNotNull(p.getName());
    assertEquals("Credit Name", p.getName().getCreditName().getContent());
    assertEquals("Given Names", p.getName().getGivenNames().getContent());
    assertEquals("Family Name", p.getName().getFamilyName().getContent());
    // Other names
    assertNotNull(p.getOtherNames());
    OtherNames o = p.getOtherNames();
    assertNotNull(o);
    Utils.verifyLastModified(o.getLastModifiedDate());
    assertEquals(3, o.getOtherNames().size());
    found1 = false;
    found2 = false;
    found3 = false;
    for (OtherName element : o.getOtherNames()) {
        Utils.verifyLastModified(element.getLastModifiedDate());
        if (element.getPutCode() == 13) {
            found1 = true;
        } else if (element.getPutCode() == 14) {
            found2 = true;
        } else if (element.getPutCode() == 15) {
            found3 = true;
        } else {
            fail("Invalid put code " + element.getPutCode());
        }
    }
    assertTrue(found1);
    assertTrue(found2);
    assertTrue(found3);
    // Researcher urls
    assertNotNull(p.getResearcherUrls());
    ResearcherUrls ru = p.getResearcherUrls();
    assertNotNull(ru);
    Utils.verifyLastModified(ru.getLastModifiedDate());
    assertEquals(3, ru.getResearcherUrls().size());
    found1 = false;
    found2 = false;
    found3 = false;
    for (ResearcherUrl element : ru.getResearcherUrls()) {
        Utils.verifyLastModified(element.getLastModifiedDate());
        if (element.getPutCode() == 13) {
            found1 = true;
        } else if (element.getPutCode() == 14) {
            found2 = true;
        } else if (element.getPutCode() == 15) {
            found3 = true;
        } else {
            fail("Invalid put code " + element.getPutCode());
        }
    }
    assertTrue(found1);
    assertTrue(found2);
    assertTrue(found3);
    assertNotNull(p.getPath());
}
Also used : Email(org.orcid.jaxb.model.record_v2.Email) Keywords(org.orcid.jaxb.model.record_v2.Keywords) Address(org.orcid.jaxb.model.record_v2.Address) Keyword(org.orcid.jaxb.model.record_v2.Keyword) OtherNames(org.orcid.jaxb.model.record_v2.OtherNames) OtherName(org.orcid.jaxb.model.record_v2.OtherName) PersonExternalIdentifier(org.orcid.jaxb.model.record_v2.PersonExternalIdentifier) Addresses(org.orcid.jaxb.model.record_v2.Addresses) PersonExternalIdentifiers(org.orcid.jaxb.model.record_v2.PersonExternalIdentifiers) Biography(org.orcid.jaxb.model.record_v2.Biography) ResearcherUrls(org.orcid.jaxb.model.record_v2.ResearcherUrls) ResearcherUrl(org.orcid.jaxb.model.record_v2.ResearcherUrl) Emails(org.orcid.jaxb.model.record_v2.Emails)

Example 29 with ResearcherUrls

use of org.orcid.jaxb.model.record_v2.ResearcherUrls in project ORCID-Source by ORCID.

the class MemberV2ApiServiceDelegator_ResearcherUrlsTest method testDeleteResearcherUrl.

@Test
public void testDeleteResearcherUrl() {
    SecurityContextTestUtils.setUpSecurityContext("4444-4444-4444-4445", ScopePathType.PERSON_UPDATE, ScopePathType.PERSON_READ_LIMITED);
    Response response = serviceDelegator.viewResearcherUrls("4444-4444-4444-4445");
    assertNotNull(response);
    ResearcherUrls researcherUrls = (ResearcherUrls) response.getEntity();
    assertNotNull(researcherUrls);
    assertNotNull(researcherUrls.getResearcherUrls());
    assertFalse(researcherUrls.getResearcherUrls().isEmpty());
    ResearcherUrl toDelete = null;
    for (ResearcherUrl rurl : researcherUrls.getResearcherUrls()) {
        if (rurl.getSource().retrieveSourcePath().equals("APP-5555555555555555")) {
            toDelete = rurl;
            break;
        }
    }
    assertNotNull(toDelete);
    response = serviceDelegator.deleteResearcherUrl("4444-4444-4444-4445", toDelete.getPutCode());
    assertNotNull(response);
    assertEquals(Response.Status.NO_CONTENT.getStatusCode(), response.getStatus());
    response = serviceDelegator.viewResearcherUrls("4444-4444-4444-4445");
    assertNotNull(response);
    researcherUrls = (ResearcherUrls) response.getEntity();
    assertNotNull(researcherUrls);
    assertNotNull(researcherUrls.getResearcherUrls());
    assertEquals(0, researcherUrls.getResearcherUrls().size());
}
Also used : Response(javax.ws.rs.core.Response) ResearcherUrls(org.orcid.jaxb.model.record_v2.ResearcherUrls) ResearcherUrl(org.orcid.jaxb.model.record_v2.ResearcherUrl) DBUnitTest(org.orcid.test.DBUnitTest) Test(org.junit.Test)

Example 30 with ResearcherUrls

use of org.orcid.jaxb.model.record_v2.ResearcherUrls in project ORCID-Source by ORCID.

the class ResearcherUrlManagerImpl method updateResearcherUrls.

/**
     * Update the researcher urls associated with a specific account
     * 
     * @param orcid
     * @param researcherUrls
     * */
@Override
@Transactional
public ResearcherUrls updateResearcherUrls(String orcid, ResearcherUrls researcherUrls) {
    List<ResearcherUrlEntity> existingEntities = researcherUrlDao.getResearcherUrls(orcid, getLastModified(orcid));
    //Delete the deleted ones
    for (ResearcherUrlEntity existingEntity : existingEntities) {
        boolean deleteMe = true;
        if (researcherUrls.getResearcherUrls() != null) {
            for (ResearcherUrl updatedOrNew : researcherUrls.getResearcherUrls()) {
                if (existingEntity.getId().equals(updatedOrNew.getPutCode())) {
                    deleteMe = false;
                    break;
                }
            }
        }
        if (deleteMe) {
            try {
                researcherUrlDao.deleteResearcherUrl(existingEntity.getProfile().getId(), existingEntity.getId());
            } catch (Exception e) {
                throw new ApplicationException("Unable to delete researcher url " + existingEntity.getId(), e);
            }
        }
    }
    // Update or create new
    if (researcherUrls != null && researcherUrls.getResearcherUrls() != null) {
        for (ResearcherUrl updatedOrNew : researcherUrls.getResearcherUrls()) {
            if (updatedOrNew.getPutCode() != null) {
                //Update the existing ones
                for (ResearcherUrlEntity existingEntity : existingEntities) {
                    if (existingEntity.getId().equals(updatedOrNew.getPutCode())) {
                        existingEntity.setLastModified(new Date());
                        existingEntity.setVisibility(updatedOrNew.getVisibility());
                        existingEntity.setUrl(updatedOrNew.getUrl().getValue());
                        existingEntity.setUrlName(updatedOrNew.getUrlName());
                        existingEntity.setDisplayIndex(updatedOrNew.getDisplayIndex());
                        researcherUrlDao.merge(existingEntity);
                    }
                }
            } else {
                //Add the new ones
                ResearcherUrlEntity newResearcherUrl = jpaJaxbResearcherUrlAdapter.toResearcherUrlEntity(updatedOrNew);
                SourceEntity sourceEntity = sourceManager.retrieveSourceEntity();
                ProfileEntity profile = new ProfileEntity(orcid);
                newResearcherUrl.setUser(profile);
                newResearcherUrl.setDateCreated(new Date());
                newResearcherUrl.setLastModified(new Date());
                if (sourceEntity.getSourceProfile() != null) {
                    newResearcherUrl.setSourceId(sourceEntity.getSourceProfile().getId());
                }
                if (sourceEntity.getSourceClient() != null) {
                    newResearcherUrl.setClientSourceId(sourceEntity.getSourceClient().getId());
                }
                newResearcherUrl.setVisibility(updatedOrNew.getVisibility());
                newResearcherUrl.setDisplayIndex(updatedOrNew.getDisplayIndex());
                researcherUrlDao.persist(newResearcherUrl);
            }
        }
    }
    return researcherUrls;
}
Also used : ApplicationException(org.orcid.core.exception.ApplicationException) ResearcherUrlEntity(org.orcid.persistence.jpa.entities.ResearcherUrlEntity) SourceEntity(org.orcid.persistence.jpa.entities.SourceEntity) ResearcherUrl(org.orcid.jaxb.model.record_v2.ResearcherUrl) ApplicationException(org.orcid.core.exception.ApplicationException) OrcidDuplicatedElementException(org.orcid.core.exception.OrcidDuplicatedElementException) Date(java.util.Date) ProfileEntity(org.orcid.persistence.jpa.entities.ProfileEntity) Transactional(org.springframework.transaction.annotation.Transactional)

Aggregations

ResearcherUrls (org.orcid.jaxb.model.record_v2.ResearcherUrls)56 Test (org.junit.Test)52 ResearcherUrl (org.orcid.jaxb.model.record_v2.ResearcherUrl)48 OtherNames (org.orcid.jaxb.model.record_v2.OtherNames)37 Addresses (org.orcid.jaxb.model.record_v2.Addresses)35 Biography (org.orcid.jaxb.model.record_v2.Biography)35 Keywords (org.orcid.jaxb.model.record_v2.Keywords)35 PersonExternalIdentifiers (org.orcid.jaxb.model.record_v2.PersonExternalIdentifiers)35 Address (org.orcid.jaxb.model.record_v2.Address)34 Email (org.orcid.jaxb.model.record_v2.Email)33 Emails (org.orcid.jaxb.model.record_v2.Emails)33 Keyword (org.orcid.jaxb.model.record_v2.Keyword)33 PersonExternalIdentifier (org.orcid.jaxb.model.record_v2.PersonExternalIdentifier)33 OtherName (org.orcid.jaxb.model.record_v2.OtherName)32 Name (org.orcid.jaxb.model.record_v2.Name)28 Person (org.orcid.jaxb.model.record_v2.Person)25 EducationSummary (org.orcid.jaxb.model.record.summary_v2.EducationSummary)15 EmploymentSummary (org.orcid.jaxb.model.record.summary_v2.EmploymentSummary)15 FundingSummary (org.orcid.jaxb.model.record.summary_v2.FundingSummary)15 PeerReviewSummary (org.orcid.jaxb.model.record.summary_v2.PeerReviewSummary)15