Global: Add sorting to DMPs, Storage, Datasets and other entities by …

…ID to preserve order
tuwien-csd · Dec 9, 2024 · db325a0 · db325a0
1 parent 6fd4949
commit db325a0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/src/main/java/org/damap/base/repo/DmpRepo.java b/src/main/java/org/damap/base/repo/DmpRepo.java
@@ -1,6 +1,7 @@
 package org.damap.base.repo;
 
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
+import io.quarkus.panache.common.Sort;
 import jakarta.enterprise.context.ApplicationScoped;
 import java.util.List;
 import org.damap.base.domain.Dmp;
@@ -15,6 +16,6 @@ public class DmpRepo implements PanacheRepository<Dmp> {
    * @return a {@link java.util.List} object
    */
   public List<Dmp> getAll() {
-    return listAll();
+    return listAll(Sort.by("id"));
   }
 }
diff --git a/src/main/java/org/damap/base/repo/base/RepoSearch.java b/src/main/java/org/damap/base/repo/base/RepoSearch.java
@@ -1,6 +1,7 @@
 package org.damap.base.repo.base;
 
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
+import io.quarkus.panache.common.Sort;
 import jakarta.ws.rs.core.MultivaluedMap;
 import java.util.HashMap;
 import java.util.List;
@@ -50,6 +51,6 @@ default List<T> searchByParameters(MultivaluedMap<String, Object> queryParams) {
       counter++;
     }
 
-    return list(query.toString(), params);
+    return find(query.toString(), Sort.by("id"), params).list();
   }
 }
diff --git a/src/main/java/org/damap/base/rest/dmp/mapper/DmpDOMapper.java b/src/main/java/org/damap/base/rest/dmp/mapper/DmpDOMapper.java
@@ -1,9 +1,6 @@
 package org.damap.base.rest.dmp.mapper;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import lombok.experimental.UtilityClass;
 import lombok.extern.jbosslog.JBossLog;
 import org.damap.base.domain.*;
@@ -74,7 +71,8 @@ public DmpDO mapEntityToDO(Dmp dmp, DmpDO dmpDO) {
     dmpDO.setDocumentation(dmp.getDocumentation());
 
     List<ContributorDO> contributorDOList = new ArrayList<>();
-    dmp.getContributorList()
+    dmp.getContributorList().stream()
+        .sorted(Comparator.comparing(contributor -> contributor.id))
         .forEach(
             contributor -> {
               ContributorDO contributorDO = new ContributorDO();
@@ -99,7 +97,8 @@ public DmpDO mapEntityToDO(Dmp dmp, DmpDO dmpDO) {
     dmpDO.setLegalRestrictionsDocuments(legalRestrictionsDocumentsDOList);
 
     List<DatasetDO> datasetDOList = new ArrayList<>();
-    dmp.getDatasetList()
+    dmp.getDatasetList().stream()
+        .sorted(Comparator.comparing(Dataset::getId))
         .forEach(
             dataset -> {
               DatasetDO datasetDO = new DatasetDO();
@@ -154,7 +153,8 @@ public DmpDO mapEntityToDO(Dmp dmp, DmpDO dmpDO) {
     dmpDO.setExternalStorage(externalStorageDOList);
 
     List<CostDO> costDOList = new ArrayList<>();
-    dmp.getCosts()
+    dmp.getCosts().stream()
+        .sorted(Comparator.comparing(cost -> cost.id))
         .forEach(
             cost -> {
               CostDO costDO = new CostDO();

diff --git a/src/main/java/org/damap/base/rest/dmp/service/DmpService.java b/src/main/java/org/damap/base/rest/dmp/service/DmpService.java
@@ -5,11 +5,7 @@
 import jakarta.transaction.Transactional;
 import jakarta.validation.Valid;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import lombok.extern.jbosslog.JBossLog;
 import org.damap.base.domain.Access;
 import org.damap.base.domain.Contributor;
@@ -67,6 +63,9 @@ public List<DmpListItemDO> getAll() {
             dmpListItemDOList.add(
                 DmpListItemDOMapper.mapEntityToDO(
                     null, dmp, new DmpListItemDO(), versionService.getDmpVersions(dmp.id))));
+
+    // dmpListItemDOList.sort(Comparator.comparing(DmpListItemDO::getId));
+
     return dmpListItemDOList;
   }
 
@@ -90,6 +89,9 @@ public List<DmpListItemDO> getDmpListByPersonId(String personId) {
                     access.getDmp(),
                     new DmpListItemDO(),
                     versionService.getDmpVersions(access.getDmp().id))));
+
+    dmpListItemDOS.sort(Comparator.comparing(DmpListItemDO::getId));
+
     return dmpListItemDOS;
   }