Merge pull request DSpace#12305 from tinsch/make-signposting-endpoint-faster

Improve performance on signposting endpoint

Author: tdonohue

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

@@ -599,4 +599,8 @@ public Bundle findByLegacyId(Context context, int id) throws SQLException {
     public int countTotal(Context context) throws SQLException {
         return bundleDAO.countRows(context);
     }
+
+    public int countBitstreams(Context context, Bundle bundle) throws SQLException {
+        return bundleDAO.countBitstreams(context, bundle);
+    }
 }

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

@@ -22,4 +22,6 @@
  */
 public interface BundleDAO extends DSpaceObjectLegacySupportDAO<Bundle> {
     int countRows(Context context) throws SQLException;
+
+    int countBitstreams(Context context, Bundle bundle) throws SQLException;
 }

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

@@ -9,6 +9,7 @@
 
 import java.sql.SQLException;
 
+import jakarta.persistence.Query;
 import org.dspace.content.Bundle;
 import org.dspace.content.dao.BundleDAO;
 import org.dspace.core.AbstractHibernateDSODAO;
@@ -31,4 +32,13 @@ protected BundleDAOImpl() {
     public int countRows(Context context) throws SQLException {
         return count(createQuery(context, "SELECT count(*) from Bundle"));
     }
+
+    @Override
+    public int countBitstreams(Context context, Bundle bundle) throws SQLException {
+        Query query = createQuery(
+            context, "SELECT count(bi.id) from Bundle bu join bu.bitstreams bi where bu.id = :bundleID"
+        );
+        query.setParameter("bundleID", bundle.getID());
+        return count(query);
+    }
 }

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

@@ -146,4 +146,12 @@ public void  moveBitstreamToBundle(Context context, Bundle targetBundle, Bitstre
     public void setOrder(Context context, Bundle bundle, UUID[] bitstreamIds) throws AuthorizeException, SQLException;
 
     int countTotal(Context context) throws SQLException;
+
+    /**
+     * Returns the count of bitstreams for the given bundle, performance optimized.
+     *
+     * @param context      DSpace Context
+     * @param bundle       the bitstream bundle
+     */
+    int countBitstreams(Context context, Bundle bundle) throws SQLException;
 }

dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/service/impl/LinksetServiceImpl.java

@@ -26,6 +26,7 @@
 import org.dspace.content.Bundle;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
+import org.dspace.content.service.BundleService;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
@@ -48,6 +49,9 @@ public class LinksetServiceImpl implements LinksetService {
     @Autowired
     protected ItemService itemService;
 
+    @Autowired
+    protected BundleService bundleService;
+
     @Autowired
     private BitstreamMetadataReadPermissionEvaluatorPlugin bitstreamMetadataReadPermissionEvaluatorPlugin;
 
@@ -86,7 +90,7 @@ public List<LinksetNode> createLinksetNodesForSingleLinkset(
 
         List<LinksetNode> linksetNodes = new ArrayList<>();
         if (object.getType() == Constants.ITEM) {
-            int itemBitstreamsCount = countItemBitstreams((Item) object);
+            int itemBitstreamsCount = countItemBitstreams(context, (Item) object);
 
             // Do not include individual bitstream typed links if their number exceeds
             // the limit in the configuration.
@@ -170,12 +174,12 @@ private Iterator<Bitstream> getItemBitstreams(Context context, Item item) {
         }
     }
 
-    private int countItemBitstreams(Item item) {
+    private int countItemBitstreams(Context context, Item item) {
         try {
             int countBitstreams = 0;
             List<Bundle> bundles = itemService.getBundles(item, Constants.DEFAULT_BUNDLE_NAME);
             for (Bundle bundle: bundles) {
-                countBitstreams += bundle.getBitstreams().size();
+                countBitstreams += bundleService.countBitstreams(context, bundle);
             }
             return countBitstreams;
         } catch (SQLException e) {