DSC-1455 improve handling of not existings ID and test that findByIds…

… consider distinct uuid
abollini · Jan 12, 2024 · 8c1fa8a · 8c1fa8a
1 parent ced78d3
commit 8c1fa8a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
@@ -1844,7 +1844,7 @@ public boolean isItemListedForUser(Context context, Item item) {
     @Override
     public Iterator<Item> findByIds(Context context, List<String> ids) throws SQLException {
         return itemDAO.findByIds(context,
-                ids.stream().map(uuid -> UUID.fromString(uuid)).collect(Collectors.toList()));
+                ids.stream().map(uuid -> UUID.fromString(uuid)).distinct().collect(Collectors.toList()));
     }
 
     @Override

diff --git a/dspace-api/src/main/java/org/dspace/core/UUIDIterator.java b/dspace-api/src/main/java/org/dspace/core/UUIDIterator.java
@@ -46,7 +46,16 @@ public UUIDIterator(Context ctx, List<UUID> uuids, Class<T> clazz, AbstractHiber
     @Override
     protected T computeNext() {
         try {
-            return iterator.hasNext() ? dao.findByID(ctx, clazz, iterator.next()) : endOfData();
+            if (iterator.hasNext()) {
+                T item = dao.findByID(ctx, clazz, iterator.next());
+                if (item != null) {
+                    return item;
+                } else {
+                    return computeNext();
+                }
+            } else {
+                return endOfData();
+            }
         } catch (SQLException e) {
             throw new SQLRuntimeException(e);
         }

diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java
@@ -415,6 +415,8 @@ public void findAllByIdTest() throws Exception {
         getClient(token).perform(get("/api/core/items/search/findAllById")
                    .param("id",
                            publicItem1.getID().toString(),
+                           publicItem1.getID().toString(),
+                           UUID.randomUUID().toString(),
                            publicItem2.getID().toString(),
                            UUID.randomUUID().toString()
                            ))