103818 Extend ItemServiceTest#testMoveItemToCollectionWithMoreRestrictiveReadPolicy

dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java

@@ -963,13 +963,18 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
         }
         // TODO: should we also throw an exception if no DEFAULT_ITEM_READ?
 
+        boolean removeCurrentReadRPBitstream =
+            replaceReadRPWithCollectionRP && defaultCollectionBitstreamPolicies.size() > 0;
+        boolean removeCurrentReadRPBundle =
+            replaceReadRPWithCollectionRP && defaultCollectionBundlePolicies.size() > 0;
+
         // remove all policies from bundles, add new ones
         // Remove bundles
         List<Bundle> bunds = item.getBundles();
         for (Bundle mybundle : bunds) {
-            // If collection has default READ policies, remove the bitstream's READ policies.
+            // If collection has default READ policies, remove the bundle's READ policies.
-            if (replaceReadRPWithCollectionRP && defaultCollectionBitstreamPolicies.size() > 0) {
+            if (removeCurrentReadRPBundle) {
-                authorizeService.removePoliciesActionFilter(context, item, Constants.READ);
+                authorizeService.removePoliciesActionFilter(context, mybundle, Constants.READ);
             }
 
             // if come from InstallItem: remove all submission/workflow policies
@@ -979,6 +984,11 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
             addDefaultPoliciesNotInPlace(context, mybundle, defaultCollectionBundlePolicies);
 
             for (Bitstream bitstream : mybundle.getBitstreams()) {
+                // If collection has default READ policies, remove the bundle's READ policies.
+                if (removeCurrentReadRPBitstream) {
+                    authorizeService.removePoliciesActionFilter(context, bitstream, Constants.READ);
+                }
+
                 // if come from InstallItem: remove all submission/workflow policies
                 removeAllPoliciesAndAddDefault(context, bitstream, defaultItemPolicies,
                                                defaultCollectionBitstreamPolicies);

dspace-api/src/test/java/org/dspace/content/service/ItemServiceTest.java

@@ -39,6 +39,7 @@ import org.dspace.builder.RelationshipTypeBuilder;
 import org.dspace.builder.RequestItemBuilder;
 import org.dspace.builder.ResourcePolicyBuilder;
 import org.dspace.content.Bitstream;
+import org.dspace.content.Bundle;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
 import org.dspace.content.EntityType;
@@ -786,22 +787,47 @@ public class ItemServiceTest extends AbstractIntegrationTestWithDatabase {
             .createItem(context, permissive)
             .build();
 
-        // Verify that the item has exactly one READ policy, for the anonymous group.
+        Bitstream bitstream = BitstreamBuilder.createBitstream(context, item, InputStream.nullInputStream())
+            .build();
+
+        Bundle bundle = item.getBundles("ORIGINAL").get(0);
+
+        // Verify that the item, bundle and bitstream each have exactly one READ policy, for the anonymous group.
         assertEquals(
             List.of(anonymous),
             authorizeService.getPoliciesActionFilter(context, item, Constants.READ)
                 .stream().map(ResourcePolicy::getGroup).collect(Collectors.toList())
         );
+        assertEquals(
+            List.of(anonymous),
+            authorizeService.getPoliciesActionFilter(context, bundle, Constants.READ)
+                .stream().map(ResourcePolicy::getGroup).collect(Collectors.toList())
+        );
+        assertEquals(
+            List.of(anonymous),
+            authorizeService.getPoliciesActionFilter(context, bitstream, Constants.READ)
+                .stream().map(ResourcePolicy::getGroup).collect(Collectors.toList())
+        );
 
         // Move the item to the restrictive collection, making sure to inherit default policies.
         itemService.move(context, item, permissive, restrictive, true);
 
-        // Verify that the item has exactly one READ policy, but now for the admin group.
+        // Verify that the item, bundle and bitstream each have exactly one READ policy, but now for the admin group.
         assertEquals(
             List.of(admin),
             authorizeService.getPoliciesActionFilter(context, item, Constants.READ)
                 .stream().map(ResourcePolicy::getGroup).collect(Collectors.toList())
         );
+        assertEquals(
+            List.of(anonymous),
+            authorizeService.getPoliciesActionFilter(context, bundle, Constants.READ)
+                .stream().map(ResourcePolicy::getGroup).collect(Collectors.toList())
+        );
+        assertEquals(
+            List.of(anonymous),
+            authorizeService.getPoliciesActionFilter(context, bitstream, Constants.READ)
+                .stream().map(ResourcePolicy::getGroup).collect(Collectors.toList())
+        );
 
         context.restoreAuthSystemState();
     }