coar-notify-7 merge error IT fix

4Science · Jan 8, 2024 · 46907cc · 46907cc
1 parent 1ab8bdc
commit 46907cc
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 13 deletions.
diff --git a/...rver-webapp/src/main/java/org/dspace/app/rest/repository/NotifyServiceRestRepository.java b/...rver-webapp/src/main/java/org/dspace/app/rest/repository/NotifyServiceRestRepository.java
@@ -40,6 +40,7 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Component;
 
+
 /**
  * This is the repository responsible to manage NotifyService Rest object
  *
@@ -228,5 +229,4 @@ public Page<NotifyServiceRest> findManualServicesByInboundPattern(
     public Class<NotifyServiceRest> getDomainClass() {
         return NotifyServiceRest.class;
     }
-
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QAEventRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QAEventRestRepository.java
@@ -97,11 +97,11 @@ public Page<QAEventRest> findByTopic(@Parameter(value = "topic", required = true
 
     @Override
     @PreAuthorize("hasPermission(#id, 'QUALITYASSURANCEEVENT', 'DELETE')")
-    protected void delete(Context context, String eventId) throws AuthorizeException {
-        Item item = findTargetItem(context, eventId);
+    protected void delete(Context context, String id) throws AuthorizeException {
+        Item item = findTargetItem(context, id);
         EPerson eperson = context.getCurrentUser();
-        qaEventService.deleteEventByEventId(eventId);
-        qaEventDao.storeEvent(context, eventId, eperson, item);
+        qaEventService.deleteEventByEventId(id);
+        qaEventDao.storeEvent(context, id, eperson, item);
     }
 
     @Override

diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QATopicRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QATopicRestRepository.java
@@ -65,7 +65,7 @@ public Page<QATopicRest> findAll(Context context, Pageable pageable) {
     }
 
     @SearchRestMethod(name = "bySource")
-    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    @PreAuthorize("hasPermission(#source, 'QUALITYASSURANCETOPIC', 'READ')")
     public Page<QATopicRest> findBySource(@Parameter(value = "source", required = true) String source,
             Pageable pageable) {
         Context context = obtainContext();
@@ -84,7 +84,7 @@ public Page<QATopicRest> findBySource(@Parameter(value = "source", required = tr
     }
 
     @SearchRestMethod(name = "byTarget")
-    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    @PreAuthorize("hasPermission(#target, 'QUALITYASSURANCETOPIC', 'READ')")
     public Page<QATopicRest> findByTarget(@Parameter(value = "target", required = true) UUID target,
         @Parameter(value = "source", required = true) String source,
         Pageable pageable) {

diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/NotifyServiceRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/NotifyServiceRestRepositoryIT.java
@@ -28,14 +28,17 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.math.BigDecimal;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import javax.ws.rs.core.MediaType;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.RandomUtils;
 import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
 import org.dspace.app.rest.model.NotifyServiceInboundPatternRest;
 import org.dspace.app.rest.model.NotifyServiceOutboundPatternRest;
 import org.dspace.app.rest.model.NotifyServiceRest;
@@ -47,17 +50,22 @@
 import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
 import org.dspace.builder.NotifyServiceBuilder;
 import org.dspace.builder.NotifyServiceInboundPatternBuilder;
+import org.junit.After;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
 
 /**
  * Integration test class for {@link NotifyServiceRestRepository}.
  *
  * @author Mohamed Eskander (mohamed.eskander at 4science.com)
  */
-@Ignore
 public class NotifyServiceRestRepositoryIT extends AbstractControllerIntegrationTest {
 
+    @Autowired
+    private NotifyService notifyService;
+
     @Test
     public void findAllUnAuthorizedTest() throws Exception {
         getClient().perform(get("/api/ldn/ldnservices"))
@@ -713,6 +721,11 @@ public void notifyServiceNameRemoveOperationTest() throws Exception {
     }
 
     @Test
+    @Ignore
+    /*
+     * frabacche senseless because it's a mandatory+unique
+     * entity field and also table column!
+     */
     public void notifyServiceLdnUrlRemoveOperationTest() throws Exception {
 
         context.turnOffAuthorisationSystem();
@@ -3473,5 +3486,20 @@ public void notifyServiceScoreAddOperationTest() throws Exception {
         ;
     }
 
+    @Override
+    @After
+    public void destroy() throws Exception {
+        List<NotifyServiceEntity> notifyServiceEntities = notifyService.findAll(context);
+        if (CollectionUtils.isNotEmpty(notifyServiceEntities)) {
+            notifyServiceEntities.forEach(notifyServiceEntity -> {
+                try {
+                    notifyService.delete(context, notifyServiceEntity);
+                } catch (SQLException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
 
+        super.destroy();
+    }
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/QAEventRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/QAEventRestRepositoryIT.java
@@ -58,7 +58,6 @@
 import org.dspace.qaevent.action.ASimpleMetadataAction;
 import org.dspace.qaevent.dao.QAEventsDAO;
 import org.hamcrest.Matchers;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -986,7 +985,6 @@ public void deleteItemWithEventTest() throws Exception {
     }
 
     @Test
-    @Ignore
     public void testEventDeletion() throws Exception {
 
         context.turnOffAuthorisationSystem();

diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/QATopicRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/QATopicRestRepositoryIT.java
@@ -28,7 +28,6 @@
 import org.dspace.qaevent.QANotifyPatterns;
 import org.dspace.services.ConfigurationService;
 import org.hamcrest.Matchers;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -322,7 +321,6 @@ public void findBySourceUnauthorizedTest() throws Exception {
             .andExpect(status().isUnauthorized());
     }
 
-    @Ignore
     @Test
     public void findBySourceForbiddenTest() throws Exception {
         context.turnOffAuthorisationSystem();
@@ -435,7 +433,6 @@ public void findByTargetUnauthorizedTest() throws Exception {
             .andExpect(status().isUnauthorized());
     }
 
-    @Ignore
     @Test
     public void findByTargetForbiddenTest() throws Exception {
         context.turnOffAuthorisationSystem();