Merge pull request #3555 from ingef/fix/types-for-frontend

Bring back type structure for frontend

backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendResultType.java

@@ -0,0 +1,31 @@
+package com.bakdata.conquery.apiv1.frontend;
+
+import jakarta.validation.constraints.NotNull;
+
+import com.bakdata.conquery.models.types.ResultType;
+import lombok.Getter;
+import lombok.experimental.SuperBuilder;
+
+@Getter
+@SuperBuilder
+public class FrontendResultType {
+	@NotNull
+	String type;
+
+	@Getter
+	@SuperBuilder
+	public static class List extends FrontendResultType {
+		@NotNull
+		FrontendResultType elementType;
+	}
+
+	public static FrontendResultType from(ResultType resultType) {
+		if (resultType instanceof ResultType.ListT<?> listT) {
+			return List.builder()
+					   .elementType(from(listT.getElementType()))
+					   .type("LIST").build();
+		}
+
+		return FrontendResultType.builder().type(resultType.typeInfo()).build();
+	}
+}

backend/src/main/java/com/bakdata/conquery/apiv1/frontend/FrontendSelect.java

@@ -14,7 +14,7 @@ public class FrontendSelect {
 	private SelectId id;
 	private String label;
 	private String description;
-	private String resultType;
+	private FrontendResultType resultType;
 	@JsonProperty("default")
 	private Boolean isDefault;
 }

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/FrontEndConceptBuilder.java

@@ -12,6 +12,7 @@
 import com.bakdata.conquery.apiv1.frontend.FrontendFilterConfiguration;
 import com.bakdata.conquery.apiv1.frontend.FrontendList;
 import com.bakdata.conquery.apiv1.frontend.FrontendNode;
+import com.bakdata.conquery.apiv1.frontend.FrontendResultType;
 import com.bakdata.conquery.apiv1.frontend.FrontendRoot;
 import com.bakdata.conquery.apiv1.frontend.FrontendSecondaryId;
 import com.bakdata.conquery.apiv1.frontend.FrontendSelect;
@@ -172,7 +173,7 @@ public FrontendSelect createSelect(Select select) {
 							 .id(select.getId())
 							 .label(select.getLabel())
 							 .description(select.getDescription())
-							 .resultType(select.getResultType().typeInfo())
+							 .resultType(FrontendResultType.from(select.getResultType()))
 							 .isDefault(select.isDefault())
 							 .build();
 	}