pull up feature list in export form

backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/AbsoluteMode.java

@@ -5,50 +5,65 @@
 import java.util.function.Consumer;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
-import com.bakdata.conquery.apiv1.query.CQElement;
+import com.bakdata.conquery.apiv1.query.ArrayConceptQuery;
 import com.bakdata.conquery.apiv1.query.Query;
 import com.bakdata.conquery.io.cps.CPSType;
+import com.bakdata.conquery.io.jackson.View;
 import com.bakdata.conquery.models.auth.entities.User;
 import com.bakdata.conquery.models.common.Range;
 import com.bakdata.conquery.models.datasets.Dataset;
-import com.bakdata.conquery.models.forms.export.AbsExportGenerator;
+import com.bakdata.conquery.models.forms.managed.AbsoluteFormQuery;
 import com.bakdata.conquery.models.forms.util.Alignment;
 import com.bakdata.conquery.models.query.DateAggregationMode;
 import com.bakdata.conquery.models.query.QueryResolveContext;
 import com.bakdata.conquery.models.query.Visitable;
 import com.bakdata.conquery.models.worker.DatasetRegistry;
-import com.google.common.collect.ImmutableList;
+import com.fasterxml.jackson.annotation.JsonView;
 import lombok.Getter;
 import lombok.Setter;
 
-@Getter @Setter
-@CPSType(id="ABSOLUTE", base=Mode.class)
+@Getter
+@Setter
+@CPSType(id = "ABSOLUTE", base = Mode.class)
 public class AbsoluteMode extends Mode {
-	@NotNull @Valid
+	@NotNull
+	@Valid
 	private Range<LocalDate> dateRange;
 
-	@NotEmpty
-	private List<CQElement> features = ImmutableList.of();
-
-	@Override
-	public void visit(Consumer<Visitable> visitor) {
-		features.forEach(visitor::accept);
-	}
 
 	@NotNull
 	private Alignment alignmentHint = Alignment.QUARTER;
 
+
+	@JsonView(View.InternalCommunication.class)
+	private ArrayConceptQuery resolvedFeatures;
+
 	@Override
 	public Query createSpecializedQuery(DatasetRegistry datasets, User user, Dataset submittedDataset) {
-		return AbsExportGenerator.generate(this);
+
+		List<ExportForm.ResolutionAndAlignment> resolutionsAndAlignments =
+				ExportForm.getResolutionAlignmentMap(getForm().getResolvedResolutions(), getAlignmentHint());
+
+		return new AbsoluteFormQuery(
+				getForm().getPrerequisite(),
+				dateRange,
+				resolvedFeatures,
+				resolutionsAndAlignments
+		);
 	}
 
 	@Override
 	public void resolve(QueryResolveContext context) {
+		resolvedFeatures = ArrayConceptQuery.createFromFeatures(getForm().getFeatures());
+
 		// Resolve all
-		features.forEach(e -> e.resolve(context.withDateAggregationMode(DateAggregationMode.NONE)));
+		resolvedFeatures.resolve(context.withDateAggregationMode(DateAggregationMode.NONE));
+	}
+
+	@Override
+	public void visit(Consumer<Visitable> visitor) {
+
 	}
 }

backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/EntityDateMode.java

@@ -24,6 +24,7 @@
 import com.bakdata.conquery.models.query.QueryResolveContext;
 import com.bakdata.conquery.models.query.Visitable;
 import com.bakdata.conquery.models.worker.DatasetRegistry;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonView;
 import com.google.common.collect.ImmutableList;
 import lombok.Getter;
@@ -37,41 +38,37 @@ public class EntityDateMode extends Mode {
     @Valid
     private Range<LocalDate> dateRange;
 
-    @NotEmpty
-    private List<CQElement> features = ImmutableList.of();
-
     @NotNull
-    private DateAggregationMode dateAggregationMode = DateAggregationMode.MERGE;
+	private DateAggregationMode dateAggregationMode = DateAggregationMode.MERGE;
 
-	@JsonView(View.InternalCommunication.class)
-    private ArrayConceptQuery resolvedFeatures;
 
-    @Override
-    public void visit(Consumer<Visitable> visitor) {
-        features.forEach(e -> visitor.accept(e));
-    }
+	@Override
+	public void visit(Consumer<Visitable> visitor) {
+	}
 
-    @NotNull
-    private Alignment alignmentHint = Alignment.QUARTER;
+	@NotNull
+	private Alignment alignmentHint = Alignment.QUARTER;
 
-    @Override
-    public void resolve(QueryResolveContext context) {
-    	// Apply defaults to user concept
-        ExportForm.DefaultSelectSettable.enable(features);
-		resolvedFeatures = ArrayConceptQuery.createFromFeatures(features);
-        resolvedFeatures.resolve(context);
-    }
 
-    @Override
-    public Query createSpecializedQuery(DatasetRegistry datasets, User user, Dataset submittedDataset) {
-        CDateRange dateRestriction = dateRange == null ? CDateRange.all() : CDateRange.of(dateRange);
+	@JsonView(View.InternalCommunication.class)
+	private ArrayConceptQuery resolvedFeatures;
+
+	@Override
+	public void resolve(QueryResolveContext context) {
+		resolvedFeatures = ArrayConceptQuery.createFromFeatures(getForm().getFeatures());
+		resolvedFeatures.resolve(context);
+	}
+
+	@Override
+	public Query createSpecializedQuery(DatasetRegistry datasets, User user, Dataset submittedDataset) {
+		CDateRange dateRestriction = dateRange == null ? CDateRange.all() : CDateRange.of(dateRange);
 
         return new EntityDateQuery(
-                getForm().getPrerequisite(),
-                resolvedFeatures,
-                ExportForm.getResolutionAlignmentMap(getForm().getResolvedResolutions(), getAlignmentHint()),
-                dateRestriction,
-                dateAggregationMode
-        );
+				getForm().getPrerequisite(),
+				resolvedFeatures,
+				ExportForm.getResolutionAlignmentMap(getForm().getResolvedResolutions(), getAlignmentHint()),
+				dateRestriction,
+				dateAggregationMode
+		);
     }
 }

backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/ExportForm.java

@@ -15,11 +15,13 @@
 import c10n.C10N;
 import com.bakdata.conquery.ConqueryConstants;
 import com.bakdata.conquery.apiv1.forms.Form;
+import com.bakdata.conquery.apiv1.query.ArrayConceptQuery;
 import com.bakdata.conquery.apiv1.query.CQElement;
 import com.bakdata.conquery.apiv1.query.Query;
 import com.bakdata.conquery.apiv1.query.QueryDescription;
 import com.bakdata.conquery.internationalization.ExportFormC10n;
 import com.bakdata.conquery.io.cps.CPSType;
+import com.bakdata.conquery.io.jackson.View;
 import com.bakdata.conquery.models.auth.entities.User;
 import com.bakdata.conquery.models.datasets.Dataset;
 import com.bakdata.conquery.models.execution.ManagedExecution;
@@ -30,6 +32,7 @@
 import com.bakdata.conquery.models.forms.util.ResolutionShortNames;
 import com.bakdata.conquery.models.i18n.I18n;
 import com.bakdata.conquery.models.identifiable.ids.specific.ManagedExecutionId;
+import com.bakdata.conquery.models.query.DateAggregationMode;
 import com.bakdata.conquery.models.query.ManagedQuery;
 import com.bakdata.conquery.models.query.QueryResolveContext;
 import com.bakdata.conquery.models.query.Visitable;
@@ -38,6 +41,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import com.google.common.collect.ImmutableList;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -54,9 +59,14 @@ public class ExportForm extends Form {
 	@JsonIgnore
 	private ManagedQuery queryGroup;
 
-	@NotNull @Valid @JsonManagedReference
+	@NotNull
+	@Valid
+	@JsonManagedReference
 	private Mode timeMode;
 
+	@NotEmpty
+	private List<CQElement> features = ImmutableList.of();
+
 	@NotNull
 	@NotEmpty
 	private List<ResolutionShortNames> resolution = List.of(ResolutionShortNames.COMPLETE);
@@ -72,6 +82,7 @@ public class ExportForm extends Form {
 	public void visit(Consumer<Visitable> visitor) {
 		visitor.accept(this);
 		timeMode.visit(visitor);
+		features.forEach(visitor);
 	}
 
 
@@ -93,6 +104,10 @@ public Set<ManagedExecutionId> collectRequiredQueries() {
 	public void resolve(QueryResolveContext context) {
 		queryGroup = (ManagedQuery) context.getDatasetRegistry().getMetaRegistry().resolve(queryGroupId);
 
+
+		// Apply defaults to user concept
+		ExportForm.DefaultSelectSettable.enable(features);
+
 		timeMode.resolve(context);
 		prerequisite = queryGroup.getQuery();
 

backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/Mode.java

@@ -1,14 +1,17 @@
 package com.bakdata.conquery.apiv1.forms.export_form;
 
+import com.bakdata.conquery.apiv1.query.ArrayConceptQuery;
 import com.bakdata.conquery.apiv1.query.Query;
 import com.bakdata.conquery.io.cps.CPSBase;
+import com.bakdata.conquery.io.jackson.View;
 import com.bakdata.conquery.models.auth.entities.User;
 import com.bakdata.conquery.models.datasets.Dataset;
 import com.bakdata.conquery.models.query.QueryResolveContext;
 import com.bakdata.conquery.models.query.Visitable;
 import com.bakdata.conquery.models.worker.DatasetRegistry;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonView;
 import lombok.Getter;
 import lombok.Setter;
 

backend/src/main/java/com/bakdata/conquery/apiv1/forms/export_form/RelativeMode.java

@@ -22,6 +22,7 @@
 import com.bakdata.conquery.models.query.QueryResolveContext;
 import com.bakdata.conquery.models.query.Visitable;
 import com.bakdata.conquery.models.worker.DatasetRegistry;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonView;
 import lombok.Getter;
 import lombok.Setter;
@@ -39,15 +40,14 @@ public class RelativeMode extends Mode {
 	private IndexPlacement indexPlacement;
 	@NotNull
 	private TemporalSamplerFactory indexSelector;
-	@NotEmpty
-	private List<CQElement> features;
+
 
 	@JsonView(View.InternalCommunication.class)
 	private ArrayConceptQuery resolvedFeatures;
 
 	@Override
 	public void visit(Consumer<Visitable> visitor) {
-		features.forEach(visitor);
+
 	}
 
 	@Override
@@ -57,9 +57,7 @@ public RelativeFormQuery createSpecializedQuery(DatasetRegistry datasets, User u
 
 	@Override
 	public void resolve(QueryResolveContext context) {
-		ExportForm.DefaultSelectSettable.enable(features);
-
-		resolvedFeatures = ArrayConceptQuery.createFromFeatures(features);
+		resolvedFeatures = ArrayConceptQuery.createFromFeatures(getForm().getFeatures());
 
 		// Resolve all
 		resolvedFeatures.resolve(context.withDateAggregationMode(DateAggregationMode.NONE));

backend/src/test/java/com/bakdata/conquery/api/form/config/FormConfigTest.java

@@ -137,7 +137,6 @@ public void setupTest() {
 		form.setTimeMode(mode);
 		form.setQueryGroupId(managedQuery.getId());
 		mode.setForm(form);
-		mode.setFeatures(List.of(new CQConcept()));
 
 
 		user = new User("test", "test", storage);
@@ -247,7 +246,7 @@ public void getConfigs() {
 		RelativeMode mode3 = new RelativeMode();
 		form2.setTimeMode(mode3);
 		mode3.setForm(form);
-		mode3.setFeatures(List.of(new CQConcept()));
+		form.setFeatures(List.of(new CQConcept()));
 
 		TestForm form3 = new TestForm.Abs();
 

backend/src/test/java/com/bakdata/conquery/models/SerializationTests.java

@@ -363,7 +363,6 @@ public void formConfig() throws JSONException, IOException {
 		AbsoluteMode mode = new AbsoluteMode();
 		form.setTimeMode(mode);
 		mode.setForm(form);
-		mode.setFeatures(List.of(new CQConcept()));
 
 		ObjectMapper mapper = FormConfigProcessor.getMAPPER();
 		JsonNode values = mapper.valueToTree(form);
@@ -663,9 +662,9 @@ public void testNonStrictNumbers() throws JSONException, IOException {
 		SerializationTestUtil.forType(Double.class)
 							 .objectMappers(getApiMapper(), getManagerInternalMapper()).test(Double.POSITIVE_INFINITY, null);
 		SerializationTestUtil.forType(Double.class)
-							 .objectMappers(getApiMapper(), getManagerInternalMapper()).test(new Double(Double.MAX_VALUE));
+							 .objectMappers(getApiMapper(), getManagerInternalMapper()).test(Double.MAX_VALUE);
 		SerializationTestUtil.forType(Double.class)
-							 .objectMappers(getApiMapper(), getManagerInternalMapper()).test(new Double(Double.MIN_VALUE));
+							 .objectMappers(getApiMapper(), getManagerInternalMapper()).test(Double.MIN_VALUE);
 		SerializationTestUtil
 				.forType(EntityResult.class)
 				.objectMappers(getApiMapper(), getManagerInternalMapper())