use of org.orcid.jaxb.model.record.summary_rc1.ActivitiesSummary in project ORCID-Source by ORCID.
the class WorksTest method testWorksWithPartOfRelationshipDontGetGrouped.
@Test
public void testWorksWithPartOfRelationshipDontGetGrouped() throws JSONException, InterruptedException, URISyntaxException {
long time = System.currentTimeMillis();
String accessTokenForClient1 = getAccessToken();
String accessTokenForClient2 = getAccessToken(getUser1OrcidId(), getUser1Password(), getScopes(ScopePathType.ACTIVITIES_UPDATE, ScopePathType.ACTIVITIES_READ_LIMITED), getClient2ClientId(), getClient2ClientSecret(), getClient2RedirectUri());
Work work1 = (Work) unmarshallFromPath("/record_2.0/samples/read_samples/work-2.0.xml", Work.class);
work1.setPutCode(null);
work1.setSource(null);
work1.setVisibility(Visibility.PUBLIC);
work1.getExternalIdentifiers().getExternalIdentifier().clear();
org.orcid.jaxb.model.record_v2.WorkTitle title1 = new org.orcid.jaxb.model.record_v2.WorkTitle();
title1.setTitle(new Title("Work # 1" + time));
work1.setWorkTitle(title1);
ExternalID wExtId1 = new ExternalID();
wExtId1.setValue("Work Id " + time);
wExtId1.setType(WorkExternalIdentifierType.AGR.value());
wExtId1.setRelationship(Relationship.SELF);
wExtId1.setUrl(new Url("http://orcid.org/work#1"));
work1.getExternalIdentifiers().getExternalIdentifier().clear();
work1.getExternalIdentifiers().getExternalIdentifier().add(wExtId1);
Work work2 = (Work) unmarshallFromPath("/record_2.0/samples/read_samples/work-2.0.xml", Work.class);
work2.setPutCode(null);
work2.setSource(null);
work2.setVisibility(Visibility.PUBLIC);
org.orcid.jaxb.model.record_v2.WorkTitle title2 = new org.orcid.jaxb.model.record_v2.WorkTitle();
title2.setTitle(new Title("Work # 2" + time));
work2.setWorkTitle(title2);
work2.getExternalIdentifiers().getExternalIdentifier().clear();
ExternalID wExtId2 = new ExternalID();
wExtId2.setValue("Work Id " + time);
wExtId2.setType(WorkExternalIdentifierType.AGR.value());
wExtId2.setRelationship(Relationship.PART_OF);
wExtId2.setUrl(new Url("http://orcid.org/work#2"));
work2.getExternalIdentifiers().getExternalIdentifier().clear();
work2.getExternalIdentifiers().getExternalIdentifier().add(wExtId2);
Work work3 = (Work) unmarshallFromPath("/record_2.0/samples/read_samples/work-2.0.xml", Work.class);
work3.setPutCode(null);
work3.setSource(null);
work3.setVisibility(Visibility.PUBLIC);
org.orcid.jaxb.model.record_v2.WorkTitle title3 = new org.orcid.jaxb.model.record_v2.WorkTitle();
title3.setTitle(new Title("Work # 3" + time));
work3.setWorkTitle(title3);
work3.getExternalIdentifiers().getExternalIdentifier().clear();
ExternalID wExtId3 = new ExternalID();
wExtId3.setValue("Work Id " + time);
wExtId3.setType(WorkExternalIdentifierType.AGR.value());
wExtId3.setRelationship(Relationship.SELF);
wExtId3.setUrl(new Url("http://orcid.org/work#3"));
work3.getExternalIdentifiers().getExternalIdentifier().clear();
work3.getExternalIdentifiers().getExternalIdentifier().add(wExtId3);
// Add the three works
ClientResponse postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work1, accessTokenForClient1);
assertNotNull(postResponse);
assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
Long putCode1 = getPutCodeFromResponse(postResponse);
postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work2, accessTokenForClient1);
assertNotNull(postResponse);
assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
Long putCode2 = getPutCodeFromResponse(postResponse);
postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work3, accessTokenForClient2);
assertNotNull(postResponse);
assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
Long putCode3 = getPutCodeFromResponse(postResponse);
ClientResponse activitiesResponse = memberV2ApiClient.viewActivities(this.getUser1OrcidId(), accessTokenForClient1);
assertEquals(Response.Status.OK.getStatusCode(), activitiesResponse.getStatus());
ActivitiesSummary activities = activitiesResponse.getEntity(ActivitiesSummary.class);
assertNotNull(activities);
assertFalse(activities.getWorks().getWorkGroup().isEmpty());
WorkGroup work1Group = null;
WorkGroup work2Group = null;
WorkGroup work3Group = null;
boolean work1found = false;
boolean work2found = false;
boolean work3found = false;
for (WorkGroup group : activities.getWorks().getWorkGroup()) {
if (group.getIdentifiers().getExternalIdentifier() == null || group.getIdentifiers().getExternalIdentifier().isEmpty()) {
for (WorkSummary summary : group.getWorkSummary()) {
String title = summary.getTitle().getTitle().getContent();
if (("Work # 2" + time).equals(title)) {
work2found = true;
work2Group = group;
}
}
} else {
for (ExternalID id : group.getIdentifiers().getExternalIdentifier()) {
// If it is the ID is the one we are looking for
if (id.getValue().equals("Work Id " + time)) {
for (WorkSummary summary : group.getWorkSummary()) {
String title = summary.getTitle().getTitle().getContent();
if (("Work # 1" + time).equals(title)) {
work1found = true;
work1Group = group;
} else if (("Work # 3" + time).equals(title)) {
work3found = true;
work3Group = group;
}
}
}
}
}
}
assertTrue(work1found);
assertTrue(work2found);
assertTrue(work3found);
// Check that work # 1 and Work # 3 are in the same work
assertEquals(work1Group, work3Group);
// Check that work # 2 is not in the same group than group # 1
assertThat(work2Group, not(work1Group));
// Remove all created works
ClientResponse deleteResponse = memberV2ApiClient.deleteWorkXml(this.getUser1OrcidId(), putCode1, accessTokenForClient1);
assertNotNull(deleteResponse);
assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
deleteResponse = memberV2ApiClient.deleteWorkXml(this.getUser1OrcidId(), putCode2, accessTokenForClient1);
assertNotNull(deleteResponse);
assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
deleteResponse = memberV2ApiClient.deleteWorkXml(this.getUser1OrcidId(), putCode3, accessTokenForClient2);
assertNotNull(deleteResponse);
assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
}
use of org.orcid.jaxb.model.record.summary_rc1.ActivitiesSummary in project ORCID-Source by ORCID.
the class MultipleTokensPerUserAndScopeTest method useSameScopesGetDifferentTokensTest.
@Test
public void useSameScopesGetDifferentTokensTest() throws InterruptedException, JSONException, URISyntaxException {
List<String> scopes = getScopes(ScopePathType.READ_LIMITED);
String token1 = getNonCachedAccessTokens(getUser1UserName(), getUser1Password(), scopes, getClient1ClientId(), getClient1ClientSecret(), getClient1RedirectUri());
String token2 = getNonCachedAccessTokens(getUser1UserName(), getUser1Password(), scopes, getClient1ClientId(), getClient1ClientSecret(), getClient1RedirectUri());
// Check the scopes are not null
assertNotNull(token1);
assertNotNull(token2);
assertFalse(token1.equals(token2));
// Check token 1 is working
ClientResponse token1Response = memberV2ApiClient.viewActivities(this.getUser1OrcidId(), token1);
assertNotNull(token1Response);
assertEquals(Response.Status.OK.getStatusCode(), token1Response.getStatus());
ActivitiesSummary token1Activities = token1Response.getEntity(ActivitiesSummary.class);
assertNotNull(token1Activities);
// Check token 2 is working
ClientResponse token2Response = memberV2ApiClient.viewActivities(this.getUser1OrcidId(), token2);
assertNotNull(token2Response);
assertEquals(Response.Status.OK.getStatusCode(), token2Response.getStatus());
ActivitiesSummary token2Activities = token2Response.getEntity(ActivitiesSummary.class);
assertNotNull(token2Activities);
assertTrue(token1Activities.equals(token2Activities));
// Check tokens works just for his scopes
Work workToCreate = (Work) unmarshallFromPath("/record_2.0_rc1/samples/work-2.0_rc1.xml", Work.class);
workToCreate.setPutCode(null);
workToCreate.getWorkTitle().getTitle().setContent("Title " + System.currentTimeMillis());
ClientResponse token1AddWorkresponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), workToCreate, token1);
assertNotNull(token1AddWorkresponse);
assertEquals(Response.Status.FORBIDDEN.getStatusCode(), token1AddWorkresponse.getStatus());
ClientResponse token2AddWorkresponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), workToCreate, token2);
assertNotNull(token2AddWorkresponse);
assertEquals(Response.Status.FORBIDDEN.getStatusCode(), token2AddWorkresponse.getStatus());
// Check a new token with other scope can add the work
scopes.add(ScopePathType.ACTIVITIES_UPDATE.value());
String token3 = getNonCachedAccessTokens(getUser1UserName(), getUser1Password(), scopes, getClient1ClientId(), getClient1ClientSecret(), getClient1RedirectUri());
assertNotNull(token3);
assertFalse(token1.equals(token3));
// Check token 3 is working
ClientResponse token3Response = memberV2ApiClient.viewActivities(this.getUser1OrcidId(), token3);
assertNotNull(token3Response);
assertEquals(Response.Status.OK.getStatusCode(), token3Response.getStatus());
ActivitiesSummary token3Activities = token3Response.getEntity(ActivitiesSummary.class);
assertNotNull(token3Activities);
assertTrue(token1Activities.equals(token3Activities));
// Check that token 3 can add works
ClientResponse token3AddWorkresponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), workToCreate, token3);
assertNotNull(token3AddWorkresponse);
assertEquals(Response.Status.CREATED.getStatusCode(), token3AddWorkresponse.getStatus());
ClientResponse getResponse = memberV2ApiClient.viewLocationXml(token3AddWorkresponse.getLocation(), token3);
assertEquals(Response.Status.OK.getStatusCode(), getResponse.getStatus());
Work gotWork = getResponse.getEntity(Work.class);
assertNotNull(gotWork);
assertNotNull(gotWork.getPutCode());
ClientResponse deleteNewWork = memberV2ApiClient.deleteWorkXml(getUser1OrcidId(), gotWork.getPutCode(), token3);
assertNotNull(deleteNewWork);
assertEquals(ClientResponse.Status.NO_CONTENT.getStatusCode(), deleteNewWork.getStatus());
}
use of org.orcid.jaxb.model.record.summary_rc1.ActivitiesSummary in project ORCID-Source by ORCID.
the class WorksTest method testWorksWithPartOfRelationshipDontGetGrouped.
@Test
public void testWorksWithPartOfRelationshipDontGetGrouped() throws JSONException, InterruptedException, URISyntaxException {
long time = System.currentTimeMillis();
String accessTokenForClient1 = getAccessToken();
String accessTokenForClient2 = getAccessToken(getUser1OrcidId(), getUser1Password(), getScopes(ScopePathType.ACTIVITIES_UPDATE, ScopePathType.ACTIVITIES_READ_LIMITED), getClient2ClientId(), getClient2ClientSecret(), getClient2RedirectUri());
Work work1 = (Work) unmarshallFromPath("/record_2.0_rc1/samples/work-2.0_rc1.xml", Work.class);
work1.setPutCode(null);
work1.setVisibility(Visibility.PUBLIC);
work1.getExternalIdentifiers().getExternalIdentifier().clear();
org.orcid.jaxb.model.record_rc1.WorkTitle title1 = new org.orcid.jaxb.model.record_rc1.WorkTitle();
title1.setTitle(new Title("Work # 1" + time));
work1.setWorkTitle(title1);
WorkExternalIdentifier wExtId1 = new WorkExternalIdentifier();
wExtId1.setWorkExternalIdentifierId(new WorkExternalIdentifierId("Work Id " + time));
wExtId1.setWorkExternalIdentifierType(WorkExternalIdentifierType.AGR);
wExtId1.setRelationship(Relationship.SELF);
wExtId1.setUrl(new Url("http://orcid.org/work#1"));
work1.getExternalIdentifiers().getExternalIdentifier().clear();
work1.getExternalIdentifiers().getExternalIdentifier().add(wExtId1);
Work work2 = (Work) unmarshallFromPath("/record_2.0_rc1/samples/work-2.0_rc1.xml", Work.class);
work2.setPutCode(null);
work2.setVisibility(Visibility.PUBLIC);
org.orcid.jaxb.model.record_rc1.WorkTitle title2 = new org.orcid.jaxb.model.record_rc1.WorkTitle();
title2.setTitle(new Title("Work # 2" + time));
work2.setWorkTitle(title2);
work2.getExternalIdentifiers().getExternalIdentifier().clear();
WorkExternalIdentifier wExtId2 = new WorkExternalIdentifier();
wExtId2.setWorkExternalIdentifierId(new WorkExternalIdentifierId("Work Id " + time));
wExtId2.setWorkExternalIdentifierType(WorkExternalIdentifierType.AGR);
wExtId2.setRelationship(Relationship.PART_OF);
wExtId2.setUrl(new Url("http://orcid.org/work#2"));
work2.getExternalIdentifiers().getExternalIdentifier().clear();
work2.getExternalIdentifiers().getExternalIdentifier().add(wExtId2);
Work work3 = (Work) unmarshallFromPath("/record_2.0_rc1/samples/work-2.0_rc1.xml", Work.class);
work3.setPutCode(null);
work3.setVisibility(Visibility.PUBLIC);
org.orcid.jaxb.model.record_rc1.WorkTitle title3 = new org.orcid.jaxb.model.record_rc1.WorkTitle();
title3.setTitle(new Title("Work # 3" + time));
work3.setWorkTitle(title3);
work3.getExternalIdentifiers().getExternalIdentifier().clear();
WorkExternalIdentifier wExtId3 = new WorkExternalIdentifier();
wExtId3.setWorkExternalIdentifierId(new WorkExternalIdentifierId("Work Id " + time));
wExtId3.setWorkExternalIdentifierType(WorkExternalIdentifierType.AGR);
wExtId3.setRelationship(Relationship.SELF);
wExtId3.setUrl(new Url("http://orcid.org/work#3"));
work3.getExternalIdentifiers().getExternalIdentifier().clear();
work3.getExternalIdentifiers().getExternalIdentifier().add(wExtId3);
// Add the three works
ClientResponse postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work1, accessTokenForClient1);
assertNotNull(postResponse);
assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
Long putCode1 = getPutCodeFromResponse(postResponse);
postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work2, accessTokenForClient1);
assertNotNull(postResponse);
assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
Long putCode2 = getPutCodeFromResponse(postResponse);
postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work3, accessTokenForClient2);
assertNotNull(postResponse);
assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
Long putCode3 = getPutCodeFromResponse(postResponse);
ClientResponse activitiesResponse = memberV2ApiClient.viewActivities(this.getUser1OrcidId(), accessTokenForClient1);
assertEquals(Response.Status.OK.getStatusCode(), activitiesResponse.getStatus());
ActivitiesSummary activities = activitiesResponse.getEntity(ActivitiesSummary.class);
assertNotNull(activities);
assertFalse(activities.getWorks().getWorkGroup().isEmpty());
WorkGroup work1Group = null;
WorkGroup work2Group = null;
WorkGroup work3Group = null;
boolean work1found = false;
boolean work2found = false;
boolean work3found = false;
for (WorkGroup group : activities.getWorks().getWorkGroup()) {
if (group.getIdentifiers().getIdentifier() == null || group.getIdentifiers().getIdentifier().isEmpty()) {
for (WorkSummary summary : group.getWorkSummary()) {
String title = summary.getTitle().getTitle().getContent();
if (("Work # 2" + time).equals(title)) {
work2found = true;
work2Group = group;
}
}
} else {
for (Identifier id : group.getIdentifiers().getIdentifier()) {
// If it is the ID is the one we are looking for
if (id.getExternalIdentifierId().equals("Work Id " + time)) {
for (WorkSummary summary : group.getWorkSummary()) {
String title = summary.getTitle().getTitle().getContent();
if (("Work # 1" + time).equals(title)) {
work1found = true;
work1Group = group;
} else if (("Work # 3" + time).equals(title)) {
work3found = true;
work3Group = group;
}
}
}
}
}
}
assertTrue(work1found);
assertTrue(work2found);
assertTrue(work3found);
// Check that work # 1 and Work # 3 are in the same work
assertEquals(work1Group, work3Group);
// Check that work # 2 is not in the same group than group # 1
assertThat(work2Group, not(work1Group));
// Remove all created works
ClientResponse deleteResponse = memberV2ApiClient.deleteWorkXml(this.getUser1OrcidId(), putCode1, accessTokenForClient1);
assertNotNull(deleteResponse);
assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
deleteResponse = memberV2ApiClient.deleteWorkXml(this.getUser1OrcidId(), putCode2, accessTokenForClient1);
assertNotNull(deleteResponse);
assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
deleteResponse = memberV2ApiClient.deleteWorkXml(this.getUser1OrcidId(), putCode3, accessTokenForClient2);
assertNotNull(deleteResponse);
assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
}
use of org.orcid.jaxb.model.record.summary_rc1.ActivitiesSummary 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_rc2/samples/education-2.0_rc2.xml", Education.class);
education.setPutCode(null);
education.setVisibility(Visibility.PUBLIC);
Employment employment = (Employment) unmarshallFromPath("/record_2.0_rc2/samples/employment-2.0_rc2.xml", Employment.class);
employment.setPutCode(null);
employment.setVisibility(Visibility.PUBLIC);
Funding funding = (Funding) unmarshallFromPath("/record_2.0_rc2/samples/funding-2.0_rc2.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_rc2/samples/work-2.0_rc2.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_rc2/samples/peer-review-2.0_rc2.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;
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;
List<Long> fundingPutCodes = new ArrayList<Long>();
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());
}
}
}
use of org.orcid.jaxb.model.record.summary_rc1.ActivitiesSummary in project ORCID-Source by ORCID.
the class WorksTest method testWorksWithPartOfRelationshipDontGetGrouped.
@Test
public void testWorksWithPartOfRelationshipDontGetGrouped() throws JSONException, InterruptedException, URISyntaxException {
long time = System.currentTimeMillis();
String accessTokenForClient1 = getAccessToken();
String accessTokenForClient2 = getAccessToken(getUser1OrcidId(), getUser1Password(), getScopes(ScopePathType.ACTIVITIES_UPDATE, ScopePathType.ACTIVITIES_READ_LIMITED), getClient2ClientId(), getClient2ClientSecret(), getClient2RedirectUri());
Work work1 = (Work) unmarshallFromPath("/record_2.0_rc4/samples/work-2.0_rc4.xml", Work.class);
work1.setPutCode(null);
work1.setVisibility(Visibility.PUBLIC);
work1.getExternalIdentifiers().getExternalIdentifier().clear();
org.orcid.jaxb.model.record_rc4.WorkTitle title1 = new org.orcid.jaxb.model.record_rc4.WorkTitle();
title1.setTitle(new Title("Work # 1" + time));
work1.setWorkTitle(title1);
ExternalID wExtId1 = new ExternalID();
wExtId1.setValue("Work Id " + time);
wExtId1.setType(WorkExternalIdentifierType.AGR.value());
wExtId1.setRelationship(Relationship.SELF);
wExtId1.setUrl(new Url("http://orcid.org/work#1"));
work1.getExternalIdentifiers().getExternalIdentifier().clear();
work1.getExternalIdentifiers().getExternalIdentifier().add(wExtId1);
Work work2 = (Work) unmarshallFromPath("/record_2.0_rc4/samples/work-2.0_rc4.xml", Work.class);
work2.setPutCode(null);
work2.setVisibility(Visibility.PUBLIC);
org.orcid.jaxb.model.record_rc4.WorkTitle title2 = new org.orcid.jaxb.model.record_rc4.WorkTitle();
title2.setTitle(new Title("Work # 2" + time));
work2.setWorkTitle(title2);
work2.getExternalIdentifiers().getExternalIdentifier().clear();
ExternalID wExtId2 = new ExternalID();
wExtId2.setValue("Work Id " + time);
wExtId2.setType(WorkExternalIdentifierType.AGR.value());
wExtId2.setRelationship(Relationship.PART_OF);
wExtId2.setUrl(new Url("http://orcid.org/work#2"));
work2.getExternalIdentifiers().getExternalIdentifier().clear();
work2.getExternalIdentifiers().getExternalIdentifier().add(wExtId2);
Work work3 = (Work) unmarshallFromPath("/record_2.0_rc4/samples/work-2.0_rc4.xml", Work.class);
work3.setPutCode(null);
work3.setVisibility(Visibility.PUBLIC);
org.orcid.jaxb.model.record_rc4.WorkTitle title3 = new org.orcid.jaxb.model.record_rc4.WorkTitle();
title3.setTitle(new Title("Work # 3" + time));
work3.setWorkTitle(title3);
work3.getExternalIdentifiers().getExternalIdentifier().clear();
ExternalID wExtId3 = new ExternalID();
wExtId3.setValue("Work Id " + time);
wExtId3.setType(WorkExternalIdentifierType.AGR.value());
wExtId3.setRelationship(Relationship.SELF);
wExtId3.setUrl(new Url("http://orcid.org/work#3"));
work3.getExternalIdentifiers().getExternalIdentifier().clear();
work3.getExternalIdentifiers().getExternalIdentifier().add(wExtId3);
// Add the three works
ClientResponse postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work1, accessTokenForClient1);
assertNotNull(postResponse);
assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
Long putCode1 = getPutCodeFromResponse(postResponse);
postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work2, accessTokenForClient1);
assertNotNull(postResponse);
assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
Long putCode2 = getPutCodeFromResponse(postResponse);
postResponse = memberV2ApiClient.createWorkXml(this.getUser1OrcidId(), work3, accessTokenForClient2);
assertNotNull(postResponse);
assertEquals(Response.Status.CREATED.getStatusCode(), postResponse.getStatus());
Long putCode3 = getPutCodeFromResponse(postResponse);
ClientResponse activitiesResponse = memberV2ApiClient.viewActivities(this.getUser1OrcidId(), accessTokenForClient1);
assertEquals(Response.Status.OK.getStatusCode(), activitiesResponse.getStatus());
ActivitiesSummary activities = activitiesResponse.getEntity(ActivitiesSummary.class);
assertNotNull(activities);
assertFalse(activities.getWorks().getWorkGroup().isEmpty());
WorkGroup work1Group = null;
WorkGroup work2Group = null;
WorkGroup work3Group = null;
boolean work1found = false;
boolean work2found = false;
boolean work3found = false;
for (WorkGroup group : activities.getWorks().getWorkGroup()) {
if (group.getIdentifiers().getExternalIdentifier() == null || group.getIdentifiers().getExternalIdentifier().isEmpty()) {
for (WorkSummary summary : group.getWorkSummary()) {
String title = summary.getTitle().getTitle().getContent();
if (("Work # 2" + time).equals(title)) {
work2found = true;
work2Group = group;
}
}
} else {
for (ExternalID id : group.getIdentifiers().getExternalIdentifier()) {
// If it is the ID is the one we are looking for
if (id.getValue().equals("Work Id " + time)) {
for (WorkSummary summary : group.getWorkSummary()) {
String title = summary.getTitle().getTitle().getContent();
if (("Work # 1" + time).equals(title)) {
work1found = true;
work1Group = group;
} else if (("Work # 3" + time).equals(title)) {
work3found = true;
work3Group = group;
}
}
}
}
}
}
assertTrue(work1found);
assertTrue(work2found);
assertTrue(work3found);
// Check that work # 1 and Work # 3 are in the same work
assertEquals(work1Group, work3Group);
// Check that work # 2 is not in the same group than group # 1
assertThat(work2Group, not(work1Group));
// Remove all created works
ClientResponse deleteResponse = memberV2ApiClient.deleteWorkXml(this.getUser1OrcidId(), putCode1, accessTokenForClient1);
assertNotNull(deleteResponse);
assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
deleteResponse = memberV2ApiClient.deleteWorkXml(this.getUser1OrcidId(), putCode2, accessTokenForClient1);
assertNotNull(deleteResponse);
assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
deleteResponse = memberV2ApiClient.deleteWorkXml(this.getUser1OrcidId(), putCode3, accessTokenForClient2);
assertNotNull(deleteResponse);
assertEquals(Response.Status.NO_CONTENT.getStatusCode(), deleteResponse.getStatus());
}
Aggregations