From c636b3e6b4b7a471ce8f4b0a3e6f3f4c1d680a46 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Fri, 3 Nov 2023 18:00:06 +0200 Subject: [PATCH] Minor query optimization --- .../eu/eudat/service/deposit/RepositoryDepositService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/deposit/RepositoryDepositService.java b/dmp-backend/core/src/main/java/eu/eudat/service/deposit/RepositoryDepositService.java index 19f95fe43..b7617a1ef 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/deposit/RepositoryDepositService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/deposit/RepositoryDepositService.java @@ -188,8 +188,8 @@ public class RepositoryDepositService { //GK: Step two get it's doiEntity CriteriaQuery doiQuery = builder.createQuery(EntityDoiEntity.class); Root doiRoot = doiQuery.from(EntityDoiEntity.class); - doiQuery = doiQuery.multiselect(doiRoot.get("entityId").get("id"), doiRoot.get("doi"), doiRoot.get("repositoryId")); - doiQuery = doiQuery.where(builder.and(doiRoot.get("entityId").get("id").in(dmpIds), builder.equal(doiRoot.get("isActive"), IsActive.Active))); + doiQuery = doiQuery.multiselect(doiRoot.get("entityId").get("id"), doiRoot.get("doi")); + doiQuery = doiQuery.where(builder.and(doiRoot.get("entityId").get("id").in(dmpIds), builder.equal(doiRoot.get("isActive"), IsActive.Active), builder.equal(doiRoot.get("repositoryId"), repoId))); List dois = this.entityManager.createQuery(doiQuery).getResultList(); for(UUID uuid: dmpIds) @@ -197,7 +197,7 @@ public class RepositoryDepositService { if (uuid.equals(currentId)) continue; doiEntity = dois.stream() - .filter(entityDoiEntity -> entityDoiEntity.getEntityId().getId().equals(uuid) && entityDoiEntity.getRepositoryId().equals(repoId)).findFirst().orElse(null); + .filter(entityDoiEntity -> entityDoiEntity.getEntityId().getId().equals(uuid)).findFirst().orElse(null); if (doiEntity != null) break; }