Skip to content

Commit

Permalink
Merged dspace-cris-7 into CST-12350
Browse files Browse the repository at this point in the history
  • Loading branch information
@atarix83
atarix83 committed Nov 3, 2023
2 parents f3de580 + 3fa655e commit 2aadff3
Show file tree
Hide file tree
Showing 5 changed files with 230 additions and 4 deletions.
10 changes: 8 additions & 2 deletions dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,7 @@ private List<CrisLayoutField> getThumbnailFields(List<CrisLayoutTab> crisLayoutT
* @param context
* @param item
* @param bundle
* @param metadata
* @param value
* @param requireOriginal
* @throws SQLException
* @return Bitstream
*/
Expand Down Expand Up @@ -2138,4 +2136,12 @@ public boolean isLatestVersion(Context context, Item item) throws SQLException {

}

@Override
public void addResourcePolicy(Context context, Item item, int actionID, EPerson eperson)
throws SQLException, AuthorizeException {
ResourcePolicy resourcePolicy =
this.authorizeService.createResourcePolicy(context, item, null, eperson, actionID, null);
item.getResourcePolicies().add(resourcePolicy);
}

}
13 changes: 13 additions & 0 deletions dspace-api/src/main/java/org/dspace/content/service/ItemService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -922,4 +922,17 @@ public Iterator<Item> findRelatedItemsByAuthorityControlledFields(Context contex
*/
public boolean isLatestVersion(Context context, Item item) throws SQLException;

/**
* Adds a resource policy to the specified item for the given action and EPerson.
*
* @param context the DSpace context
* @param item the item to add the policy to
* @param actionID the ID of the action to add the policy for
* @param eperson the EPerson to add the policy for
* @throws SQLException if a database error occurs
* @throws AuthorizeException if the current user is not authorized to perform this action
*/
void addResourcePolicy(Context context, Item item, int actionID, EPerson eperson)
throws SQLException, AuthorizeException;

}
1 change: 1 addition & 0 deletions .../src/main/java/org/dspace/discovery/configuration/DiscoveryConfigurationUtilsService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public Iterator<Item> findByRelation(Context context, Item item, String relation
DiscoverQuery discoverQuery = new DiscoverQuery();
discoverQuery.setDSpaceObjectFilter(IndexableItem.TYPE);
discoverQuery.setDiscoveryConfigurationName(discoveryConfiguration.getId());
discoverQuery.setScopeObject(new IndexableItem(item));
List<String> defaultFilterQueries = discoveryConfiguration.getDefaultFilterQueries();
for (String defaultFilterQuery : defaultFilterQueries) {
discoverQuery.addFilterQueries(MessageFormat.format(defaultFilterQuery, item.getID()));
Expand Down
7 changes: 5 additions & 2 deletions dspace-api/src/main/java/org/dspace/profile/ResearcherProfileServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,17 +314,20 @@ private Item createProfileItem(Context context, EPerson ePerson, Collection coll

item = installItemService.installItem(context, workspaceItem);

context.uncacheEntity(workspaceItem);

if (isNewProfileNotVisibleByDefault()) {
Group anonymous = groupService.findByName(context, ANONYMOUS);
authorizeService.removeGroupPolicies(context, item, anonymous);
}

authorizeService.addPolicy(context, item, READ, ePerson);
itemService.addResourcePolicy(context, item, READ, ePerson);

if (isAdditionOfWritePolicyOnProfileEnabled()) {
authorizeService.addPolicy(context, item, WRITE, ePerson);
itemService.addResourcePolicy(context, item, WRITE, ePerson);
}


return reloadItem(context, item);
}

Expand Down
203 changes: 203 additions & 0 deletions ...server-webapp/src/test/java/org/dspace/app/rest/layout/CrisLayoutTabRestRepositoryIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
import static org.dspace.app.rest.matcher.CrisLayoutBoxMatcher.matchBox;
import static org.dspace.app.rest.matcher.CrisLayoutTabMatcher.matchRest;
import static org.dspace.app.rest.matcher.CrisLayoutTabMatcher.matchTab;
import static org.dspace.builder.RelationshipTypeBuilder.createRelationshipTypeBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
Expand Down Expand Up @@ -56,16 +58,21 @@
import org.dspace.builder.EntityTypeBuilder;
import org.dspace.builder.GroupBuilder;
import org.dspace.builder.ItemBuilder;
import org.dspace.builder.RelationshipBuilder;
import org.dspace.content.Bundle;
import org.dspace.content.Collection;
import org.dspace.content.Community;
import org.dspace.content.EntityType;
import org.dspace.content.Item;
import org.dspace.content.MetadataField;
import org.dspace.content.MetadataSchema;
import org.dspace.content.Relationship;
import org.dspace.content.RelationshipType;
import org.dspace.content.service.EntityTypeService;
import org.dspace.content.service.ItemService;
import org.dspace.content.service.MetadataFieldService;
import org.dspace.content.service.MetadataSchemaService;
import org.dspace.content.service.RelationshipService;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.Group;
import org.dspace.layout.CrisLayoutBox;
Expand Down Expand Up @@ -104,6 +111,12 @@ public class CrisLayoutTabRestRepositoryIT extends AbstractControllerIntegration
@Autowired
private CrisLayoutTabService crisLayoutTabService;

@Autowired
protected EntityTypeService entityTypeService;

@Autowired
protected RelationshipService relationshipService;

private final String METADATASECURITY_URL = "http://localhost:8080/api/core/metadatafield/";

/**
Expand Down Expand Up @@ -1730,6 +1743,196 @@ public void findByItemTabsWithCustomSecurityLayoutAnonynousTest() throws Excepti
.andExpect(jsonPath("$._embedded.tabs[0].rows[1].cells[0].boxes", contains(matchBox(box2))));
}

@Test
public void findByItemTabsWithHiddenRelationshipsTest() throws Exception {
context.turnOffAuthorisationSystem();

EntityType eType = EntityTypeBuilder.createEntityTypeBuilder(context, "Person").build();

EPerson userA =
EPersonBuilder.createEPerson(context)
.withNameInMetadata("Mecca", "Vincenzo")
.withEmail("[email protected]")
.withPassword(password)
.build();

Community community =
CommunityBuilder.createCommunity(context)
.withName("Test Community")
.withTitle("Title test community")
.build();

Collection col1 =
CollectionBuilder.createCollection(context, community)
.withName("Test Publications")
.build();

Collection people =
CollectionBuilder.createCollection(context, community)
.withName("People")
.withEntityType("Person")
.build();

Item firstPerson =
ItemBuilder.createItem(context, people)
.withTitle("4Science, Vins")
.build();

// RELATION.Person.researchoutputs
CrisLayoutBoxBuilder.createBuilder(context, eType, CrisLayoutBoxTypes.RELATION.name(), true, true)
.withShortname("box-shortname-one")
.build();

CrisLayoutBox box1 =
CrisLayoutBoxBuilder.createBuilder(context, eType, CrisLayoutBoxTypes.RELATION.name(), true, true)
.withShortname("researchoutputs")
.withHeader("Publications")
.withSecurity(LayoutSecurity.PUBLIC)
.withType(CrisLayoutBoxTypes.RELATION.name())
.build();


CrisLayoutBox box2 =
CrisLayoutBoxBuilder.createBuilder(context, eType, true, true)
.withShortname("box-shortname-two")
.withSecurity(LayoutSecurity.PUBLIC)
.build();

CrisLayoutFieldBuilder.createMetadataField(context, "dc.title", 0, 0)
.withLabel("LABEL TITLE")
.withRendering("RENDERIGN TITLE")
.withRowStyle("STYLE")
.withBox(box2)
.build();

CrisLayoutTab tab =
CrisLayoutTabBuilder.createTab(context, eType, 0)
.withShortName("details")
.withHeader("Profile")
.addBoxIntoNewRow(box2)
.withSecurity(LayoutSecurity.PUBLIC)
.build();

CrisLayoutTab tab1 =
CrisLayoutTabBuilder.createTab(context, eType, 0)
.withShortName("publications")
.withHeader("Publications")
.addBoxIntoNewRow(box1)
.withSecurity(LayoutSecurity.PUBLIC)
.build();

context.restoreAuthSystemState();

getClient().perform(get("/api/layout/tabs/search/findByItem")
.param("uuid", firstPerson.getID().toString()))
.andExpect(status().isOk())
.andExpect(content().contentType(contentType))
.andExpect(jsonPath("$.page.totalElements", Matchers.is(1)))
.andExpect(jsonPath("$._embedded.tabs", contains(matchTab(tab))))
.andExpect(jsonPath("$._embedded.tabs", not(contains(matchTab(tab1)))))
.andExpect(jsonPath("$._embedded.tabs[0].rows[0].cells[0].boxes", hasSize(1)))
.andExpect(jsonPath("$._embedded.tabs[0].rows[0].cells[0].boxes", contains(matchBox(box2))))
.andExpect(jsonPath("$._embedded.tabs[0].rows[1]").doesNotExist());

String tokenUserA = getAuthToken(userA.getEmail(), password);
getClient(tokenUserA).perform(get("/api/layout/tabs/search/findByItem")
.param("uuid", firstPerson.getID().toString()))
.andExpect(status().isOk())
.andExpect(content().contentType(contentType))
.andExpect(jsonPath("$.page.totalElements", Matchers.is(1)))
.andExpect(jsonPath("$._embedded.tabs", contains(matchTab(tab))))
.andExpect(jsonPath("$._embedded.tabs", not(contains(matchTab(tab1)))))
.andExpect(jsonPath("$._embedded.tabs[0].rows[0].cells[0].boxes", hasSize(1)))
.andExpect(
jsonPath("$._embedded.tabs[0].rows[0].cells[0].boxes", contains(matchBox(box2)))
)
.andExpect(jsonPath("$._embedded.tabs[0].rows[1]").doesNotExist());

context.turnOffAuthorisationSystem();

Item publication1 =
ItemBuilder.createItem(context, col1)
.withTitle("Title Of Item")
.withIssueDate("2015-06-25")
.withAuthor("4Science, Vins", firstPerson.getID().toString())
.withEntityType("Publication")
.build();

context.restoreAuthSystemState();

getClient().perform(get("/api/layout/tabs/search/findByItem")
.param("uuid", firstPerson.getID().toString()))
.andExpect(status().isOk())
.andExpect(content().contentType(contentType))
.andExpect(jsonPath("$.page.totalElements", Matchers.is(2)))
.andExpect(jsonPath("$._embedded.tabs", containsInAnyOrder(matchTab(tab), matchTab(tab1))))
.andExpect(jsonPath("$._embedded.tabs[0].rows[0].cells[0].boxes", hasSize(1)))
.andExpect(jsonPath("$._embedded.tabs[0].rows[0].cells[0].boxes", contains(matchBox(box2))))
.andExpect(jsonPath("$._embedded.tabs[1].rows[0].cells[0].boxes", hasSize(1)))
.andExpect(jsonPath("$._embedded.tabs[1].rows[0].cells[0].boxes", contains(matchBox(box1))))
.andExpect(jsonPath("$._embedded.tabs[0].rows[1]").doesNotExist())
.andExpect(jsonPath("$._embedded.tabs[1].rows[1]").doesNotExist());

getClient(tokenUserA).perform(get("/api/layout/tabs/search/findByItem")
.param("uuid", firstPerson.getID().toString()))
.andExpect(status().isOk())
.andExpect(content().contentType(contentType))
.andExpect(jsonPath("$.page.totalElements", Matchers.is(2)))
.andExpect(jsonPath("$._embedded.tabs", containsInAnyOrder(matchTab(tab), matchTab(tab1))))
.andExpect(
jsonPath("$._embedded.tabs[0].rows[0].cells[0].boxes", hasSize(1)))
.andExpect(
jsonPath("$._embedded.tabs[0].rows[0].cells[0].boxes", contains(matchBox(box2)))
)
.andExpect(jsonPath("$._embedded.tabs[1].rows[0].cells[0].boxes", hasSize(1)))
.andExpect(
jsonPath("$._embedded.tabs[1].rows[0].cells[0].boxes", contains(matchBox(box1)))
)
.andExpect(jsonPath("$._embedded.tabs[0].rows[1]").doesNotExist())
.andExpect(jsonPath("$._embedded.tabs[1].rows[1]").doesNotExist());

context.turnOffAuthorisationSystem();

RelationshipType hiddenResearchOutput =
createRelationshipTypeBuilder(
context, null, entityTypeService.findByEntityType(context, "Person"), "isResearchoutputsHiddenFor",
"notDisplayingResearchoutputs", 0, null, 0, null
).build();

final Relationship publicationOneHiddenByFirstPerson =
RelationshipBuilder.createRelationshipBuilder(
context, publication1, firstPerson, hiddenResearchOutput
).build();

context.restoreAuthSystemState();
try {
getClient().perform(get("/api/layout/tabs/search/findByItem")
.param("uuid", firstPerson.getID().toString()))
.andExpect(status().isOk())
.andExpect(content().contentType(contentType))
.andExpect(jsonPath("$.page.totalElements", Matchers.is(1)))
.andExpect(jsonPath("$._embedded.tabs", not(contains(matchTab(tab1)))))
.andExpect(jsonPath("$._embedded.tabs[0].rows[0].cells[0].boxes", hasSize(1)))
.andExpect(jsonPath("$._embedded.tabs[0].rows[0].cells[0].boxes", contains(matchBox(box2))))
.andExpect(jsonPath("$._embedded.tabs[0].rows[1]").doesNotExist());

getClient(tokenUserA).perform(get("/api/layout/tabs/search/findByItem")
.param("uuid", firstPerson.getID().toString()))
.andExpect(status().isOk())
.andExpect(content().contentType(contentType))
.andExpect(jsonPath("$.page.totalElements", Matchers.is(1)))
.andExpect(jsonPath("$._embedded.tabs", not(contains(matchTab(tab1)))))
.andExpect(jsonPath("$._embedded.tabs[0].rows[0].cells[0].boxes", hasSize(1)))
.andExpect(
jsonPath("$._embedded.tabs[0].rows[0].cells[0].boxes", contains(matchBox(box2))))
.andExpect(jsonPath("$._embedded.tabs[0].rows[1]").doesNotExist());

} finally {
RelationshipBuilder.deleteRelationship(publicationOneHiddenByFirstPerson.getID());
}

}

@Test
public void findThumbnailUsingLayoutTabBoxConfiguration() throws Exception {
context.turnOffAuthorisationSystem();
Expand Down

0 comments on commit 2aadff3

Please sign in to comment.