Merged in task/main-glam/GLAM-1116 (pull request DSpace#4731)

Task/main glam/GLAM-1116

Approved-by: Vincenzo Mecca

Author: Damiano Fiorenza

dspace-api/src/main/java/org/dspace/authority/script/migrateEntity/MigrateEntity.java

@@ -102,53 +102,50 @@ public void internalRun() throws Exception {
                 collections.add(col);
             }
 
-
             for (Collection collection : collections) {
-                int countItems = 0;
+                collection = context.reloadEntity(collection);
                 int processedItems = 0;
-                int notProcessed = 0;
                 String currentEt = collection.getEntityType();
                 String currentForm = collectionService.getMetadataFirstValue(collection,
                         MetadataSchemaEnum.CRIS.getName(), "submission", "definition", Item.ANY);
                 System.out
                     .println("Current EntityType:" + currentEt + " and current form " +
                             currentForm + " of collection with name:" + collection.getName());
+                if (changeForm) {
+                    collectionService.setMetadataSingleValue(context, collection, MetadataSchemaEnum.CRIS.getName(),
+                                                             "submission", "definition", null,this.newFormName);
+                }
                 if (changeType) {
                     collectionService.setMetadataSingleValue(context, collection, "dspace", "entity", "type", null,
                             this.newEntityType);
-                    Iterator<Item> itemIterator = itemService.findAllByCollection(context, collection);
+                    Iterator<Item> itemIterator = itemService.findAllByOwningCollection(context, collection);
                     handler.logInfo("Script start");
                     while (itemIterator.hasNext()) {
                         Item item = itemIterator.next();
-                        countItems++;
-                        String entityType = itemService.getMetadataFirstValue(item, "dspace",
-                                "entity", "type", Item.ANY);
-                        processedItems++;
                         itemService.setMetadataSingleValue(context, item, "dspace", "entity", "type", null,
                                 this.newEntityType);
+                        processedItems++;
+                        context.uncacheEntity(item);
+                        if (processedItems % 100 == 0) {
+                            context.commit();
+                        }
                     }
                 }
-                if (changeForm) {
-                    collectionService.setMetadataSingleValue(context, collection, MetadataSchemaEnum.CRIS.getName(),
-                            "submission", "definition", null ,this.newFormName);
-                }
-                collection = context.reloadEntity(collection);
-                currentEt = collection.getEntityType();
-                handler.logInfo("Processed colection : " + collection.getName());
-                handler.logInfo("Found " + countItems + " items");
                 handler.logInfo("Processed " + processedItems + " items");
-                handler.logInfo("NOT processed " + notProcessed + " items");
+                context.uncacheEntity(collection);
+                context.commit();
             }
-            context.commit();
             handler.logInfo("Script end");
         } catch (SQLException e) {
-            context.rollback();
+            if (context != null && context.isValid()) {
+                context.abort();
+            }
             log.error(e.getMessage(), e);
             throw new RuntimeException(e.getMessage(), e);
         } finally {
-            if (context != null) {
+            if (context != null && context.isValid()) {
                 context.restoreAuthSystemState();
-                context.close();
+                context.complete();
             }
         }
     }

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

@@ -551,6 +551,11 @@ public Iterator<Item> findAllByCollection(Context context, Collection collection
         return itemDAO.findAllByCollection(context, collection, limit, offset);
     }
 
+    @Override
+    public Iterator<Item> findAllByOwningCollection(Context context, Collection collection) throws SQLException {
+        return itemDAO.findAllByOwningCollection(context, collection);
+    }
+
     @Override
     public Iterator<Item> findInArchiveOrWithdrawnDiscoverableModifiedSince(Context context, Date since)
             throws SQLException {

dspace-api/src/main/java/org/dspace/content/dao/ItemDAO.java

@@ -152,6 +152,15 @@ Iterator<Item> findArchivedByCollectionExcludingOwning(Context context, Collecti
     Iterator<Item> findAllByCollection(Context context, Collection collection, Integer limit, Integer offset)
         throws SQLException;
 
+    /**
+     * Returns all items (without filtering for withdrawn or in archive) with the given owning collection
+     * @param context           context
+     * @param collection        the collection
+     * @return                  the item iterator containing the items in the collection
+     * @throws SQLException     If the query goes wrong
+     */
+    public Iterator<Item> findAllByOwningCollection(Context context, Collection collection) throws SQLException;
+
     /**
      * Count number of items in a given collection
      *

dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java

@@ -420,6 +420,17 @@ public Iterator<Item> findAllByCollection(Context context, Collection collection
         return new UUIDIterator<Item>(context, uuids, Item.class, this);
     }
 
+    @Override
+    public Iterator<Item> findAllByOwningCollection(Context context, Collection collection)
+        throws SQLException {
+        Query query = createQuery(context, "SELECT item.id FROM Item as item " +
+            "WHERE owningCollection = :collection");
+        query.setParameter("collection", collection);
+        @SuppressWarnings("unchecked")
+        List<UUID> uuids = query.getResultList();
+        return new UUIDIterator<Item>(context, uuids, Item.class, this);
+    }
+
     @Override
     public int countItems(Context context, Collection collection, boolean includeArchived, boolean includeWithdrawn,
                           boolean discoverable)

dspace-api/src/main/java/org/dspace/content/service/ItemService.java

@@ -270,6 +270,15 @@ Iterator<Item> findInArchiveOrWithdrawnNonDiscoverableModifiedSince(Context cont
      */
     Iterator<Item> findAllByCollection(Context context, Collection collection) throws SQLException;
 
+    /**
+     * Returns all items (without filtering for withdrawn or in archive) with the given owning collection
+     * @param context           context
+     * @param collection        the collection
+     * @return                  the item iterator containing the items in the collection
+     * @throws SQLException     If the query goes wrong
+     */
+    Iterator<Item> findAllByOwningCollection(Context context, Collection collection) throws SQLException;
+
     /**
      * See whether this Item is contained by a given Collection.
      *