Search in sources :

Example 21 with ExternalIdentifiers

use of org.orcid.jaxb.model.message.ExternalIdentifiers in project ORCID-Source by ORCID.

the class T2OrcidApiServiceDelegatorTest method testDefaultPrivacyOnBio.

@Test
public void testDefaultPrivacyOnBio() {
    SecurityContextTestUtils.setUpSecurityContext("4444-4444-4444-4499", ScopePathType.ORCID_BIO_UPDATE);
    OrcidMessage orcidMessage = new OrcidMessage();
    orcidMessage.setMessageVersion("1.2_rc6");
    OrcidProfile orcidProfile = new OrcidProfile();
    orcidProfile.setOrcidIdentifier(new OrcidIdentifier("4444-4444-4444-4499"));
    orcidMessage.setOrcidProfile(orcidProfile);
    OrcidBio orcidBio = new OrcidBio();
    orcidProfile.setOrcidBio(orcidBio);
    PersonalDetails personalDetails = new PersonalDetails();
    orcidBio.setPersonalDetails(personalDetails);
    GivenNames givenNames = new GivenNames("Test given names");
    personalDetails.setGivenNames(givenNames);
    CreditName creditName = new CreditName("Credit Name");
    personalDetails.setCreditName(creditName);
    ExternalIdentifier id = new ExternalIdentifier();
    id.setExternalIdCommonName(new ExternalIdCommonName("cn1"));
    id.setExternalIdReference(new ExternalIdReference("value1"));
    orcidBio.setExternalIdentifiers(new ExternalIdentifiers());
    orcidBio.getExternalIdentifiers().getExternalIdentifier().add(id);
    personalDetails.setOtherNames(new OtherNames());
    personalDetails.getOtherNames().addOtherName("on1", null);
    orcidBio.setKeywords(new Keywords());
    orcidBio.getKeywords().getKeyword().add(new Keyword("kw1", null));
    orcidBio.setResearcherUrls(new ResearcherUrls());
    orcidBio.getResearcherUrls().getResearcherUrl().add(new ResearcherUrl(new Url("http://rurl2.com"), null));
    t2OrcidApiServiceDelegator.updateBioDetails(mockedUriInfo, "4444-4444-4444-4499", orcidMessage);
    OrcidProfile p = orcidProfileManager.retrieveOrcidProfile("4444-4444-4444-4499");
    assertEquals("cn1", p.getOrcidBio().getExternalIdentifiers().getExternalIdentifier().get(0).getExternalIdCommonName().getContent());
    assertEquals(Visibility.PUBLIC, p.getOrcidBio().getExternalIdentifiers().getVisibility());
    assertEquals("on1", p.getOrcidBio().getPersonalDetails().getOtherNames().getOtherName().get(0).getContent());
    assertEquals(Visibility.PUBLIC, p.getOrcidBio().getPersonalDetails().getOtherNames().getVisibility());
    assertEquals("kw1", p.getOrcidBio().getKeywords().getKeyword().get(0).getContent());
    assertEquals(Visibility.PUBLIC, p.getOrcidBio().getKeywords().getVisibility());
    assertEquals(new Url("http://rurl2.com"), p.getOrcidBio().getResearcherUrls().getResearcherUrl().get(0).getUrl());
    assertEquals(Visibility.PUBLIC, p.getOrcidBio().getResearcherUrls().getVisibility());
// now test what happens if we add a new one.
}
Also used : Keywords(org.orcid.jaxb.model.message.Keywords) OrcidBio(org.orcid.jaxb.model.message.OrcidBio) ExternalIdReference(org.orcid.jaxb.model.message.ExternalIdReference) Keyword(org.orcid.jaxb.model.message.Keyword) WorkExternalIdentifier(org.orcid.jaxb.model.message.WorkExternalIdentifier) ExternalIdentifier(org.orcid.jaxb.model.message.ExternalIdentifier) FundingExternalIdentifier(org.orcid.jaxb.model.message.FundingExternalIdentifier) OtherNames(org.orcid.jaxb.model.message.OtherNames) CreditName(org.orcid.jaxb.model.message.CreditName) PersonalDetails(org.orcid.jaxb.model.message.PersonalDetails) ExternalIdUrl(org.orcid.jaxb.model.message.ExternalIdUrl) Url(org.orcid.jaxb.model.message.Url) ResearcherUrl(org.orcid.jaxb.model.message.ResearcherUrl) OrcidProfile(org.orcid.jaxb.model.message.OrcidProfile) ExternalIdCommonName(org.orcid.jaxb.model.message.ExternalIdCommonName) OrcidIdentifier(org.orcid.jaxb.model.message.OrcidIdentifier) GivenNames(org.orcid.jaxb.model.message.GivenNames) OrcidMessage(org.orcid.jaxb.model.message.OrcidMessage) ResearcherUrls(org.orcid.jaxb.model.message.ResearcherUrls) ResearcherUrl(org.orcid.jaxb.model.message.ResearcherUrl) WorkExternalIdentifiers(org.orcid.jaxb.model.message.WorkExternalIdentifiers) FundingExternalIdentifiers(org.orcid.jaxb.model.message.FundingExternalIdentifiers) ExternalIdentifiers(org.orcid.jaxb.model.message.ExternalIdentifiers) DBUnitTest(org.orcid.test.DBUnitTest) Test(org.junit.Test)

Example 22 with ExternalIdentifiers

use of org.orcid.jaxb.model.message.ExternalIdentifiers in project ORCID-Source by ORCID.

the class Api12MembersTest method addExternalIdentifiersTest.

@Test
public void addExternalIdentifiersTest() throws InterruptedException, JSONException {
    String clientId = getClient1ClientId();
    String clientRedirectUri = getClient1RedirectUri();
    String clientSecret = getClient1ClientSecret();
    String userId = getUser1OrcidId();
    String password = getUser1Password();
    String accessToken = getAccessToken(userId, password, Arrays.asList("/person/update", "/orcid-bio/read-limited"), clientId, clientSecret, clientRedirectUri, true);
    // Check the current record and get the num of existing ext ids
    ClientResponse response = t2OAuthClient_1_2.viewBioDetailsXml(userId, accessToken);
    assertNotNull(response);
    assertEquals(200, response.getStatus());
    OrcidMessage orcidMessageWithExtIds = response.getEntity(OrcidMessage.class);
    assertNotNull(orcidMessageWithExtIds);
    assertNotNull(orcidMessageWithExtIds.getOrcidProfile());
    assertNotNull(orcidMessageWithExtIds.getOrcidProfile().getOrcidBio());
    int initialNumberOfExtIds = 0;
    if (orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers() != null && orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers().getExternalIdentifier() != null) {
        initialNumberOfExtIds = orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers().getExternalIdentifier().size();
    }
    OrcidMessage orcidMessage = new OrcidMessage();
    orcidMessage.setMessageVersion(OrcidMessage.DEFAULT_VERSION);
    OrcidProfile orcidProfile = new OrcidProfile();
    OrcidBio orcidBio = new OrcidBio();
    ExternalIdentifier extId = new ExternalIdentifier();
    Long time = System.currentTimeMillis();
    String commonName = "ext-id-common-name-" + time;
    String idReference = "ext-id-reference-" + time;
    extId.setExternalIdCommonName(new ExternalIdCommonName(commonName));
    extId.setExternalIdReference(new ExternalIdReference(idReference));
    ExternalIdentifiers extIds = new ExternalIdentifiers();
    extIds.getExternalIdentifier().add(extId);
    orcidBio.setExternalIdentifiers(extIds);
    orcidProfile.setOrcidBio(orcidBio);
    orcidMessage.setOrcidProfile(orcidProfile);
    ClientResponse clientResponse = t2OAuthClient_1_2.addExternalIdentifiersXml(userId, orcidMessage, accessToken);
    assertEquals(200, clientResponse.getStatus());
    response = t2OAuthClient_1_2.viewBioDetailsXml(userId, accessToken);
    assertNotNull(response);
    assertEquals(200, response.getStatus());
    orcidMessageWithExtIds = response.getEntity(OrcidMessage.class);
    assertNotNull(orcidMessageWithExtIds);
    assertNotNull(orcidMessageWithExtIds.getOrcidProfile());
    assertNotNull(orcidMessageWithExtIds.getOrcidProfile().getOrcidBio());
    assertNotNull(orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers());
    boolean found = false;
    for (ExternalIdentifier newExtId : orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers().getExternalIdentifier()) {
        if (commonName.equals(newExtId.getExternalIdCommonName().getContent())) {
            assertEquals(idReference, newExtId.getExternalIdReference().getContent());
            found = true;
        }
    }
    assertTrue(found);
    // Try to add a duplicate
    long initialSize = orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers().getExternalIdentifier().size();
    ExternalIdentifier dupExtId = new ExternalIdentifier();
    dupExtId.setExternalIdCommonName(new ExternalIdCommonName(commonName));
    dupExtId.setExternalIdReference(new ExternalIdReference(idReference));
    orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers().getExternalIdentifier().add(dupExtId);
    assertEquals(initialSize + 1, orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers().getExternalIdentifier().size());
    clientResponse = t2OAuthClient_1_2.addExternalIdentifiersXml(userId, orcidMessageWithExtIds, accessToken);
    assertEquals(200, clientResponse.getStatus());
    response = t2OAuthClient_1_2.viewBioDetailsXml(userId, accessToken);
    assertNotNull(response);
    assertEquals(200, response.getStatus());
    orcidMessageWithExtIds = response.getEntity(OrcidMessage.class);
    assertNotNull(orcidMessageWithExtIds);
    assertNotNull(orcidMessageWithExtIds.getOrcidProfile());
    assertNotNull(orcidMessageWithExtIds.getOrcidProfile().getOrcidBio());
    assertNotNull(orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers());
    assertEquals(initialSize, orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers().getExternalIdentifier().size());
    found = false;
    for (ExternalIdentifier newExtId : orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers().getExternalIdentifier()) {
        if (commonName.equals(newExtId.getExternalIdCommonName().getContent())) {
            assertEquals(idReference, newExtId.getExternalIdReference().getContent());
            found = true;
        }
    }
    assertTrue(found);
    // Add a new one and the duplicate again, verify only the new one was added
    String newExtIdValue = "new-ext-id-" + System.currentTimeMillis();
    ExternalIdentifier newExtId = new ExternalIdentifier();
    newExtId.setExternalIdCommonName(new ExternalIdCommonName(newExtIdValue));
    newExtId.setExternalIdReference(new ExternalIdReference(newExtIdValue));
    orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers().getExternalIdentifier().add(dupExtId);
    orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers().getExternalIdentifier().add(newExtId);
    assertEquals(initialSize + 2, orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers().getExternalIdentifier().size());
    clientResponse = t2OAuthClient_1_2.addExternalIdentifiersXml(userId, orcidMessageWithExtIds, accessToken);
    assertEquals(200, clientResponse.getStatus());
    response = t2OAuthClient_1_2.viewBioDetailsXml(userId, accessToken);
    assertNotNull(response);
    assertEquals(200, response.getStatus());
    orcidMessageWithExtIds = response.getEntity(OrcidMessage.class);
    assertNotNull(orcidMessageWithExtIds);
    assertNotNull(orcidMessageWithExtIds.getOrcidProfile());
    assertNotNull(orcidMessageWithExtIds.getOrcidProfile().getOrcidBio());
    assertNotNull(orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers());
    assertEquals(initialSize + 1, orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers().getExternalIdentifier().size());
    boolean foundOld = false;
    boolean foundNew = false;
    for (ExternalIdentifier element : orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers().getExternalIdentifier()) {
        if (commonName.equals(element.getExternalIdCommonName().getContent())) {
            assertEquals(idReference, element.getExternalIdReference().getContent());
            foundOld = true;
        } else if (newExtIdValue.equals(element.getExternalIdCommonName().getContent())) {
            assertEquals(newExtIdValue, element.getExternalIdReference().getContent());
            foundNew = true;
        }
    }
    assertTrue(foundOld);
    assertTrue(foundNew);
    // Delete both ext ids
    response = t2OAuthClient_1_2.viewBioDetailsXml(userId, accessToken);
    assertNotNull(response);
    assertEquals(200, response.getStatus());
    orcidMessageWithExtIds = response.getEntity(OrcidMessage.class);
    Iterator<ExternalIdentifier> it = orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers().getExternalIdentifier().iterator();
    while (it.hasNext()) {
        ExternalIdentifier element = it.next();
        if (commonName.equals(element.getExternalIdCommonName().getContent()) || newExtIdValue.equals(element.getExternalIdCommonName().getContent())) {
            it.remove();
        }
    }
    clientResponse = t2OAuthClient_1_2.addExternalIdentifiersXml(userId, orcidMessageWithExtIds, accessToken);
    assertEquals(200, clientResponse.getStatus());
    response = t2OAuthClient_1_2.viewBioDetailsXml(userId, accessToken);
    assertNotNull(response);
    assertEquals(200, response.getStatus());
    // It should have the same number of ext ids as before the test
    assertEquals(initialNumberOfExtIds, orcidMessageWithExtIds.getOrcidProfile().getOrcidBio().getExternalIdentifiers().getExternalIdentifier().size());
}
Also used : ClientResponse(com.sun.jersey.api.client.ClientResponse) OrcidBio(org.orcid.jaxb.model.message.OrcidBio) ExternalIdReference(org.orcid.jaxb.model.message.ExternalIdReference) ExternalIdentifier(org.orcid.jaxb.model.message.ExternalIdentifier) OrcidProfile(org.orcid.jaxb.model.message.OrcidProfile) ExternalIdCommonName(org.orcid.jaxb.model.message.ExternalIdCommonName) OrcidMessage(org.orcid.jaxb.model.message.OrcidMessage) ExternalIdentifiers(org.orcid.jaxb.model.message.ExternalIdentifiers) Test(org.junit.Test)

Aggregations

ExternalIdentifiers (org.orcid.jaxb.model.message.ExternalIdentifiers)22 ExternalIdentifier (org.orcid.jaxb.model.message.ExternalIdentifier)19 OrcidBio (org.orcid.jaxb.model.message.OrcidBio)16 OrcidProfile (org.orcid.jaxb.model.message.OrcidProfile)15 ExternalIdReference (org.orcid.jaxb.model.message.ExternalIdReference)13 WorkExternalIdentifier (org.orcid.jaxb.model.message.WorkExternalIdentifier)13 ExternalIdCommonName (org.orcid.jaxb.model.message.ExternalIdCommonName)11 Test (org.junit.Test)10 WorkExternalIdentifiers (org.orcid.jaxb.model.message.WorkExternalIdentifiers)10 FundingExternalIdentifier (org.orcid.jaxb.model.message.FundingExternalIdentifier)9 FundingExternalIdentifiers (org.orcid.jaxb.model.message.FundingExternalIdentifiers)9 OrcidMessage (org.orcid.jaxb.model.message.OrcidMessage)9 OtherNames (org.orcid.jaxb.model.message.OtherNames)9 ExternalIdUrl (org.orcid.jaxb.model.message.ExternalIdUrl)8 Keyword (org.orcid.jaxb.model.message.Keyword)8 Keywords (org.orcid.jaxb.model.message.Keywords)8 PersonalDetails (org.orcid.jaxb.model.message.PersonalDetails)8 ContactDetails (org.orcid.jaxb.model.message.ContactDetails)7 Email (org.orcid.jaxb.model.message.Email)7 ResearcherUrls (org.orcid.jaxb.model.message.ResearcherUrls)7