#25079 adding missing sort clause in new code

dotCMS · May 30, 2023 · 8d0488f · 8d0488f
1 parent 8d5b0f5
commit 8d0488f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/...gration-test/java/com/dotcms/content/elasticsearch/business/ESContentFactoryImplTest.java b/...gration-test/java/com/dotcms/content/elasticsearch/business/ESContentFactoryImplTest.java
@@ -61,6 +61,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -69,6 +70,7 @@
 import java.util.Random;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import org.apache.commons.lang3.BooleanUtils;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
@@ -1337,6 +1339,12 @@ public void findAllVersionsByVariant() throws DotDataException, DotSecurityExcep
                 .equals(contentletLanguage2DefaultVariant.getIdentifier())));
         assertTrue(contentlets.stream().anyMatch(contentlet -> contentlet.getIdentifier()
                 .equals(contentletLanguage3DefaultVariant.getIdentifier())));
+
+      //Now test findAllVersions is returning the versions in descending order
+       final List<Contentlet>  copy = new ArrayList<>(contentlets);
+       copy.sort((o1, o2) -> o2.getModDate().compareTo(o1.getModDate()));
+       assertEquals(copy,contentlets);
+
     }
 
     /**
@@ -1410,6 +1418,12 @@ public void findAllVersionsWithOldVersionsByVariant() throws DotDataException, D
 
         expectedInodes.forEach(inode -> assertTrue(contentlets.stream()
                 .anyMatch(contentlet -> contentlet.getInode().equals(inode))));
+
+        //Now test findAllVersions is returning the versions in descending order
+        final List<Contentlet>  copy = new ArrayList<>(contentlets);
+        copy.sort((o1, o2) -> o2.getModDate().compareTo(o1.getModDate()));
+        assertEquals(copy,contentlets);
+
     }
 
 }
diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentFactoryImpl.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentFactoryImpl.java
@@ -1021,7 +1021,7 @@ protected  List<Contentlet> findAllVersions(final Identifier identifier, final V
 
         return new DotConnect()
                 .setSQL(String.format(
-                        "select inode from contentlet where identifier = ? and %s = ?",
+                        "select inode from contentlet where identifier = ? and %s = ? order by mod_date desc",
                         columnName))
                 .addParam(identifier.getId())
                 .addParam(variant.name())