Implement COUNT_QUARTERS select and filter for dateranges (#3446)

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/DaterangeSelect.java → backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/DaterangeSelectOrFilter.java

@@ -6,14 +6,19 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.dropwizard.validation.ValidationMethod;
 
-public interface DaterangeSelect {
+public interface DaterangeSelectOrFilter {
 
 	Column getColumn();
 
 	Column getStartColumn();
 
 	Column getEndColumn();
 
+	@JsonIgnore
+	default boolean isSingleColumnDaterange() {
+		return getColumn() != null;
+	}
+
 	@JsonIgnore
 	default Table getTable() {
 		if (getColumn() != null) {
@@ -25,7 +30,7 @@ default Table getTable() {
 
 	@JsonIgnore
 	@ValidationMethod(message = "Single column date range (set via column) and two column date range (set via startColumn and endColumn) are exclusive.")
-	default boolean isExclusiveValidityDates() {
+	default boolean isExclusiveDateRange() {
 		if (getColumn() == null) {
 			return getStartColumn() != null && getEndColumn() != null;
 		}
@@ -43,7 +48,7 @@ default boolean isOfSameTable() {
 
 	@JsonIgnore
 	@ValidationMethod(message = "Both columns of a two-column daterange have to be of type DATE.")
-	default boolean isValidTwoColumnDaterange() {
+	default boolean isValidTwoColumnDaterangeSelect() {
 		if (getStartColumn() == null || getEndColumn() == null) {
 			return true;
 		}
@@ -52,7 +57,7 @@ default boolean isValidTwoColumnDaterange() {
 
 	@JsonIgnore
 	@ValidationMethod(message = "Column is not of type DATE or DATE_RANGE.")
-	default boolean isValidValidityDatesSingleColumn() {
+	default boolean isValidSingleColumnDateSelect() {
 		if (getColumn() == null) {
 			return true;
 		}

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

@@ -25,7 +25,7 @@
 @Setter
 @NoArgsConstructor
 @Slf4j
-public class ValidityDate extends Labeled<ValidityDateId> implements NamespacedIdentifiable<ValidityDateId>, DaterangeSelect {
+public class ValidityDate extends Labeled<ValidityDateId> implements NamespacedIdentifiable<ValidityDateId>, DaterangeSelectOrFilter {
 
 	@NsIdRef
 	@Nullable

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/CountQuartersFilter.java

@@ -1,14 +1,18 @@
 package com.bakdata.conquery.models.datasets.concepts.filters.specific;
 
-import java.util.EnumSet;
+import java.util.List;
+
+import javax.annotation.Nullable;
 
 import com.bakdata.conquery.apiv1.frontend.FrontendFilterConfiguration;
 import com.bakdata.conquery.apiv1.frontend.FrontendFilterType;
 import com.bakdata.conquery.io.cps.CPSType;
+import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
 import com.bakdata.conquery.models.common.Range;
 import com.bakdata.conquery.models.config.ConqueryConfig;
+import com.bakdata.conquery.models.datasets.Column;
+import com.bakdata.conquery.models.datasets.concepts.DaterangeSelectOrFilter;
 import com.bakdata.conquery.models.datasets.concepts.filters.Filter;
-import com.bakdata.conquery.models.datasets.concepts.filters.SingleColumnFilter;
 import com.bakdata.conquery.models.events.MajorTypeId;
 import com.bakdata.conquery.models.query.filter.RangeFilterNode;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.CountQuartersOfDateRangeAggregator;
@@ -22,19 +26,32 @@
 @Setter
 @Getter
 @CPSType(id = "COUNT_QUARTERS", base = Filter.class)
-public class CountQuartersFilter extends SingleColumnFilter<Range.LongRange> {
+public class CountQuartersFilter extends Filter<Range.LongRange> implements DaterangeSelectOrFilter {
 
-	@Override
-	public EnumSet<MajorTypeId> getAcceptedColumnTypes() {
-		return EnumSet.of(MajorTypeId.DATE, MajorTypeId.DATE_RANGE);
-	}
+	@NsIdRef
+	@Nullable
+	private Column column;
+	@NsIdRef
+	@Nullable
+	private Column startColumn;
+	@NsIdRef
+	@Nullable
+	private Column endColumn;
 
 	@Override
 	public void configureFrontend(FrontendFilterConfiguration.Top f, ConqueryConfig conqueryConfig) {
 		f.setType(FrontendFilterType.Fields.INTEGER_RANGE);
 		f.setMin(1);
 	}
 
+	@Override
+	public List<Column> getRequiredColumns() {
+		if (isSingleColumnDaterange()) {
+			return List.of(column);
+		}
+		return List.of(startColumn, endColumn);
+	}
+
 	@Override
 	public FilterNode createFilterNode(Range.LongRange value) {
 		if (getColumn().getType() == MajorTypeId.DATE_RANGE) {
@@ -47,4 +64,5 @@ public FilterNode createFilterNode(Range.LongRange value) {
 	public FilterConverter<CountQuartersFilter, Range.LongRange> createConverter() {
 		return new CountQuartersSqlAggregator();
 	}
+
 }

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/CountQuartersSelect.java

@@ -1,36 +1,51 @@
 package com.bakdata.conquery.models.datasets.concepts.select.connector.specific;
 
-import java.util.EnumSet;
+import java.util.List;
+
+import javax.annotation.Nullable;
 
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
 import com.bakdata.conquery.models.datasets.Column;
+import com.bakdata.conquery.models.datasets.concepts.DaterangeSelectOrFilter;
 import com.bakdata.conquery.models.datasets.concepts.select.Select;
-import com.bakdata.conquery.models.datasets.concepts.select.connector.SingleColumnSelect;
-import com.bakdata.conquery.models.events.MajorTypeId;
 import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.CountQuartersOfDateRangeAggregator;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.CountQuartersOfDatesAggregator;
 import com.bakdata.conquery.models.types.ResultType;
 import com.bakdata.conquery.sql.conversion.model.aggregator.CountQuartersSqlAggregator;
 import com.bakdata.conquery.sql.conversion.model.select.SelectConverter;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 /**
  * Entity is included when the number of distinct quarters for all events is within a given range.
  * Implementation is specific for DateRanges
  */
+@Setter
+@Getter
+@NoArgsConstructor(onConstructor_ = @JsonCreator)
 @CPSType(id = "COUNT_QUARTERS", base = Select.class)
-public class CountQuartersSelect extends SingleColumnSelect {
+public class CountQuartersSelect extends Select implements DaterangeSelectOrFilter {
 
-	@Override
-	public EnumSet<MajorTypeId> getAcceptedColumnTypes() {
-		return EnumSet.of(MajorTypeId.DATE, MajorTypeId.DATE_RANGE);
-	}
+	@NsIdRef
+	@Nullable
+	private Column column;
+	@NsIdRef
+	@Nullable
+	private Column startColumn;
+	@NsIdRef
+	@Nullable
+	private Column endColumn;
 
-	@JsonCreator
-	public CountQuartersSelect(@NsIdRef Column column) {
-		super(column);
+	@Override
+	public List<Column> getRequiredColumns() {
+		if (isSingleColumnDaterange()) {
+			return List.of(column);
+		}
+		return List.of(startColumn, endColumn);
 	}
 
 	@Override
@@ -44,12 +59,12 @@ public Aggregator<?> createAggregator() {
 	}
 
 	@Override
-	public SelectConverter<CountQuartersSelect> createConverter() {
-		return new CountQuartersSqlAggregator();
+	public ResultType<?> getResultType() {
+		return ResultType.IntegerT.INSTANCE;
 	}
 
 	@Override
-	public ResultType<?> getResultType() {
-		return ResultType.IntegerT.INSTANCE;
+	public SelectConverter<CountQuartersSelect> createConverter() {
+		return new CountQuartersSqlAggregator();
 	}
 }

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/DateUnionSelect.java

@@ -7,7 +7,7 @@
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
 import com.bakdata.conquery.models.datasets.Column;
-import com.bakdata.conquery.models.datasets.concepts.DaterangeSelect;
+import com.bakdata.conquery.models.datasets.concepts.DaterangeSelectOrFilter;
 import com.bakdata.conquery.models.datasets.concepts.select.Select;
 import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.DateUnionAggregator;
@@ -23,7 +23,7 @@
 @NoArgsConstructor(onConstructor_ = @JsonCreator)
 @CPSType(id = "DATE_UNION", base = Select.class)
 @JsonIgnoreProperties("categorical")
-public class DateUnionSelect extends Select implements DaterangeSelect {
+public class DateUnionSelect extends Select implements DaterangeSelectOrFilter {
 
 	@NsIdRef
 	@Nullable

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/DurationSumSelect.java

@@ -7,7 +7,7 @@
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
 import com.bakdata.conquery.models.datasets.Column;
-import com.bakdata.conquery.models.datasets.concepts.DaterangeSelect;
+import com.bakdata.conquery.models.datasets.concepts.DaterangeSelectOrFilter;
 import com.bakdata.conquery.models.datasets.concepts.select.Select;
 import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.DurationSumAggregator;
@@ -23,7 +23,7 @@
 @NoArgsConstructor(onConstructor_ = @JsonCreator)
 @CPSType(id = "DURATION_SUM", base = Select.class)
 @JsonIgnoreProperties("categorical")
-public class DurationSumSelect extends Select implements DaterangeSelect {
+public class DurationSumSelect extends Select implements DaterangeSelectOrFilter {
 
 	@NsIdRef
 	@Nullable

backend/src/main/java/com/bakdata/conquery/sql/conversion/forms/Interval.java → backend/src/main/java/com/bakdata/conquery/sql/conversion/dialect/Interval.java

@@ -1,11 +1,11 @@
-package com.bakdata.conquery.sql.conversion.forms;
+package com.bakdata.conquery.sql.conversion.dialect;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 @Getter
 @RequiredArgsConstructor
-enum Interval {
+public enum Interval {
 
 	ONE_YEAR_INTERVAL(1),
 	YEAR_AS_DAYS_INTERVAL(365),

backend/src/main/java/com/bakdata/conquery/sql/conversion/forms/HanaStratificationFunctions.java

@@ -1,20 +1,20 @@
 package com.bakdata.conquery.sql.conversion.forms;
 
-import static com.bakdata.conquery.sql.conversion.forms.Interval.MONTHS_PER_QUARTER;
+import static com.bakdata.conquery.sql.conversion.dialect.Interval.MONTHS_PER_QUARTER;
 
 import java.sql.Date;
 import java.time.temporal.ChronoUnit;
 
 import com.bakdata.conquery.apiv1.query.concept.specific.temporal.TemporalSamplerFactory;
 import com.bakdata.conquery.sql.conversion.dialect.HanaSqlFunctionProvider;
+import com.bakdata.conquery.sql.conversion.dialect.Interval;
 import com.bakdata.conquery.sql.conversion.model.ColumnDateRange;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Table;
 import org.jooq.impl.DSL;
-import org.jooq.impl.QOM;
 import org.jooq.impl.SQLDataType;
 
 @Getter
@@ -32,7 +32,7 @@ class HanaStratificationFunctions extends StratificationFunctions {
 	private final HanaSqlFunctionProvider functionProvider;
 
 	@Override
-	protected Field<Date> lower(ColumnDateRange dateRange) {
+	public Field<Date> lower(ColumnDateRange dateRange) {
 		// HANA does not support single-column ranges, so we can return start and end directly
 		return dateRange.getStart();
 	}
@@ -96,7 +96,7 @@ public Field<Date> lowerBoundQuarterStart(ColumnDateRange dateRange) {
 	}
 
 	@Override
-	protected Field<Date> jumpToQuarterStart(Field<Date> date) {
+	public Field<Date> jumpToQuarterStart(Field<Date> date) {
 		Field<Date> yearStart = jumpToYearStart(date);
 		Field<Integer> quartersInMonths = getQuartersInMonths(date, Offset.MINUS_ONE);
 		return addMonths(yearStart, quartersInMonths);
@@ -108,7 +108,7 @@ public Field<Date> upperBoundQuarterEnd(ColumnDateRange dateRange) {
 	}
 
 	@Override
-	protected Field<Date> jumpToNextQuarterStart(Field<Date> date) {
+	public Field<Date> jumpToNextQuarterStart(Field<Date> date) {
 		Field<Date> yearStart = jumpToYearStart(date);
 		Field<Integer> quartersInMonths = getQuartersInMonths(date, Offset.NONE);
 		return addMonths(yearStart, quartersInMonths);

backend/src/main/java/com/bakdata/conquery/sql/conversion/forms/PostgresStratificationFunctions.java

@@ -9,6 +9,7 @@
 import java.util.Map;
 
 import com.bakdata.conquery.apiv1.query.concept.specific.temporal.TemporalSamplerFactory;
+import com.bakdata.conquery.sql.conversion.dialect.Interval;
 import com.bakdata.conquery.sql.conversion.dialect.PostgreSqlFunctionProvider;
 import com.bakdata.conquery.sql.conversion.model.ColumnDateRange;
 import lombok.Getter;
@@ -83,7 +84,7 @@ public Field<Date> lowerBoundQuarterStart(ColumnDateRange dateRange) {
 	}
 
 	@Override
-	protected Field<Date> jumpToQuarterStart(Field<Date> date) {
+	public Field<Date> jumpToQuarterStart(Field<Date> date) {
 		Field<Integer> quarter = functionProvider.extract(DatePart.QUARTER, date);
 		return addQuarters(jumpToYearStart(date), quarter, Offset.MINUS_ONE);
 	}
@@ -95,7 +96,7 @@ public Field<Date> upperBoundQuarterEnd(ColumnDateRange dateRange) {
 	}
 
 	@Override
-	protected Field<Date> jumpToNextQuarterStart(Field<Date> date) {
+	public Field<Date> jumpToNextQuarterStart(Field<Date> date) {
 		Field<Timestamp> yearStart = dateTruncate(DSL.val("year"), date);
 		Field<Integer> quarter = functionProvider.extract(DatePart.QUARTER, date);
 		return addQuarters(yearStart, quarter, Offset.NONE);
@@ -137,7 +138,7 @@ public Field<Date> shiftByInterval(Field<Date> startDate, Interval interval, Fie
 	}
 
 	@Override
-	protected Field<Date> lower(ColumnDateRange dateRange) {
+	public Field<Date> lower(ColumnDateRange dateRange) {
 		checkIsSingleColumnRange(dateRange);
 		return DSL.function("lower", Date.class, dateRange.getRange());
 	}

backend/src/main/java/com/bakdata/conquery/sql/conversion/forms/RelativeStratification.java

@@ -19,6 +19,7 @@
 import com.bakdata.conquery.models.forms.util.CalendarUnit;
 import com.bakdata.conquery.models.forms.util.Resolution;
 import com.bakdata.conquery.sql.conversion.SharedAliases;
+import com.bakdata.conquery.sql.conversion.dialect.Interval;
 import com.bakdata.conquery.sql.conversion.dialect.SqlFunctionProvider;
 import com.bakdata.conquery.sql.conversion.model.ColumnDateRange;
 import com.bakdata.conquery.sql.conversion.model.QueryStep;
@@ -278,7 +279,7 @@ private static Range<Integer> toGenerateSeriesBounds(RelativeFormQuery relativeF
 		}
 
 		return Range.of(
-				- timeCountBefore,
+				-timeCountBefore,
 				timeCountAfter
 		);
 	}