hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed discoverable property to make it more readable

Browse Source
This commit is contained in:
Mykhaylo
2021-12-16 18:36:58 +01:00
parent 7f42095f19
commit 665c4942b1
7 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dspace-api/src/main/java/org/dspace/submit/model/AccessConditionConfiguration.java
View File

@@ -14,7 +14,7 @@ import java.util.List;
public class AccessConditionConfiguration {
private String name;
private Boolean discoverable;
private Boolean canChangeDiscoverable;
private List<AccessConditionOption> options;
public String getName() {
@@ -25,12 +25,12 @@ public class AccessConditionConfiguration {
this.name = name;
}
public Boolean getDiscoverable() {
return discoverable;
public Boolean getCanChangeDiscoverable() {
return canChangeDiscoverable;
}
public void setDiscoverable(Boolean discoverable) {
this.discoverable = discoverable;
public void setCanChangeDiscoverable(Boolean canChangeDiscoverable) {
this.canChangeDiscoverable = canChangeDiscoverable;
}
public List<AccessConditionOption> getOptions() {

4
dspace-api/src/test/data/dspaceFolder/config/spring/api/access-conditions.xml
View File

@@ -71,7 +71,7 @@
<bean id="accessConditionConfigurationDefault" class="org.dspace.submit.model.AccessConditionConfiguration">
<property name="name" value="defaultAC"></property>
<property name="discoverable" value="true"></property>
<property name="canChangeDiscoverable" value="true"></property>
<property name="options">
<list>
<ref bean="openAccess"/>
@@ -83,7 +83,7 @@
<bean id="accessConditionConfigurationNotDiscoverable" class="org.dspace.submit.model.AccessConditionConfiguration">
<property name="name" value="notDiscoverable"></property>
<property name="discoverable" value="false"></property>
<property name="canChangeDiscoverable" value="false"></property>
<property name="options">
<list>
<ref bean="embargoed" />

2
dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionAccessOptionConverter.java
View File

@@ -33,7 +33,7 @@ public class SubmissionAccessOptionConverter
public SubmissionAccessOptionRest convert(AccessConditionConfiguration config, Projection projection) {
SubmissionAccessOptionRest model = new SubmissionAccessOptionRest();
model.setId(config.getName());
model.setDiscoverable(config.getDiscoverable());
model.setCanChangeDiscoverable(config.getCanChangeDiscoverable());
model.setProjection(projection);
for (AccessConditionOption option : config.getOptions()) {
AccessConditionOptionRest optionRest = new AccessConditionOptionRest();

10
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionAccessOptionRest.java
View File

@@ -28,7 +28,7 @@ public class SubmissionAccessOptionRest extends BaseObjectRest<String> {
private String id;
private Boolean discoverable;
private Boolean canChangeDiscoverable;
private List<AccessConditionOptionRest> accessConditionOptions;
@@ -40,12 +40,12 @@ public class SubmissionAccessOptionRest extends BaseObjectRest<String> {
this.id = id;
}
public Boolean getDiscoverable() {
return discoverable;
public Boolean getCanChangeDiscoverable() {
return canChangeDiscoverable;
}
public void setDiscoverable(Boolean discoverable) {
this.discoverable = discoverable;
public void setCanChangeDiscoverable(Boolean canChangeDiscoverable) {
this.canChangeDiscoverable = canChangeDiscoverable;
}
public List<AccessConditionOptionRest> getAccessConditionOptions() {

2
dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionDiscoverableReplacePatchOperation.java
View File

@@ -36,7 +36,7 @@ public class AccessConditionDiscoverableReplacePatchOperation extends ReplacePat
String stepId = (String) currentRequest.getAttribute("accessConditionSectionId");
AccessConditionConfiguration configuration = accessConditionConfigurationService.getMap().get(stepId);
if (Objects.isNull(configuration) || !configuration.getDiscoverable().booleanValue()) {
if (Objects.isNull(configuration) || !configuration.getCanChangeDiscoverable().booleanValue()) {
throw new UnprocessableEntityException("The current access configurations does not allow" +
" the user to specify the visibility of the item");
}

22
dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionAccessOptionRestRepositoryIT.java
View File

@@ -38,7 +38,7 @@ public class SubmissionAccessOptionRestRepositoryIT extends AbstractControllerIn
getClient(tokenAdmin).perform(get("/api/config/submissionaccessoptions/defaultAC"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.id", is("defaultAC")))
.andExpect(jsonPath("$.discoverable", is(true)))
.andExpect(jsonPath("$.canChangeDiscoverable", is(true)))
.andExpect(jsonPath("$.accessConditionOptions", Matchers.containsInAnyOrder(
AccessConditionOptionMatcher.matchAccessConditionOption(
"openaccess", false , false, null, null),
@@ -54,7 +54,7 @@ public class SubmissionAccessOptionRestRepositoryIT extends AbstractControllerIn
getClient(tokenEPerson).perform(get("/api/config/submissionaccessoptions/defaultAC"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.id", is("defaultAC")))
.andExpect(jsonPath("$.discoverable", is(true)))
.andExpect(jsonPath("$.canChangeDiscoverable", is(true)))
.andExpect(jsonPath("$.accessConditionOptions", Matchers.containsInAnyOrder(
AccessConditionOptionMatcher.matchAccessConditionOption(
"openaccess", false , false, null, null),
@@ -68,7 +68,7 @@ public class SubmissionAccessOptionRestRepositoryIT extends AbstractControllerIn
getClient().perform(get("/api/config/submissionaccessoptions/defaultAC"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.id", is("defaultAC")))
.andExpect(jsonPath("$.discoverable", is(true)))
.andExpect(jsonPath("$.canChangeDiscoverable", is(true)))
.andExpect(jsonPath("$.accessConditionOptions", Matchers.containsInAnyOrder(
AccessConditionOptionMatcher.matchAccessConditionOption(
"openaccess", false , false, null, null),
@@ -80,6 +80,22 @@ public class SubmissionAccessOptionRestRepositoryIT extends AbstractControllerIn
.andExpect(jsonPath("$.type", is("submissionaccessoption")));
}
@Test
public void findOneCanNotChangeDiscoverableTest() throws Exception {
String tokenAdmin = getAuthToken(admin.getEmail(), password);
getClient(tokenAdmin).perform(get("/api/config/submissionaccessoptions/notDiscoverable"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.id", is("notDiscoverable")))
.andExpect(jsonPath("$.canChangeDiscoverable", is(false)))
.andExpect(jsonPath("$.accessConditionOptions", Matchers.containsInAnyOrder(
AccessConditionOptionMatcher.matchAccessConditionOption(
"embargo", true , false, "+36MONTHS", null),
AccessConditionOptionMatcher.matchAccessConditionOption(
"administrator", false , false, null, null))
))
.andExpect(jsonPath("$.type", is("submissionaccessoption")));
}
@Test
public void findOneNotFoundTest() throws Exception {
String authToken = getAuthToken(admin.getEmail(), password);

2
dspace/config/spring/api/access-conditions.xml
View File

@@ -71,7 +71,7 @@
<bean id="accessConditionConfigurationDefault" class="org.dspace.submit.model.AccessConditionConfiguration">
<property name="name" value="AccessConditionDefaultConfiguration"></property>
<property name="discoverable" value="true"></property>
<property name="canChangeDiscoverable" value="true"></property>
<property name="options">
<list>
<ref bean="openAccess"/>