Skip to content

Commit

Permalink
Merge pull request #3615 from ingef/release
Browse files Browse the repository at this point in the history 
Merge Release
  • Loading branch information
@thoniTUB
thoniTUB authored Nov 27, 2024
2 parents 3e3d0d1 + 14a13ab commit 8ead51d
Show file tree
Hide file tree
Showing 493 changed files with 13,403 additions and 15,949 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,4 @@ tutorial/mimic_iii_demo/data/**
/node_modules
cypress/screenshots/
cypress/videos/
/cypress/support/test_data/table.cqpp
6 changes: 0 additions & 6 deletions autodoc/src/main/java/com/bakdata/conquery/Constants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@
import com.bakdata.conquery.apiv1.query.concept.filter.FilterValue;
import com.bakdata.conquery.apiv1.query.concept.filter.ValidityDateContainer;
import com.bakdata.conquery.io.cps.CPSType;
import com.bakdata.conquery.io.jackson.serializer.MetaIdRef;
import com.bakdata.conquery.io.jackson.serializer.MetaIdRefCollection;
import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
import com.bakdata.conquery.io.jackson.serializer.NsIdRefCollection;
import com.bakdata.conquery.model.Base;
import com.bakdata.conquery.model.Group;
import com.bakdata.conquery.models.common.Range;
Expand Down Expand Up @@ -182,8 +178,6 @@ public class Constants {

public static final String JSON_CREATOR = JsonCreator.class.getName();
public static final String CPS_TYPE = CPSType.class.getName();
public static final Set<String> ID_REF = Set.of(NsIdRef.class.getName(), MetaIdRef.class.getName());
public static final Set<String> ID_REF_COL = Set.of(NsIdRefCollection.class.getName(), MetaIdRefCollection.class.getName());
public static final String JSON_IGNORE = JsonIgnore.class.getName();
public static final String JSON_BACK_REFERENCE = JsonBackReference.class.getName();
public static final String PATH = Path.class.getName();
Expand Down
11 changes: 1 addition & 10 deletions autodoc/src/main/java/com/bakdata/conquery/handler/GroupHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,16 +267,7 @@ private void handleField(ClassInfo currentType, FieldInfo field) throws IOExcept
final TypeSignature typeSignature = field.getTypeSignatureOrTypeDescriptor();
final Ctx ctx = new Ctx().withField(field);

final String type;
if (ID_REF.stream().anyMatch(field::hasAnnotation)) {
type = ID_OF + printType(ctx.withIdOf(true), typeSignature);
}
else if (ID_REF_COL.stream().anyMatch(field::hasAnnotation)) {
type = LIST_OF + ID_OF + StringUtils.removeStart(printType(ctx.withIdOf(true), typeSignature), LIST_OF);
}
else {
type = printType(ctx, typeSignature);
}
final String type = printType(ctx, typeSignature);

out.table(
editLink(introspec),
Expand Down
97 changes: 69 additions & 28 deletions backend/src/main/java/com/bakdata/conquery/ResultHeaders.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,64 +9,105 @@
import com.bakdata.conquery.models.query.PrintSettings;
import com.bakdata.conquery.models.query.resultinfo.FixedLabelResultInfo;
import com.bakdata.conquery.models.query.resultinfo.ResultInfo;
import com.bakdata.conquery.models.query.resultinfo.printers.ResultPrinters;
import com.bakdata.conquery.models.query.resultinfo.printers.Printer;
import com.bakdata.conquery.models.query.resultinfo.printers.PrinterFactory;
import com.bakdata.conquery.models.query.resultinfo.printers.common.LocalizedEnumPrinter;
import com.bakdata.conquery.models.types.ResultType;
import com.bakdata.conquery.models.types.SemanticType;
import lombok.experimental.UtilityClass;

@UtilityClass
public class ResultHeaders {
public static ResultInfo datesInfo(PrintSettings settings) {
final String label = C10nCache.getLocalized(ResultHeadersC10n.class, settings.getLocale()).dates();
public static ResultInfo datesInfo() {

final ResultType.ListT<Object> type = new ResultType.ListT<>(ResultType.Primitive.DATE_RANGE);

return new FixedLabelResultInfo(label, label, type, Set.of(new SemanticType.EventDateT()), settings, ResultPrinters.printerFor(type, settings));
return new FixedLabelResultInfo(type, Set.of(new SemanticType.EventDateT())){
@Override
public String userColumnName(PrintSettings printSettings) {
return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).dates();
}
};
}

public static ResultInfo historyDatesInfo(PrintSettings settings) {
final String label = C10nCache.getLocalized(ResultHeadersC10n.class, settings.getLocale()).dates();
public static ResultInfo historyDatesInfo() {

final ResultType.ListT<Object> type = new ResultType.ListT<>(ResultType.Primitive.DATE_RANGE);

return new FixedLabelResultInfo(label, label, type, Set.of(new SemanticType.EventDateT(), new SemanticType.GroupT()), settings, ResultPrinters.printerFor(type, settings));
return new FixedLabelResultInfo(type, Set.of(new SemanticType.EventDateT(), new SemanticType.GroupT())) {
@Override
public String userColumnName(PrintSettings printSettings) {
return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).dates();
}
};
}

public static ResultInfo sourceInfo(PrintSettings settings) {
final String label = C10nCache.getLocalized(ResultHeadersC10n.class, settings.getLocale()).source();

return new FixedLabelResultInfo(label, label, ResultType.Primitive.STRING, Set.of(new SemanticType.SourcesT(), new SemanticType.CategoricalT(), new SemanticType.GroupT()), settings, ResultPrinters.printerFor(ResultType.Primitive.STRING, settings));
public static ResultInfo sourceInfo() {
return new FixedLabelResultInfo(ResultType.Primitive.STRING, Set.of(new SemanticType.SourcesT(), new SemanticType.CategoricalT(), new SemanticType.GroupT())) {
@Override
public String userColumnName(PrintSettings printSettings) {
return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).source();
}
};
}

public static ResultInfo formContextInfo(PrintSettings settings) {
final String label = C10nCache.getLocalized(ResultHeadersC10n.class, settings.getLocale()).index();
public static ResultInfo formContextInfo() {

return new FixedLabelResultInfo(label, label, ResultType.Primitive.INTEGER, Set.of(), settings, ResultPrinters.printerFor(ResultType.Primitive.INTEGER, settings));
return new FixedLabelResultInfo(ResultType.Primitive.INTEGER, Set.of()) {
@Override
public String userColumnName(PrintSettings printSettings) {
return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).index();
}
};
}

public static ResultInfo formDateRangeInfo(PrintSettings settings) {
final String label = C10nCache.getLocalized(ResultHeadersC10n.class, settings.getLocale())
.dateRange();
public static ResultInfo formDateRangeInfo() {

return new FixedLabelResultInfo(label, label, ResultType.Primitive.DATE_RANGE, Set.of(), settings, ResultPrinters.printerFor(ResultType.Primitive.DATE_RANGE, settings));
return new FixedLabelResultInfo(ResultType.Primitive.DATE_RANGE, Set.of()) {
@Override
public String userColumnName(PrintSettings printSettings) {
return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).dateRange();
}
};
}

public static ResultInfo formResolutionInfo(PrintSettings settings) {
final String label = C10nCache.getLocalized(ResultHeadersC10n.class, settings.getLocale()).resolution();
public static ResultInfo formResolutionInfo() {

return new FixedLabelResultInfo(ResultType.Primitive.STRING, Set.of()) {
@Override
public Printer createPrinter(PrinterFactory printerFactory, PrintSettings printSettings) {
return new LocalizedEnumPrinter<>(printSettings, Resolution.class);
}

return new FixedLabelResultInfo(label, label, ResultType.Primitive.STRING, Set.of(), settings, new ResultPrinters.LocalizedEnumPrinter<>(settings, Resolution.class));
@Override
public String userColumnName(PrintSettings printSettings) {
return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).resolution();
}
};
}

public static ResultInfo formEventDateInfo(PrintSettings settings) {
final String label = C10nCache.getLocalized(ResultHeadersC10n.class, settings.getLocale())
.eventDate();
public static ResultInfo formEventDateInfo() {

return new FixedLabelResultInfo(label, label, ResultType.Primitive.DATE, Set.of(), settings, ResultPrinters.printerFor(ResultType.Primitive.DATE, settings));
return new FixedLabelResultInfo(ResultType.Primitive.DATE, Set.of()) {
@Override
public String userColumnName(PrintSettings printSettings) {
return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).eventDate();
}
};
}

public static ResultInfo formObservationScopeInfo(PrintSettings settings) {
final String label = C10nCache.getLocalized(ResultHeadersC10n.class, settings.getLocale()).observationScope();
public static ResultInfo formObservationScopeInfo() {

return new FixedLabelResultInfo(ResultType.Primitive.STRING, Set.of()) {
@Override
public Printer createPrinter(PrinterFactory printerFactory, PrintSettings printSettings) {
return new LocalizedEnumPrinter<>(printSettings, FeatureGroup.class);
}

return new FixedLabelResultInfo(label, label, ResultType.Primitive.STRING, Set.of(), settings, new ResultPrinters.LocalizedEnumPrinter<>(settings, FeatureGroup.class));
@Override
public String userColumnName(PrintSettings printSettings) {
return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).observationScope();
}
};
}
}
10 changes: 5 additions & 5 deletions backend/src/main/java/com/bakdata/conquery/apiv1/FilterTemplate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@

import com.bakdata.conquery.apiv1.frontend.FrontendValue;
import com.bakdata.conquery.io.cps.CPSType;
import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
import com.bakdata.conquery.models.config.IndexConfig;
import com.bakdata.conquery.models.datasets.Dataset;
import com.bakdata.conquery.models.datasets.concepts.Searchable;
import com.bakdata.conquery.models.identifiable.IdentifiableImpl;
import com.bakdata.conquery.models.identifiable.ids.specific.DatasetId;
import com.bakdata.conquery.models.identifiable.ids.specific.SearchIndexId;
import com.bakdata.conquery.models.index.FrontendValueIndex;
import com.bakdata.conquery.models.index.FrontendValueIndexKey;
Expand Down Expand Up @@ -41,9 +40,10 @@
@CPSType(id = "CSV_TEMPLATE", base = SearchIndex.class)
public class FilterTemplate extends IdentifiableImpl<SearchIndexId> implements Searchable, SearchIndex {

private static final long serialVersionUID = 1L;

@NotNull
@NsIdRef
private Dataset dataset;
private DatasetId dataset;

@NotEmpty
private final String name;
Expand Down Expand Up @@ -106,6 +106,6 @@ public TrieSearch<FrontendValue> createTrieSearch(IndexConfig config) throws Ind

@Override
public SearchIndexId createId() {
return new SearchIndexId(dataset.getId(), name);
return new SearchIndexId(dataset, name);
}
}
Loading

0 comments on commit 8ead51d

Please sign in to comment.