Search in sources :

Example 46 with Employment

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

the class MemberV2Test method testViewActivitiesSummaries.

@Test
public void testViewActivitiesSummaries() throws JSONException, InterruptedException, URISyntaxException {
    long time = System.currentTimeMillis();
    String accessTokenForClient1 = getAccessToken();
    String accessTokenForClient2 = getAccessToken(getUser1OrcidId(), getUser1Password(), getScopes(), getClient2ClientId(), getClient2ClientSecret(), getClient2RedirectUri());
    Education education = (Education) unmarshallFromPath("/record_2.0_rc3/samples/education-2.0_rc3.xml", Education.class);
    education.setPutCode(null);
    education.setVisibility(Visibility.PUBLIC);
    Employment employment = (Employment) unmarshallFromPath("/record_2.0_rc3/samples/employment-2.0_rc3.xml", Employment.class);
    employment.setPutCode(null);
    employment.setVisibility(Visibility.PUBLIC);
    Funding funding = (Funding) unmarshallFromPath("/record_2.0_rc3/samples/funding-2.0_rc3.xml", Funding.class);
    funding.setPutCode(null);
    funding.setVisibility(Visibility.PUBLIC);
    funding.getExternalIdentifiers().getExternalIdentifier().clear();
    ExternalID fExtId = new ExternalID();
    fExtId.setType(FundingExternalIdentifierType.GRANT_NUMBER.value());
    fExtId.setValue("Funding Id " + time);
    fExtId.setRelationship(Relationship.SELF);
    funding.getExternalIdentifiers().getExternalIdentifier().add(fExtId);
    Work work = (Work) unmarshallFromPath("/record_2.0_rc3/samples/work-2.0_rc3.xml", Work.class);
    work.setPutCode(null);
    work.setVisibility(Visibility.PUBLIC);
    work.getExternalIdentifiers().getExternalIdentifier().clear();
    ExternalID wExtId = new ExternalID();
    wExtId.setValue("Work Id " + time);
    wExtId.setType(WorkExternalIdentifierType.AGR.value());
    wExtId.setRelationship(Relationship.SELF);
    work.getExternalIdentifiers().getExternalIdentifier().add(wExtId);
    PeerReview peerReview = (PeerReview) unmarshallFromPath("/record_2.0_rc3/samples/peer-review-2.0_rc3.xml", PeerReview.class);
    peerReview.setPutCode(null);
    peerReview.setVisibility(Visibility.PUBLIC);
    peerReview.setGroupId(groupRecords.get(0).getGroupId());
    peerReview.getExternalIdentifiers().getExternalIdentifier().clear();
    ExternalID pExtId = new ExternalID();
    pExtId.setValue("Work Id " + time);
    pExtId.setType(WorkExternalIdentifierType.AGR.value());
    pExtId.setRelationship(Relationship.SELF);
    peerReview.getExternalIdentifiers().getExternalIdentifier().add(pExtId);
    ClientResponse postResponse = memberV2ApiClient.createEducationXml(this.getUser1OrcidId(), education, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    postResponse = memberV2ApiClient.createEmploymentXml(this.getUser1OrcidId(), employment, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    /**
         * Add 3 fundings 1 and 2 get grouped together 3 in another group
         * because it have different ext ids
         * **/
    // Add 1, the default funding
    postResponse = memberV2ApiClient.createFundingXml(this.getUser1OrcidId(), funding, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    funding.getTitle().getTitle().setContent("Funding # 2");
    ExternalID fExtId3 = new ExternalID();
    fExtId3.setType(FundingExternalIdentifierType.GRANT_NUMBER.value());
    fExtId3.setValue("extId3Value" + time);
    fExtId3.setRelationship(Relationship.SELF);
    funding.getExternalIdentifiers().getExternalIdentifier().add(fExtId3);
    // Add 2, with the same ext ids +1
    postResponse = memberV2ApiClient.createFundingXml(this.getUser1OrcidId(), funding, accessTokenForClient2);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    funding.getTitle().getTitle().setContent("Funding # 3");
    ExternalID fExtId4 = new ExternalID();
    fExtId4.setType(FundingExternalIdentifierType.GRANT_NUMBER.value());
    fExtId4.setValue("extId4Value" + time);
    fExtId4.setRelationship(Relationship.SELF);
    funding.getExternalIdentifiers().getExternalIdentifier().clear();
    funding.getExternalIdentifiers().getExternalIdentifier().add(fExtId4);
    // Add 3, with different ext ids
    postResponse = memberV2ApiClient.createFundingXml(this.getUser1OrcidId(), funding, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    /**
         * Add 3 works 1 and 2 get grouped together 3 in another group because
         * it have different ext ids 
         **/
    // Add 1, the default work
    postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    work.getWorkTitle().getTitle().setContent("Work # 2");
    ExternalID wExtId2 = new ExternalID();
    wExtId2.setType(WorkExternalIdentifierType.DOI.value());
    wExtId2.setValue("doi-ext-id" + time);
    wExtId2.setRelationship(Relationship.SELF);
    work.getExternalIdentifiers().getExternalIdentifier().add(wExtId2);
    // Add 2, with the same ext ids +1
    postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work, accessTokenForClient2);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    work.getWorkTitle().getTitle().setContent("Work # 3");
    ExternalID wExtId3 = new ExternalID();
    wExtId3.setType(WorkExternalIdentifierType.EID.value());
    wExtId3.setValue("eid-ext-id" + time);
    wExtId3.setRelationship(Relationship.SELF);
    work.getWorkExternalIdentifiers().getExternalIdentifier().clear();
    work.getWorkExternalIdentifiers().getExternalIdentifier().add(wExtId3);
    // Add 3, with different ext ids
    postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    /**
         * Add 4 peer reviews 1 and 2 get grouped together 3 in another group because
         * it have different group id 4 in another group because it doesnt have
         * any group id
         **/
    // Add 1, the default peer review
    postResponse = memberV2ApiClient.createPeerReviewXml(this.getUser1OrcidId(), peerReview, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    peerReview.setGroupId(groupRecords.get(0).getGroupId());
    peerReview.getSubjectName().getTitle().setContent("PeerReview # 2");
    peerReview.getCompletionDate().setDay(new Day(2));
    peerReview.getCompletionDate().setMonth(new Month(2));
    peerReview.getCompletionDate().setYear(new Year(2016));
    peerReview.setUrl(new Url("http://peer_review/2"));
    ExternalID pExtId2 = new ExternalID();
    pExtId2.setType(WorkExternalIdentifierType.DOI.value());
    pExtId2.setValue("doi-ext-id" + System.currentTimeMillis());
    pExtId2.setRelationship(Relationship.SELF);
    for (ExternalID wei : peerReview.getExternalIdentifiers().getExternalIdentifier()) {
        wei.setValue(wei.getValue() + System.currentTimeMillis());
    }
    peerReview.getExternalIdentifiers().getExternalIdentifier().add(pExtId2);
    // Add 2, with the same ext ids +1
    postResponse = memberV2ApiClient.createPeerReviewXml(this.getUser1OrcidId(), peerReview, accessTokenForClient2);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    peerReview.setGroupId(groupRecords.get(1).getGroupId());
    peerReview.getSubjectName().getTitle().setContent("PeerReview # 3");
    peerReview.getCompletionDate().setDay(new Day(3));
    peerReview.getCompletionDate().setMonth(new Month(3));
    peerReview.getCompletionDate().setYear(new Year(2017));
    peerReview.setUrl(new Url("http://peer_review/3"));
    ExternalID pExtId3 = new ExternalID();
    pExtId3.setType(WorkExternalIdentifierType.EID.value());
    pExtId3.setValue("eid-ext-id" + System.currentTimeMillis());
    pExtId3.setRelationship(Relationship.SELF);
    peerReview.getExternalIdentifiers().getExternalIdentifier().clear();
    peerReview.getExternalIdentifiers().getExternalIdentifier().add(pExtId3);
    // Add 3, with different ext ids
    postResponse = memberV2ApiClient.createPeerReviewXml(this.getUser1OrcidId(), peerReview, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    peerReview.setGroupId(groupRecords.get(0).getGroupId());
    peerReview.getSubjectName().getTitle().setContent("PeerReview # 4");
    peerReview.getCompletionDate().setDay(new Day(4));
    peerReview.getCompletionDate().setMonth(new Month(4));
    peerReview.getCompletionDate().setYear(new Year(2018));
    peerReview.setUrl(new Url("http://peer_review/4"));
    ExternalID pExtId4 = new ExternalID();
    pExtId4.setType(WorkExternalIdentifierType.EID.value());
    pExtId4.setValue("eid-ext-id" + System.currentTimeMillis());
    pExtId4.setRelationship(Relationship.SELF);
    peerReview.getExternalIdentifiers().getExternalIdentifier().clear();
    peerReview.getExternalIdentifiers().getExternalIdentifier().add(pExtId4);
    // Add 4, without ext ids
    postResponse = memberV2ApiClient.createPeerReviewXml(this.getUser1OrcidId(), peerReview, accessTokenForClient1);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    /**
         * Now, get the summaries and verify the following: - Education summary
         * is complete - Employment summary is complete - There are 3 groups of
         * fundings -- One group with 2 fundings -- One group with one funding
         * with ext ids -- One group with one funding without ext ids
         * 
         * - There are 3 groups of works -- One group with 2 works -- One group
         * with one work with ext ids -- One group with one work without ext ids
         * 
         * peer review -- There are 3 groups of peer reviews -- One group with 2 
         * peer reviews -- One groups with one peer review and ext ids -- One 
         * group with one peer review but without ext ids 
         **/
    ClientResponse activitiesResponse = memberV2ApiClient.viewActivities(this.getUser1OrcidId(), accessTokenForClient1);
    assertEquals(Response.Status.OK.getStatusCode(), activitiesResponse.getStatus());
    ActivitiesSummary activities = activitiesResponse.getEntity(ActivitiesSummary.class);
    assertNotNull(activities);
    assertFalse(activities.getEducations().getSummaries().isEmpty());
    boolean found = false;
    Long educationPutCode = null;
    for (EducationSummary summary : activities.getEducations().getSummaries()) {
        if (summary.getRoleTitle() != null && summary.getRoleTitle().equals("education:role-title")) {
            assertEquals("education:department-name", summary.getDepartmentName());
            assertEquals(FuzzyDate.valueOf(1848, 2, 2), summary.getStartDate());
            assertEquals(FuzzyDate.valueOf(1848, 2, 2), summary.getEndDate());
            educationPutCode = summary.getPutCode();
            found = true;
            break;
        }
    }
    assertTrue("Education not found", found);
    assertFalse(activities.getEmployments().getSummaries().isEmpty());
    found = false;
    Long employmentPutCode = null;
    List<Long> fundingPutCodes = new ArrayList<Long>();
    for (EmploymentSummary summary : activities.getEmployments().getSummaries()) {
        if (summary.getRoleTitle() != null && summary.getRoleTitle().equals("employment:role-title")) {
            assertEquals("employment:department-name", summary.getDepartmentName());
            assertEquals(FuzzyDate.valueOf(1848, 2, 2), summary.getStartDate());
            assertEquals(FuzzyDate.valueOf(1848, 2, 2), summary.getEndDate());
            employmentPutCode = summary.getPutCode();
            found = true;
            break;
        }
    }
    assertTrue("Employment not found", found);
    assertNotNull(activities.getFundings());
    boolean found1 = false, found2 = false, found3 = false, found4 = false;
    for (FundingGroup group : activities.getFundings().getFundingGroup()) {
        for (FundingSummary summary : group.getFundingSummary()) {
            if (summary.getTitle().getTitle().getContent().equals("common:title")) {
                found1 = true;
                fundingPutCodes.add(summary.getPutCode());
            } else if (summary.getTitle().getTitle().getContent().equals("Funding # 2")) {
                found2 = true;
                fundingPutCodes.add(summary.getPutCode());
            } else if (summary.getTitle().getTitle().getContent().equals("Funding # 3")) {
                found3 = true;
                fundingPutCodes.add(summary.getPutCode());
            }
        }
    }
    assertTrue("One of the fundings was not found: 1(" + found1 + ") 2(" + found2 + ") 3(" + found3 + ")", found1 == found2 == found3 == true);
    assertNotNull(activities.getWorks());
    found1 = found2 = found3 = false;
    List<Long> worksPutCodes = new ArrayList<Long>();
    for (WorkGroup group : activities.getWorks().getWorkGroup()) {
        for (WorkSummary summary : group.getWorkSummary()) {
            if (summary.getTitle().getTitle().getContent().equals("common:title")) {
                found1 = true;
                worksPutCodes.add(summary.getPutCode());
            } else if (summary.getTitle().getTitle().getContent().equals("Work # 2")) {
                found2 = true;
                worksPutCodes.add(summary.getPutCode());
            } else if (summary.getTitle().getTitle().getContent().equals("Work # 3")) {
                found3 = true;
                worksPutCodes.add(summary.getPutCode());
            } else {
                fail("Couldnt find work with title: " + summary.getTitle().getTitle().getContent());
            }
        }
    }
    assertTrue("One of the works was not found: 1(" + found1 + ") 2(" + found2 + ") 3(" + found3 + ")", found1 == found2 == found3 == true);
    assertNotNull(activities.getPeerReviews());
    found1 = found2 = found3 = found4 = false;
    List<Long> peerReviewPutCodes = new ArrayList<Long>();
    for (PeerReviewGroup group : activities.getPeerReviews().getPeerReviewGroup()) {
        for (PeerReviewSummary summary : group.getPeerReviewSummary()) {
            if (summary.getCompletionDate() != null && summary.getCompletionDate().getYear() != null) {
                if (summary.getCompletionDate().getYear().getValue().equals("1848")) {
                    found1 = true;
                    peerReviewPutCodes.add(summary.getPutCode());
                } else if (summary.getCompletionDate().getYear().getValue().equals("2016")) {
                    found2 = true;
                    peerReviewPutCodes.add(summary.getPutCode());
                } else if (summary.getCompletionDate().getYear().getValue().equals("2017")) {
                    found3 = true;
                    peerReviewPutCodes.add(summary.getPutCode());
                } else if (summary.getCompletionDate().getYear().getValue().equals("2018")) {
                    found4 = true;
                    peerReviewPutCodes.add(summary.getPutCode());
                }
            }
        }
    }
    assertTrue("One of the peer reviews was not found: 1(" + found1 + ") 2(" + found2 + ") 3(" + found3 + ") 4(" + found4 + ")", found1 == found2 == found3 == found4 == true);
    //Delete all created elements
    ClientResponse deleteResponse = memberV2ApiClient.deleteEmploymentXml(this.getUser1OrcidId(), employmentPutCode, accessTokenForClient1);
    assertNotNull(deleteResponse);
    assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
    deleteResponse = memberV2ApiClient.deleteEducationXml(this.getUser1OrcidId(), educationPutCode, accessTokenForClient1);
    assertNotNull(deleteResponse);
    assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
    for (Long putCode : fundingPutCodes) {
        deleteResponse = memberV2ApiClient.deleteFundingXml(this.getUser1OrcidId(), putCode, accessTokenForClient1);
        assertNotNull(deleteResponse);
        if (Response.Status.NO_CONTENT.getStatusCode() != deleteResponse.getStatus()) {
            //It belongs to client2, so, delete it with client2 token
            deleteResponse = memberV2ApiClient.deleteFundingXml(this.getUser1OrcidId(), putCode, accessTokenForClient2);
            assertNotNull(deleteResponse);
            assertEquals("Unable to delete funding " + putCode, Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
        }
    }
    for (Long putCode : worksPutCodes) {
        deleteResponse = memberV2ApiClient.deleteWorkXml(this.getUser1OrcidId(), putCode, accessTokenForClient1);
        assertNotNull(deleteResponse);
        if (Response.Status.NO_CONTENT.getStatusCode() != deleteResponse.getStatus()) {
            //It belongs to client2, so, delete it with client2 token
            deleteResponse = memberV2ApiClient.deleteWorkXml(this.getUser1OrcidId(), putCode, accessTokenForClient2);
            assertNotNull(deleteResponse);
            assertEquals("Unable to delete work " + putCode, Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
        }
    }
    for (Long putCode : peerReviewPutCodes) {
        deleteResponse = memberV2ApiClient.deletePeerReviewXml(this.getUser1OrcidId(), putCode, accessTokenForClient1);
        assertNotNull(deleteResponse);
        if (Response.Status.NO_CONTENT.getStatusCode() != deleteResponse.getStatus()) {
            //It belongs to client2, so, delete it with client2 token
            deleteResponse = memberV2ApiClient.deletePeerReviewXml(this.getUser1OrcidId(), putCode, accessTokenForClient2);
            assertNotNull(deleteResponse);
            assertEquals("Unable to delete peer review " + putCode, Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
        }
    }
}
Also used : ClientResponse(com.sun.jersey.api.client.ClientResponse) Funding(org.orcid.jaxb.model.record_rc3.Funding) ExternalID(org.orcid.jaxb.model.record_rc3.ExternalID) ArrayList(java.util.ArrayList) Url(org.orcid.jaxb.model.common_rc3.Url) ActivitiesSummary(org.orcid.jaxb.model.record.summary_rc3.ActivitiesSummary) Month(org.orcid.jaxb.model.common_rc3.Month) WorkGroup(org.orcid.jaxb.model.record.summary_rc3.WorkGroup) WorkSummary(org.orcid.jaxb.model.record.summary_rc3.WorkSummary) Education(org.orcid.jaxb.model.record_rc3.Education) Employment(org.orcid.jaxb.model.record_rc3.Employment) Work(org.orcid.jaxb.model.record_rc3.Work) FundingSummary(org.orcid.jaxb.model.record.summary_rc3.FundingSummary) PeerReviewGroup(org.orcid.jaxb.model.record.summary_rc3.PeerReviewGroup) FundingGroup(org.orcid.jaxb.model.record.summary_rc3.FundingGroup) Year(org.orcid.jaxb.model.common_rc3.Year) EducationSummary(org.orcid.jaxb.model.record.summary_rc3.EducationSummary) PeerReviewSummary(org.orcid.jaxb.model.record.summary_rc3.PeerReviewSummary) EmploymentSummary(org.orcid.jaxb.model.record.summary_rc3.EmploymentSummary) Day(org.orcid.jaxb.model.common_rc3.Day) PeerReview(org.orcid.jaxb.model.record_rc3.PeerReview) Test(org.junit.Test)

Example 47 with Employment

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

the class MemberV2Test method testUpdateEmploymentWithProfileCreationTokenWhenClaimedAndNotSource.

@Test
public void testUpdateEmploymentWithProfileCreationTokenWhenClaimedAndNotSource() throws JSONException, InterruptedException, URISyntaxException {
    Employment employment = (Employment) unmarshallFromPath("/record_2.0_rc2/samples/employment-2.0_rc2.xml", Employment.class);
    employment.setPutCode(null);
    employment.setVisibility(Visibility.PUBLIC);
    String accessToken = getAccessToken();
    ClientResponse postResponse = memberV2ApiClient.createEmploymentXml(this.getUser1OrcidId(), employment, accessToken);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    String locationPath = postResponse.getLocation().getPath();
    assertTrue("Location header path should match pattern, but was " + locationPath, locationPath.matches(".*/v2.0_rc2/" + this.getUser1OrcidId() + "/employment/\\d+"));
    ClientResponse getResponse = memberV2ApiClient.viewLocationXml(postResponse.getLocation(), accessToken);
    assertEquals(Response.Status.OK.getStatusCode(), getResponse.getStatus());
    Employment gotEmployment = getResponse.getEntity(Employment.class);
    assertEquals("employment:department-name", gotEmployment.getDepartmentName());
    assertEquals("employment:role-title", gotEmployment.getRoleTitle());
    gotEmployment.setDepartmentName("updated dept. name");
    gotEmployment.setRoleTitle("updated role title");
    String profileCreateToken = oauthHelper.getClientCredentialsAccessToken(this.getClient2ClientId(), this.getClient2ClientSecret(), ScopePathType.ORCID_PROFILE_CREATE);
    ClientResponse putResponse = memberV2ApiClient.updateLocationXml(postResponse.getLocation(), profileCreateToken, gotEmployment);
    assertEquals(Response.Status.FORBIDDEN.getStatusCode(), putResponse.getStatus());
    ClientResponse getAfterUpdateResponse = memberV2ApiClient.viewLocationXml(postResponse.getLocation(), accessToken);
    assertEquals(Response.Status.OK.getStatusCode(), getAfterUpdateResponse.getStatus());
    Employment gotAfterUpdateEmployment = getAfterUpdateResponse.getEntity(Employment.class);
    assertEquals("employment:department-name", gotAfterUpdateEmployment.getDepartmentName());
    assertEquals("employment:role-title", gotAfterUpdateEmployment.getRoleTitle());
    ClientResponse deleteResponse = memberV2ApiClient.deleteEmploymentXml(this.getUser1OrcidId(), gotEmployment.getPutCode(), accessToken);
    assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
}
Also used : ClientResponse(com.sun.jersey.api.client.ClientResponse) Employment(org.orcid.jaxb.model.record_rc2.Employment) Test(org.junit.Test)

Example 48 with Employment

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

the class PublicV2Test method createActivities.

private void createActivities() throws JSONException, InterruptedException, URISyntaxException {
    String accessToken = getAccessToken();
    long time = System.currentTimeMillis();
    Work workToCreate = (Work) unmarshallFromPath("/record_2.0_rc1/samples/work-2.0_rc1.xml", Work.class);
    for (int i = 0; i < 4; i++) {
        workToCreate.setPutCode(null);
        workToCreate.getWorkTitle().getTitle().setContent("Work # " + i);
        workToCreate.getExternalIdentifiers().getExternalIdentifier().clear();
        WorkExternalIdentifier wExtId = new WorkExternalIdentifier();
        wExtId.setWorkExternalIdentifierId(new WorkExternalIdentifierId(time + " Work Id " + i));
        wExtId.setWorkExternalIdentifierType(WorkExternalIdentifierType.AGR);
        wExtId.setRelationship(Relationship.SELF);
        workToCreate.getExternalIdentifiers().getExternalIdentifier().add(wExtId);
        if (i == 0 || i == 3)
            workToCreate.setVisibility(org.orcid.jaxb.model.common_rc1.Visibility.PUBLIC);
        else if (i == 1)
            workToCreate.setVisibility(org.orcid.jaxb.model.common_rc1.Visibility.LIMITED);
        else
            workToCreate.setVisibility(org.orcid.jaxb.model.common_rc1.Visibility.PRIVATE);
        ClientResponse postResponse = memberV2ApiClient.createWorkXml(getUser1OrcidId(), workToCreate, accessToken);
        assertNotNull(postResponse);
        assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    }
    Funding fundingToCreate = (Funding) unmarshallFromPath("/record_2.0_rc1/samples/funding-2.0_rc1.xml", Funding.class);
    for (int i = 0; i < 4; i++) {
        fundingToCreate.setPutCode(null);
        fundingToCreate.getTitle().getTitle().setContent("Funding # " + i);
        fundingToCreate.getExternalIdentifiers().getExternalIdentifier().clear();
        FundingExternalIdentifier fExtId = new FundingExternalIdentifier();
        fExtId.setType(FundingExternalIdentifierType.GRANT_NUMBER);
        fExtId.setValue(time + " funding Id " + i);
        fExtId.setRelationship(Relationship.SELF);
        fundingToCreate.getExternalIdentifiers().getExternalIdentifier().add(fExtId);
        if (i == 0 || i == 3)
            fundingToCreate.setVisibility(org.orcid.jaxb.model.common_rc1.Visibility.PUBLIC);
        else if (i == 1)
            fundingToCreate.setVisibility(org.orcid.jaxb.model.common_rc1.Visibility.LIMITED);
        else
            fundingToCreate.setVisibility(org.orcid.jaxb.model.common_rc1.Visibility.PRIVATE);
        ClientResponse postResponse = memberV2ApiClient.createFundingXml(getUser1OrcidId(), fundingToCreate, accessToken);
        assertNotNull(postResponse);
        assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    }
    Employment employmentToCreate = (Employment) unmarshallFromPath("/record_2.0_rc1/samples/employment-2.0_rc1.xml", Employment.class);
    for (int i = 0; i < 4; i++) {
        employmentToCreate.setPutCode(null);
        employmentToCreate.setRoleTitle("Employment # " + i);
        if (i == 0 || i == 3)
            employmentToCreate.setVisibility(org.orcid.jaxb.model.common_rc1.Visibility.PUBLIC);
        else if (i == 1)
            employmentToCreate.setVisibility(org.orcid.jaxb.model.common_rc1.Visibility.LIMITED);
        else
            employmentToCreate.setVisibility(org.orcid.jaxb.model.common_rc1.Visibility.PRIVATE);
        ClientResponse postResponse = memberV2ApiClient.createEmploymentXml(getUser1OrcidId(), employmentToCreate, accessToken);
        assertNotNull(postResponse);
        assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    }
    Education educationToCreate = (Education) unmarshallFromPath("/record_2.0_rc1/samples/education-2.0_rc1.xml", Education.class);
    for (int i = 0; i < 4; i++) {
        educationToCreate.setPutCode(null);
        educationToCreate.setRoleTitle("Education # " + i);
        if (i == 0 || i == 3)
            educationToCreate.setVisibility(org.orcid.jaxb.model.common_rc1.Visibility.PUBLIC);
        else if (i == 1)
            educationToCreate.setVisibility(org.orcid.jaxb.model.common_rc1.Visibility.LIMITED);
        else
            educationToCreate.setVisibility(org.orcid.jaxb.model.common_rc1.Visibility.PRIVATE);
        ClientResponse postResponse = memberV2ApiClient.createEducationXml(getUser1OrcidId(), educationToCreate, accessToken);
        assertNotNull(postResponse);
        assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    }
    PeerReview peerReviewToCreate = (PeerReview) unmarshallFromPath("/record_2.0_rc1/samples/peer-review-2.0_rc1.xml", PeerReview.class);
    for (int i = 0; i < 4; i++) {
        peerReviewToCreate.setPutCode(null);
        peerReviewToCreate.setGroupId(groupRecords.get(0).getGroupId());
        peerReviewToCreate.getSubjectName().getTitle().setContent("PeerReview # " + i);
        peerReviewToCreate.getCompletionDate().setDay(new Day(i + 1));
        peerReviewToCreate.getCompletionDate().setMonth(new Month(i + 1));
        peerReviewToCreate.getCompletionDate().setYear(new Year((i + 1) * 1000));
        peerReviewToCreate.getExternalIdentifiers().getExternalIdentifier().get(0).getWorkExternalIdentifierId().setContent("extId-" + (i + 1));
        if (i == 0 || i == 3) {
            peerReviewToCreate.setVisibility(org.orcid.jaxb.model.common_rc1.Visibility.PUBLIC);
        } else if (i == 1) {
            peerReviewToCreate.setVisibility(org.orcid.jaxb.model.common_rc1.Visibility.LIMITED);
        } else {
            peerReviewToCreate.setVisibility(org.orcid.jaxb.model.common_rc1.Visibility.PRIVATE);
        }
        ClientResponse postResponse = memberV2ApiClient.createPeerReviewXml(getUser1OrcidId(), peerReviewToCreate, accessToken);
        assertNotNull(postResponse);
        assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    }
}
Also used : ClientResponse(com.sun.jersey.api.client.ClientResponse) Funding(org.orcid.jaxb.model.record_rc1.Funding) WorkExternalIdentifierId(org.orcid.jaxb.model.record_rc1.WorkExternalIdentifierId) FundingExternalIdentifier(org.orcid.jaxb.model.record_rc1.FundingExternalIdentifier) Month(org.orcid.jaxb.model.common_rc1.Month) Year(org.orcid.jaxb.model.common_rc1.Year) Employment(org.orcid.jaxb.model.record_rc1.Employment) Education(org.orcid.jaxb.model.record_rc1.Education) Work(org.orcid.jaxb.model.record_rc1.Work) WorkExternalIdentifier(org.orcid.jaxb.model.record_rc1.WorkExternalIdentifier) Day(org.orcid.jaxb.model.common_rc1.Day) PeerReview(org.orcid.jaxb.model.record_rc1.PeerReview)

Example 49 with Employment

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

the class PublicV2Test method checkEmployment.

public void checkEmployment(String readPublicToken) throws JSONException, InterruptedException, URISyntaxException {
    Employment employmentToCreate = (Employment) unmarshallFromPath("/record_2.0_rc1/samples/employment-2.0_rc1.xml", Employment.class);
    employmentToCreate.setPutCode(null);
    employmentToCreate.setVisibility(org.orcid.jaxb.model.common_rc1.Visibility.PUBLIC);
    String accessToken = getAccessToken();
    ClientResponse postResponse = memberV2ApiClient.createEmploymentXml(getUser1OrcidId(), employmentToCreate, accessToken);
    assertNotNull(postResponse);
    assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
    String path = postResponse.getLocation().getPath();
    String putCode = path.substring(path.lastIndexOf('/') + 1, path.length());
    ClientResponse getEmploymentResponse = null;
    if (readPublicToken != null) {
        getEmploymentResponse = publicV2ApiClient.viewEmploymentXml(getUser1OrcidId(), putCode, readPublicToken);
    } else {
        getEmploymentResponse = publicV2ApiClient.viewEmploymentXml(getUser1OrcidId(), putCode);
    }
    assertNotNull(getEmploymentResponse);
    checkResponse(getEmploymentResponse);
    Employment employment = getEmploymentResponse.getEntity(Employment.class);
    assertNotNull(employment);
    assertEquals("affiliation:department-name", employment.getDepartmentName());
    ClientResponse getEmploymentSummaryResponse = null;
    if (readPublicToken != null) {
        getEmploymentSummaryResponse = publicV2ApiClient.viewEmploymentSummaryXml(getUser1OrcidId(), putCode, readPublicToken);
    } else {
        getEmploymentSummaryResponse = publicV2ApiClient.viewEmploymentSummaryXml(getUser1OrcidId(), putCode);
    }
    assertNotNull(getEmploymentSummaryResponse);
    checkResponse(getEmploymentSummaryResponse);
    EmploymentSummary summary = getEmploymentSummaryResponse.getEntity(EmploymentSummary.class);
    assertNotNull(summary);
    assertEquals("affiliation:department-name", summary.getDepartmentName());
}
Also used : ClientResponse(com.sun.jersey.api.client.ClientResponse) Employment(org.orcid.jaxb.model.record_rc1.Employment) EmploymentSummary(org.orcid.jaxb.model.record.summary_rc1.EmploymentSummary)

Example 50 with Employment

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

the class MemberV2ApiServiceDelegatorImpl method updateEmployment.

@Override
public Response updateEmployment(String orcid, Long putCode, Employment employment) {
    orcidSecurityManager.checkClientAccessAndScopes(orcid, ScopePathType.AFFILIATIONS_UPDATE);
    if (!putCode.equals(employment.getPutCode())) {
        Map<String, String> params = new HashMap<String, String>();
        params.put("urlPutCode", String.valueOf(putCode));
        params.put("bodyPutCode", String.valueOf(employment.getPutCode()));
        throw new MismatchedPutCodeException(params);
    }
    clearSource(employment);
    Employment e = affiliationsManager.updateEmploymentAffiliation(orcid, employment, true);
    sourceUtils.setSourceName(e);
    return Response.ok(e).build();
}
Also used : HashMap(java.util.HashMap) Employment(org.orcid.jaxb.model.record_v2.Employment) MismatchedPutCodeException(org.orcid.core.exception.MismatchedPutCodeException)

Aggregations

Test (org.junit.Test)43 Employment (org.orcid.jaxb.model.record_v2.Employment)38 ClientResponse (com.sun.jersey.api.client.ClientResponse)22 Response (javax.ws.rs.core.Response)14 DBUnitTest (org.orcid.test.DBUnitTest)14 Education (org.orcid.jaxb.model.record_v2.Education)10 OtherName (org.orcid.jaxb.model.record_v2.OtherName)9 ResearcherUrl (org.orcid.jaxb.model.record_v2.ResearcherUrl)9 Employment (org.orcid.jaxb.model.record_rc1.Employment)8 Funding (org.orcid.jaxb.model.record_v2.Funding)8 Work (org.orcid.jaxb.model.record_v2.Work)8 ArrayList (java.util.ArrayList)6 EmploymentSummary (org.orcid.jaxb.model.record.summary_v2.EmploymentSummary)6 Address (org.orcid.jaxb.model.record_v2.Address)6 Keyword (org.orcid.jaxb.model.record_v2.Keyword)6 PersonExternalIdentifier (org.orcid.jaxb.model.record_v2.PersonExternalIdentifier)6 ActivitiesSummary (org.orcid.jaxb.model.record.summary_v2.ActivitiesSummary)5 EducationSummary (org.orcid.jaxb.model.record.summary_v2.EducationSummary)5 FundingSummary (org.orcid.jaxb.model.record.summary_v2.FundingSummary)5 WorkSummary (org.orcid.jaxb.model.record.summary_v2.WorkSummary)5