[HWORKS-320] Pypi library versions not sorted correctly (logicalclock…

…s#1289)
smkniazi · Feb 22, 2023 · 5759eef · 5759eef
1 parent 23645cc
commit 5759eef
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...s-api/src/main/java/io/hops/hopsworks/api/python/library/search/LibrarySearchBuilder.java b/...s-api/src/main/java/io/hops/hopsworks/api/python/library/search/LibrarySearchBuilder.java
@@ -27,6 +27,7 @@
 import javax.ejb.TransactionAttributeType;
 import javax.ws.rs.core.UriInfo;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
@@ -101,8 +102,8 @@ private LibrarySearchDTO buildItems(LibrarySearchDTO dto, UriInfo uriInfo,
     Collection<PythonDep> installedDeps = project.getPythonDepCollection();
     if (libVersions != null && !libVersions.isEmpty()) {
       libVersions.forEach((k, v) -> dto.addItem(build(uriInfo, v, k, installedDeps, url)));
+      libVersions.forEach((k, v) -> Collections.sort(v));
     }
     return dto;
   }
-
 }
diff --git a/...works-common/src/main/java/io/hops/hopsworks/common/python/library/LibraryVersionDTO.java b/...works-common/src/main/java/io/hops/hopsworks/common/python/library/LibraryVersionDTO.java
@@ -20,7 +20,7 @@
 import java.util.Objects;
 
 @XmlRootElement
-public class LibraryVersionDTO {
+public class LibraryVersionDTO implements Comparable {
 
   private String version;
   private Date uploadTime;
@@ -71,4 +71,13 @@ public boolean equals(Object o) {
   public int hashCode() {
     return Objects.hash(version);
   }
+
+  @Override
+  public int compareTo(Object o) {
+    LibraryVersionDTO otherVersion = (LibraryVersionDTO)o;
+    if (otherVersion.getUploadTime() == null && this.getUploadTime() == null) return 0;
+    if (otherVersion.getUploadTime() == null) return -1;
+    if (this.getUploadTime() == null) return 1;
+    return this.getUploadTime().compareTo(otherVersion.getUploadTime());
+  }
 }