Only return latest version

InseeFrLab · Oct 16, 2024 · 597d0c7 · 597d0c7
1 parent 6cbbe57
commit 597d0c7
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 3 deletions.
diff --git a/onyxia-api/src/main/java/fr/insee/onyxia/api/configuration/CustomObjectMapper.java b/onyxia-api/src/main/java/fr/insee/onyxia/api/configuration/CustomObjectMapper.java
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import fr.insee.onyxia.model.views.Views;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -27,7 +28,10 @@ public ObjectMapper objectMapper() {
         mapper.enable(ALLOW_TRAILING_COMMA);
         mapper.enable(ALLOW_SINGLE_QUOTES);
 
-        return mapper.build();
+        ObjectMapper returnMapper = mapper.build();
+        returnMapper.setConfig(returnMapper.getSerializationConfig().withView(Views.General.class));
+
+        return returnMapper;
     }
 
     @Bean(name = "helm")

diff --git a/onyxia-model/src/main/java/fr/insee/onyxia/model/catalog/CatalogWrapper.java b/onyxia-model/src/main/java/fr/insee/onyxia/model/catalog/CatalogWrapper.java
@@ -1,7 +1,11 @@
 package fr.insee.onyxia.model.catalog;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
 import fr.insee.onyxia.model.helm.Chart;
+import fr.insee.onyxia.model.views.Views;
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -10,6 +14,7 @@
 public abstract class CatalogWrapper {
 
     @Schema(description = "This entries are those from a standard helm repository")
+    @JsonView(Views.Full.class)
     private Map<String, List<Chart>> entries = Map.of();
 
     public Optional<Chart> getPackageByName(String name) {
@@ -32,10 +37,26 @@ public Optional<Chart> getPackageByNameAndVersion(String name, String version) {
     /**
      * @return the packages
      */
+    @JsonView(Views.Full.class)
     public Map<String, List<Chart>> getEntries() {
         return entries;
     }
 
+    @JsonProperty("latestPackages")
+    public Map<String, Chart> getLatestPackages() {
+        if (entries == null || entries.isEmpty()) {
+            return null;
+        }
+        final Map<String, Chart> latestCharts = new HashMap<>();
+        entries.forEach(
+                (key, value) -> {
+                    if (value != null && !value.isEmpty()) {
+                        latestCharts.put(key, value.get(0));
+                    }
+                });
+        return latestCharts;
+    }
+
     /**
      * @param entries the packages to set
      */

diff --git a/onyxia-model/src/main/java/fr/insee/onyxia/model/catalog/Pkg.java b/onyxia-model/src/main/java/fr/insee/onyxia/model/catalog/Pkg.java
@@ -1,6 +1,5 @@
 package fr.insee.onyxia.model.catalog;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.v3.oas.annotations.media.Schema;
 
@@ -16,7 +15,6 @@ public class Pkg {
     private String version;
 
     @Schema(description = "")
-    @JsonIgnore
     private JsonNode config;
 
     public String getName() {

diff --git a/onyxia-model/src/main/java/fr/insee/onyxia/model/views/Views.java b/onyxia-model/src/main/java/fr/insee/onyxia/model/views/Views.java
@@ -0,0 +1,12 @@
+package fr.insee.onyxia.model.views;
+
+public class Views {
+
+    // A general view for all fields except deep-nested charts
+    public static class General {}
+
+    // A specific view to include only the first chart in the nested structure
+    public static class FirstChartOnly extends General {}
+
+    public static class Full extends General {}
+}