Search in sources :

Example 6 with PersonalDetails

use of org.orcid.jaxb.model.v3.dev1.record.PersonalDetails in project ORCID-Source by ORCID.

the class PublicAPISecurityManagerV3Test method checkIsPublicPersonalDetailsTest.

@Test
public void checkIsPublicPersonalDetailsTest() {
    PersonalDetails p = getPersonalDetailsElement(Visibility.PUBLIC, Visibility.PUBLIC, Visibility.PUBLIC);
    publicAPISecurityManagerV3.filter(p);
    assertEquals(Visibility.PUBLIC, p.getName().getVisibility());
    assertEquals(Visibility.PUBLIC, p.getBiography().getVisibility());
    assertNotNull(p.getOtherNames().getOtherNames());
    p.getOtherNames().getOtherNames().forEach(e -> {
        assertIsPublic(e);
    });
    // Should not fail, but name should be empty
    p = getPersonalDetailsElement(Visibility.LIMITED, Visibility.PUBLIC, Visibility.PUBLIC);
    publicAPISecurityManagerV3.filter(p);
    assertNull(p.getName());
    assertNotNull(p.getBiography());
    assertNotNull(p.getOtherNames().getOtherNames());
    p.getOtherNames().getOtherNames().forEach(e -> {
        assertIsPublic(e);
    });
    // Should not fail, but bio should be null
    p = getPersonalDetailsElement(Visibility.PUBLIC, Visibility.LIMITED, Visibility.PUBLIC);
    publicAPISecurityManagerV3.filter(p);
    assertNotNull(p.getName());
    assertNull(p.getBiography());
    assertNotNull(p.getOtherNames().getOtherNames());
    p.getOtherNames().getOtherNames().forEach(e -> {
        assertIsPublic(e);
    });
    p = getPersonalDetailsElement(Visibility.PUBLIC, Visibility.PUBLIC, Visibility.LIMITED);
    publicAPISecurityManagerV3.filter(p);
    assertNotNull(p.getName());
    assertNotNull(p.getBiography());
    assertNotNull(p.getOtherNames());
    assertTrue(p.getOtherNames().getOtherNames().isEmpty());
    p = getPersonalDetailsElement(Visibility.PUBLIC, Visibility.PUBLIC, Visibility.PRIVATE);
    publicAPISecurityManagerV3.filter(p);
    assertNotNull(p.getName());
    assertNotNull(p.getBiography());
    assertNotNull(p.getOtherNames());
    assertTrue(p.getOtherNames().getOtherNames().isEmpty());
}
Also used : PersonalDetails(org.orcid.jaxb.model.v3.dev1.record.PersonalDetails) Test(org.junit.Test)

Example 7 with PersonalDetails

use of org.orcid.jaxb.model.v3.dev1.record.PersonalDetails in project ORCID-Source by ORCID.

the class PersonalDetailsManagerReadOnlyImpl method getPublicPersonalDetails.

@Override
public PersonalDetails getPublicPersonalDetails(String orcid) {
    Date lastModified = getLastModifiedDate(orcid);
    PersonalDetails personalDetails = new PersonalDetails();
    Biography bio = biographyManager.getPublicBiography(orcid);
    if (bio != null) {
        personalDetails.setBiography(bio);
    }
    Name name = recordNameManager.getRecordName(orcid);
    if (name != null && !Visibility.PUBLIC.equals(name.getVisibility())) {
        personalDetails.setName(null);
    } else {
        personalDetails.setName(name);
    }
    OtherNames otherNames = otherNameManager.getPublicOtherNames(orcid);
    OtherNames filteredOtherNames = new OtherNames();
    personalDetails.setOtherNames(filteredOtherNames);
    if (otherNames != null && otherNames.getOtherNames() != null && !otherNames.getOtherNames().isEmpty()) {
        // Lets copy the list so we don't modify the cached collection
        List<OtherName> filteredList = new ArrayList<OtherName>(otherNames.getOtherNames());
        filteredOtherNames.setOtherNames(filteredList);
    }
    if (personalDetails.getLastModifiedDate() == null || personalDetails.getLastModifiedDate().getValue() == null) {
        personalDetails.setLastModifiedDate(new LastModifiedDate(DateUtils.convertToXMLGregorianCalendar(lastModified)));
    }
    return personalDetails;
}
Also used : LastModifiedDate(org.orcid.jaxb.model.v3.dev1.common.LastModifiedDate) OtherNames(org.orcid.jaxb.model.v3.dev1.record.OtherNames) Biography(org.orcid.jaxb.model.v3.dev1.record.Biography) OtherName(org.orcid.jaxb.model.v3.dev1.record.OtherName) ArrayList(java.util.ArrayList) PersonalDetails(org.orcid.jaxb.model.v3.dev1.record.PersonalDetails) Date(java.util.Date) LastModifiedDate(org.orcid.jaxb.model.v3.dev1.common.LastModifiedDate) OtherName(org.orcid.jaxb.model.v3.dev1.record.OtherName) Name(org.orcid.jaxb.model.v3.dev1.record.Name)

Example 8 with PersonalDetails

use of org.orcid.jaxb.model.v3.dev1.record.PersonalDetails in project ORCID-Source by ORCID.

the class PersonalDetailsManagerReadOnlyImpl method getPersonalDetails.

@Override
public PersonalDetails getPersonalDetails(String orcid) {
    Date lastModified = getLastModifiedDate(orcid);
    PersonalDetails personalDetails = new PersonalDetails();
    Name name = recordNameManager.getRecordName(orcid);
    if (name != null) {
        personalDetails.setName(name);
    }
    Biography bio = biographyManager.getBiography(orcid);
    if (bio != null) {
        personalDetails.setBiography(bio);
    }
    OtherNames otherNames = otherNameManager.getOtherNames(orcid);
    OtherNames filteredOtherNames = new OtherNames();
    personalDetails.setOtherNames(filteredOtherNames);
    if (otherNames != null && otherNames.getOtherNames() != null && !otherNames.getOtherNames().isEmpty()) {
        // Lets copy the list so we don't modify the cached collection
        List<OtherName> filteredList = new ArrayList<OtherName>(otherNames.getOtherNames());
        filteredOtherNames.setOtherNames(filteredList);
    }
    if (personalDetails.getLastModifiedDate() == null || personalDetails.getLastModifiedDate().getValue() == null) {
        personalDetails.setLastModifiedDate(new LastModifiedDate(DateUtils.convertToXMLGregorianCalendar(lastModified)));
    }
    return personalDetails;
}
Also used : LastModifiedDate(org.orcid.jaxb.model.v3.dev1.common.LastModifiedDate) OtherNames(org.orcid.jaxb.model.v3.dev1.record.OtherNames) Biography(org.orcid.jaxb.model.v3.dev1.record.Biography) OtherName(org.orcid.jaxb.model.v3.dev1.record.OtherName) ArrayList(java.util.ArrayList) PersonalDetails(org.orcid.jaxb.model.v3.dev1.record.PersonalDetails) Date(java.util.Date) LastModifiedDate(org.orcid.jaxb.model.v3.dev1.common.LastModifiedDate) OtherName(org.orcid.jaxb.model.v3.dev1.record.OtherName) Name(org.orcid.jaxb.model.v3.dev1.record.Name)

Example 9 with PersonalDetails

use of org.orcid.jaxb.model.v3.dev1.record.PersonalDetails in project ORCID-Source by ORCID.

the class BlackBoxBaseV3_0_dev1 method unmarshallFromPath.

public Object unmarshallFromPath(String path, Class<?> type) {
    try (Reader reader = new InputStreamReader(getClass().getResourceAsStream(path))) {
        Object obj = unmarshall(reader, type);
        Object result = null;
        if (Address.class.equals(type)) {
            result = (Address) obj;
        } else if (Education.class.equals(type)) {
            result = (Education) obj;
        } else if (Employment.class.equals(type)) {
            result = (Employment) obj;
        } else if (Funding.class.equals(type)) {
            result = (Funding) obj;
        } else if (Keyword.class.equals(type)) {
            result = (Keyword) obj;
        } else if (Work.class.equals(type)) {
            result = (Work) obj;
        } else if (PeerReview.class.equals(type)) {
            result = (PeerReview) obj;
        } else if (ResearcherUrl.class.equals(type)) {
            result = (ResearcherUrl) obj;
        } else if (PersonalDetails.class.equals(type)) {
            result = (PersonalDetails) obj;
        } else if (OtherName.class.equals(type)) {
            result = (OtherName) obj;
        } else if (PersonExternalIdentifier.class.equals(type)) {
            result = (PersonExternalIdentifier) obj;
        } else if (Distinction.class.equals(type)) {
            result = (Distinction) obj;
        } else if (InvitedPosition.class.equals(type)) {
            result = (InvitedPosition) obj;
        } else if (Membership.class.equals(type)) {
            result = (Membership) obj;
        } else if (Qualification.class.equals(type)) {
            result = (Qualification) obj;
        } else if (Service.class.equals(type)) {
            result = (Service) obj;
        }
        return result;
    } catch (IOException e) {
        throw new RuntimeException("Error reading notification from classpath", e);
    }
}
Also used : InputStreamReader(java.io.InputStreamReader) Funding(org.orcid.jaxb.model.v3.dev1.record.Funding) OtherName(org.orcid.jaxb.model.v3.dev1.record.OtherName) Reader(java.io.Reader) InputStreamReader(java.io.InputStreamReader) Service(org.orcid.jaxb.model.v3.dev1.record.Service) T2OAuthAPIService(org.orcid.integration.blackbox.api.v12.T2OAuthAPIService) IOException(java.io.IOException) Education(org.orcid.jaxb.model.v3.dev1.record.Education) Work(org.orcid.jaxb.model.v3.dev1.record.Work) Membership(org.orcid.jaxb.model.v3.dev1.record.Membership) ResearcherUrl(org.orcid.jaxb.model.v3.dev1.record.ResearcherUrl) Distinction(org.orcid.jaxb.model.v3.dev1.record.Distinction)

Example 10 with PersonalDetails

use of org.orcid.jaxb.model.v3.dev1.record.PersonalDetails in project ORCID-Source by ORCID.

the class PersonalDetailsTest method changeToLimitedAndCheckWithPublicAPI.

@Test
public void changeToLimitedAndCheckWithPublicAPI() throws Exception {
    // Change names to limited
    showMyOrcidPage();
    changeNamesVisibility(org.orcid.jaxb.model.v3.dev1.common.Visibility.LIMITED.name());
    ClientResponse getPersonalDetailsResponse = publicV3ApiClient.viewPersonalDetailsXML(getUser1OrcidId());
    assertNotNull(getPersonalDetailsResponse);
    org.orcid.jaxb.model.v3.dev1.record.PersonalDetails personalDetails = getPersonalDetailsResponse.getEntity(org.orcid.jaxb.model.v3.dev1.record.PersonalDetails.class);
    assertNotNull(personalDetails);
    assertNull(personalDetails.getName());
    assertNotNull(personalDetails.getBiography());
    assertEquals(getUser1Bio(), personalDetails.getBiography().getContent());
    // Check other names
    assertNotNull(personalDetails.getOtherNames());
    assertNotNull(personalDetails.getOtherNames().getOtherNames());
    // all should be public
    boolean found1 = false, found2 = false;
    for (org.orcid.jaxb.model.v3.dev1.record.OtherName otherName : personalDetails.getOtherNames().getOtherNames()) {
        assertEquals(org.orcid.jaxb.model.v3.dev1.common.Visibility.PUBLIC, otherName.getVisibility());
        if (otherName.getContent().equals(otherName1)) {
            found1 = true;
        } else if (otherName.getContent().equals(otherName2)) {
            found2 = true;
        }
    }
    assertTrue("found1: " + found1 + " found2: " + found2, found1 && found2);
    // Change other names to limited
    setOtherNamesVisibility(org.orcid.jaxb.model.v3.dev1.common.Visibility.LIMITED);
    getPersonalDetailsResponse = publicV3ApiClient.viewPersonalDetailsXML(getUser1OrcidId());
    assertNotNull(getPersonalDetailsResponse);
    personalDetails = getPersonalDetailsResponse.getEntity(org.orcid.jaxb.model.v3.dev1.record.PersonalDetails.class);
    assertNotNull(personalDetails);
    assertNull(personalDetails.getName());
    assertNotNull(personalDetails.getBiography());
    assertEquals(getUser1Bio(), personalDetails.getBiography().getContent());
    assertNotNull(personalDetails.getOtherNames());
    assertTrue(personalDetails.getOtherNames().getOtherNames().isEmpty());
    // Change bio to limited
    changeBiography(null, org.orcid.jaxb.model.v3.dev1.common.Visibility.LIMITED.name());
    getPersonalDetailsResponse = publicV3ApiClient.viewPersonalDetailsXML(getUser1OrcidId());
    assertNotNull(getPersonalDetailsResponse);
    personalDetails = getPersonalDetailsResponse.getEntity(org.orcid.jaxb.model.v3.dev1.record.PersonalDetails.class);
    assertNotNull(personalDetails);
    assertNull(personalDetails.getBiography());
    assertNull(personalDetails.getName());
    assertNotNull(personalDetails.getOtherNames());
    assertTrue(personalDetails.getOtherNames().getOtherNames().isEmpty());
    // //////////////////////////
    // Rollback to public again//
    // //////////////////////////
    changeNamesVisibility(org.orcid.jaxb.model.v3.dev1.common.Visibility.PUBLIC.name());
    setOtherNamesVisibility(org.orcid.jaxb.model.v3.dev1.common.Visibility.PUBLIC);
    changeBiography(null, org.orcid.jaxb.model.v3.dev1.common.Visibility.PUBLIC.name());
}
Also used : ClientResponse(com.sun.jersey.api.client.ClientResponse) BlackBoxBaseV3_0_dev1(org.orcid.integration.blackbox.api.v3.dev1.BlackBoxBaseV3_0_dev1) Test(org.junit.Test)

Aggregations

PersonalDetails (org.orcid.jaxb.model.v3.dev1.record.PersonalDetails)32 Test (org.junit.Test)28 OtherName (org.orcid.jaxb.model.v3.dev1.record.OtherName)19 Biography (org.orcid.jaxb.model.v3.dev1.record.Biography)15 OtherNames (org.orcid.jaxb.model.v3.dev1.record.OtherNames)15 Name (org.orcid.jaxb.model.v3.dev1.record.Name)14 BaseTest (org.orcid.core.BaseTest)6 Response (javax.ws.rs.core.Response)4 DBUnitTest (org.orcid.test.DBUnitTest)4 IOException (java.io.IOException)3 ArrayList (java.util.ArrayList)3 LastModifiedDate (org.orcid.jaxb.model.v3.dev1.common.LastModifiedDate)3 ClientResponse (com.sun.jersey.api.client.ClientResponse)2 InputStreamReader (java.io.InputStreamReader)2 Reader (java.io.Reader)2 Date (java.util.Date)2 BlackBoxBaseV3_0_dev1 (org.orcid.integration.blackbox.api.v3.dev1.BlackBoxBaseV3_0_dev1)2 Address (org.orcid.jaxb.model.v3.dev1.record.Address)2 Distinction (org.orcid.jaxb.model.v3.dev1.record.Distinction)2 Education (org.orcid.jaxb.model.v3.dev1.record.Education)2