From dacd3fc86bb7cbf133a0435f4e1d38fafc5eb33b Mon Sep 17 00:00:00 2001 From: Alexander Taepper Date: Thu, 21 Mar 2024 21:11:41 +0100 Subject: [PATCH] feat: details no longer shows insertions --- .../test/queries/DetailsOrderBy.json | 102 ------------------ .../test/queries/DetailsOrderByLimit.json | 4 - .../test/queries/LimitLargerThanTable.json | 102 ------------------ endToEndTests/test/queries/Offset0.json | 102 ------------------ .../test/queries/OffsetLimitOverlap.json | 20 ---- .../test/queries/nOf_2of3_details.json | 44 ++++---- src/silo/query_engine/actions/details.cpp | 7 +- 7 files changed, 24 insertions(+), 357 deletions(-) diff --git a/endToEndTests/test/queries/DetailsOrderBy.json b/endToEndTests/test/queries/DetailsOrderBy.json index c3318b2ee..930baa48a 100644 --- a/endToEndTests/test/queries/DetailsOrderBy.json +++ b/endToEndTests/test/queries/DetailsOrderBy.json @@ -25,12 +25,10 @@ "expectedQueryResult": [ { "age": 57, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-02-10", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_1080536", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.97, "region": "Europe", @@ -38,12 +36,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-02-14", "division": "Graubünden", "gisaid_epi_isl": "EPI_ISL_1119315", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.95, "region": "Europe", @@ -51,12 +47,10 @@ }, { "age": 54, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2020-12-29", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_1129663", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -64,12 +58,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-02-23", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1195052", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.95, "region": "Europe", @@ -77,12 +69,10 @@ }, { "age": 51, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-01-26", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_1273458", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -90,12 +80,10 @@ }, { "age": 57, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-08", "division": "Jura", "gisaid_epi_isl": "EPI_ISL_1360935", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -103,12 +91,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-06", "division": "Zürich", "gisaid_epi_isl": "EPI_ISL_1361468", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -116,12 +102,10 @@ }, { "age": 55, - "aminoAcidInsertions": null, "country": "Switzerland", "date": null, "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1407962", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.93, "region": "Europe", @@ -129,12 +113,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-03", "division": "Valais", "gisaid_epi_isl": "EPI_ISL_1408062", - "nucleotideInsertions": "22204:CAGAA", "pango_lineage": "B.1.1.7", "qc_value": 0.97, "region": "Europe", @@ -142,12 +124,10 @@ }, { "age": 4, - "aminoAcidInsertions": "S:214:EPE", "country": "Switzerland", "date": "2021-03-18", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_1408408", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -155,12 +135,10 @@ }, { "age": 51, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-21", "division": "Vaud", "gisaid_epi_isl": "EPI_ISL_1597890", - "nucleotideInsertions": "22339:GCTGGT", "pango_lineage": "B.1.1.7", "qc_value": 0.96, "region": null, @@ -168,12 +146,10 @@ }, { "age": 54, - "aminoAcidInsertions": "S:214:EPE", "country": "Switzerland", "date": "2021-03-19", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1597932", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -181,12 +157,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-05", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_1747752", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.93, "region": "Europe", @@ -194,12 +168,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-09", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1747885", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -207,12 +179,10 @@ }, { "age": 52, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-03", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1748215", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.9, "region": "Europe", @@ -220,12 +190,10 @@ }, { "age": null, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-02", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1748243", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -233,12 +201,10 @@ }, { "age": 53, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-25", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_1748395", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.89, "region": "Europe", @@ -246,12 +212,10 @@ }, { "age": 4, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-13", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_1749892", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.95, "region": "Europe", @@ -259,12 +223,10 @@ }, { "age": 5, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-13", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_1749899", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.97, "region": "Europe", @@ -272,12 +234,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-15", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_1749960", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.89, "region": "Europe", @@ -285,12 +245,10 @@ }, { "age": 54, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-12", "division": "Ticino", "gisaid_epi_isl": "EPI_ISL_1760534", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -298,12 +256,10 @@ }, { "age": 56, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-23", "division": "Ticino", "gisaid_epi_isl": "EPI_ISL_1840634", - "nucleotideInsertions": null, "pango_lineage": "Q.7", "qc_value": 0.96, "region": "Europe", @@ -311,12 +267,10 @@ }, { "age": 6, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-25", "division": "Aargau", "gisaid_epi_isl": "EPI_ISL_2016901", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.96, "region": "Europe", @@ -324,12 +278,10 @@ }, { "age": 56, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-23", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_2017036", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -337,12 +289,10 @@ }, { "age": 58, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-28", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_2019235", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.9, "region": "Europe", @@ -350,12 +300,10 @@ }, { "age": 55, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-27", "division": "Valais", "gisaid_epi_isl": "EPI_ISL_2019350", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.92, "region": "Europe", @@ -363,12 +311,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-12", "division": "Ticino", "gisaid_epi_isl": "EPI_ISL_2180023", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.93, "region": "Europe", @@ -376,12 +322,10 @@ }, { "age": 57, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-09", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_2180995", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.95, "region": "Europe", @@ -389,12 +333,10 @@ }, { "age": 58, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-05", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_2181005", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -402,12 +344,10 @@ }, { "age": 51, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-08", "division": "Geneva", "gisaid_epi_isl": "EPI_ISL_2213804", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "Q.7", "qc_value": null, "region": "Europe", @@ -415,12 +355,10 @@ }, { "age": 53, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-13", "division": "Geneva", "gisaid_epi_isl": "EPI_ISL_2213934", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.93, "region": "Europe", @@ -428,12 +366,10 @@ }, { "age": 54, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-08", "division": "Geneva", "gisaid_epi_isl": "EPI_ISL_2213984", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.92, "region": "Europe", @@ -441,12 +377,10 @@ }, { "age": 58, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-10", "division": "Geneva", "gisaid_epi_isl": "EPI_ISL_2214128", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.89, "region": "Europe", @@ -454,12 +388,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-10", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_2270139", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.92, "region": "Europe", @@ -467,12 +399,10 @@ }, { "age": 52, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-11", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_2307766", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.89, "region": "Europe", @@ -480,12 +410,10 @@ }, { "age": 55, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-08", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_2307888", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.96, "region": "Europe", @@ -493,12 +421,10 @@ }, { "age": 57, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-07", "division": "Zürich", "gisaid_epi_isl": "EPI_ISL_2308054", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -506,12 +432,10 @@ }, { "age": 57, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-23", "division": "Ticino", "gisaid_epi_isl": "EPI_ISL_2360326", - "nucleotideInsertions": null, "pango_lineage": "Q.7", "qc_value": 0.89, "region": "Europe", @@ -519,12 +443,10 @@ }, { "age": 54, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-18", "division": "Aargau", "gisaid_epi_isl": "EPI_ISL_2374969", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.97, "region": "Europe", @@ -532,12 +454,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-16", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_2375097", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.92, "region": "Europe", @@ -545,12 +465,10 @@ }, { "age": 58, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-18", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_2375165", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.93, "region": "Europe", @@ -558,12 +476,10 @@ }, { "age": 56, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-14", "division": "Sankt Gallen", "gisaid_epi_isl": "EPI_ISL_2375247", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": null, "region": "Europe", @@ -571,12 +487,10 @@ }, { "age": 53, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-10", "division": "Valais", "gisaid_epi_isl": "EPI_ISL_2375490", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -584,12 +498,10 @@ }, { "age": 58, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-11", "division": "Valais", "gisaid_epi_isl": "EPI_ISL_2379651", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -597,12 +509,10 @@ }, { "age": 52, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-24", "division": "Vaud", "gisaid_epi_isl": "EPI_ISL_2405276", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -610,12 +520,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-25", "division": "Obwalden", "gisaid_epi_isl": "EPI_ISL_2408472", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -623,12 +531,10 @@ }, { "age": 56, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-06-05", "division": "Ticino", "gisaid_epi_isl": "EPI_ISL_2544226", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.9, "region": "Europe", @@ -636,12 +542,10 @@ }, { "age": 51, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-06-03", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_2544332", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.9, "region": "Europe", @@ -649,12 +553,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-06-01", "division": "Schwyz", "gisaid_epi_isl": "EPI_ISL_2544452", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -662,12 +564,10 @@ }, { "age": 55, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-06-10", "division": "Sankt Gallen", "gisaid_epi_isl": "EPI_ISL_2574088", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -675,12 +575,10 @@ }, { "age": null, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-07-05", "division": "Valais", "gisaid_epi_isl": "EPI_ISL_3016465", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.95, "region": "Europe", diff --git a/endToEndTests/test/queries/DetailsOrderByLimit.json b/endToEndTests/test/queries/DetailsOrderByLimit.json index 534573278..a45fb6d02 100644 --- a/endToEndTests/test/queries/DetailsOrderByLimit.json +++ b/endToEndTests/test/queries/DetailsOrderByLimit.json @@ -27,12 +27,10 @@ "expectedQueryResult": [ { "age": 4, - "aminoAcidInsertions": "S:214:EPE", "country": "Switzerland", "date": "2021-03-18", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_1408408", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -40,12 +38,10 @@ }, { "age": 51, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-21", "division": "Vaud", "gisaid_epi_isl": "EPI_ISL_1597890", - "nucleotideInsertions": "22339:GCTGGT", "pango_lineage": "B.1.1.7", "qc_value": 0.96, "region": null, diff --git a/endToEndTests/test/queries/LimitLargerThanTable.json b/endToEndTests/test/queries/LimitLargerThanTable.json index 0a1658007..742d8d9bd 100644 --- a/endToEndTests/test/queries/LimitLargerThanTable.json +++ b/endToEndTests/test/queries/LimitLargerThanTable.json @@ -26,12 +26,10 @@ "expectedQueryResult": [ { "age": 57, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-02-10", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_1080536", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.97, "region": "Europe", @@ -39,12 +37,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-02-14", "division": "Graubünden", "gisaid_epi_isl": "EPI_ISL_1119315", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.95, "region": "Europe", @@ -52,12 +48,10 @@ }, { "age": 54, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2020-12-29", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_1129663", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -65,12 +59,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-02-23", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1195052", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.95, "region": "Europe", @@ -78,12 +70,10 @@ }, { "age": 51, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-01-26", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_1273458", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -91,12 +81,10 @@ }, { "age": 57, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-08", "division": "Jura", "gisaid_epi_isl": "EPI_ISL_1360935", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -104,12 +92,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-06", "division": "Zürich", "gisaid_epi_isl": "EPI_ISL_1361468", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -117,12 +103,10 @@ }, { "age": 55, - "aminoAcidInsertions": null, "country": "Switzerland", "date": null, "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1407962", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.93, "region": "Europe", @@ -130,12 +114,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-03", "division": "Valais", "gisaid_epi_isl": "EPI_ISL_1408062", - "nucleotideInsertions": "22204:CAGAA", "pango_lineage": "B.1.1.7", "qc_value": 0.97, "region": "Europe", @@ -143,12 +125,10 @@ }, { "age": 4, - "aminoAcidInsertions": "S:214:EPE", "country": "Switzerland", "date": "2021-03-18", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_1408408", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -156,12 +136,10 @@ }, { "age": 51, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-21", "division": "Vaud", "gisaid_epi_isl": "EPI_ISL_1597890", - "nucleotideInsertions": "22339:GCTGGT", "pango_lineage": "B.1.1.7", "qc_value": 0.96, "region": null, @@ -169,12 +147,10 @@ }, { "age": 54, - "aminoAcidInsertions": "S:214:EPE", "country": "Switzerland", "date": "2021-03-19", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1597932", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -182,12 +158,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-05", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_1747752", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.93, "region": "Europe", @@ -195,12 +169,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-09", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1747885", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -208,12 +180,10 @@ }, { "age": 52, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-03", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1748215", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.9, "region": "Europe", @@ -221,12 +191,10 @@ }, { "age": null, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-02", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1748243", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -234,12 +202,10 @@ }, { "age": 53, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-25", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_1748395", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.89, "region": "Europe", @@ -247,12 +213,10 @@ }, { "age": 4, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-13", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_1749892", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.95, "region": "Europe", @@ -260,12 +224,10 @@ }, { "age": 5, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-13", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_1749899", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.97, "region": "Europe", @@ -273,12 +235,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-15", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_1749960", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.89, "region": "Europe", @@ -286,12 +246,10 @@ }, { "age": 54, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-12", "division": "Ticino", "gisaid_epi_isl": "EPI_ISL_1760534", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -299,12 +257,10 @@ }, { "age": 56, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-23", "division": "Ticino", "gisaid_epi_isl": "EPI_ISL_1840634", - "nucleotideInsertions": null, "pango_lineage": "Q.7", "qc_value": 0.96, "region": "Europe", @@ -312,12 +268,10 @@ }, { "age": 6, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-25", "division": "Aargau", "gisaid_epi_isl": "EPI_ISL_2016901", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.96, "region": "Europe", @@ -325,12 +279,10 @@ }, { "age": 56, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-23", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_2017036", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -338,12 +290,10 @@ }, { "age": 58, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-28", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_2019235", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.9, "region": "Europe", @@ -351,12 +301,10 @@ }, { "age": 55, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-27", "division": "Valais", "gisaid_epi_isl": "EPI_ISL_2019350", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.92, "region": "Europe", @@ -364,12 +312,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-12", "division": "Ticino", "gisaid_epi_isl": "EPI_ISL_2180023", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.93, "region": "Europe", @@ -377,12 +323,10 @@ }, { "age": 57, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-09", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_2180995", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.95, "region": "Europe", @@ -390,12 +334,10 @@ }, { "age": 58, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-05", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_2181005", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -403,12 +345,10 @@ }, { "age": 51, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-08", "division": "Geneva", "gisaid_epi_isl": "EPI_ISL_2213804", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "Q.7", "qc_value": null, "region": "Europe", @@ -416,12 +356,10 @@ }, { "age": 53, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-13", "division": "Geneva", "gisaid_epi_isl": "EPI_ISL_2213934", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.93, "region": "Europe", @@ -429,12 +367,10 @@ }, { "age": 54, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-08", "division": "Geneva", "gisaid_epi_isl": "EPI_ISL_2213984", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.92, "region": "Europe", @@ -442,12 +378,10 @@ }, { "age": 58, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-10", "division": "Geneva", "gisaid_epi_isl": "EPI_ISL_2214128", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.89, "region": "Europe", @@ -455,12 +389,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-10", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_2270139", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.92, "region": "Europe", @@ -468,12 +400,10 @@ }, { "age": 52, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-11", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_2307766", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.89, "region": "Europe", @@ -481,12 +411,10 @@ }, { "age": 55, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-08", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_2307888", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.96, "region": "Europe", @@ -494,12 +422,10 @@ }, { "age": 57, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-07", "division": "Zürich", "gisaid_epi_isl": "EPI_ISL_2308054", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -507,12 +433,10 @@ }, { "age": 57, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-23", "division": "Ticino", "gisaid_epi_isl": "EPI_ISL_2360326", - "nucleotideInsertions": null, "pango_lineage": "Q.7", "qc_value": 0.89, "region": "Europe", @@ -520,12 +444,10 @@ }, { "age": 54, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-18", "division": "Aargau", "gisaid_epi_isl": "EPI_ISL_2374969", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.97, "region": "Europe", @@ -533,12 +455,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-16", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_2375097", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.92, "region": "Europe", @@ -546,12 +466,10 @@ }, { "age": 58, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-18", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_2375165", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.93, "region": "Europe", @@ -559,12 +477,10 @@ }, { "age": 56, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-14", "division": "Sankt Gallen", "gisaid_epi_isl": "EPI_ISL_2375247", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": null, "region": "Europe", @@ -572,12 +488,10 @@ }, { "age": 53, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-10", "division": "Valais", "gisaid_epi_isl": "EPI_ISL_2375490", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -585,12 +499,10 @@ }, { "age": 58, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-11", "division": "Valais", "gisaid_epi_isl": "EPI_ISL_2379651", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -598,12 +510,10 @@ }, { "age": 52, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-24", "division": "Vaud", "gisaid_epi_isl": "EPI_ISL_2405276", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -611,12 +521,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-25", "division": "Obwalden", "gisaid_epi_isl": "EPI_ISL_2408472", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -624,12 +532,10 @@ }, { "age": 56, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-06-05", "division": "Ticino", "gisaid_epi_isl": "EPI_ISL_2544226", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.9, "region": "Europe", @@ -637,12 +543,10 @@ }, { "age": 51, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-06-03", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_2544332", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.9, "region": "Europe", @@ -650,12 +554,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-06-01", "division": "Schwyz", "gisaid_epi_isl": "EPI_ISL_2544452", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -663,12 +565,10 @@ }, { "age": 55, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-06-10", "division": "Sankt Gallen", "gisaid_epi_isl": "EPI_ISL_2574088", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -676,12 +576,10 @@ }, { "age": null, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-07-05", "division": "Valais", "gisaid_epi_isl": "EPI_ISL_3016465", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.95, "region": "Europe", diff --git a/endToEndTests/test/queries/Offset0.json b/endToEndTests/test/queries/Offset0.json index 65607f895..d323f5104 100644 --- a/endToEndTests/test/queries/Offset0.json +++ b/endToEndTests/test/queries/Offset0.json @@ -26,12 +26,10 @@ "expectedQueryResult": [ { "age": 57, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-02-10", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_1080536", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.97, "region": "Europe", @@ -39,12 +37,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-02-14", "division": "Graubünden", "gisaid_epi_isl": "EPI_ISL_1119315", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.95, "region": "Europe", @@ -52,12 +48,10 @@ }, { "age": 54, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2020-12-29", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_1129663", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -65,12 +59,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-02-23", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1195052", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.95, "region": "Europe", @@ -78,12 +70,10 @@ }, { "age": 51, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-01-26", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_1273458", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -91,12 +81,10 @@ }, { "age": 57, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-08", "division": "Jura", "gisaid_epi_isl": "EPI_ISL_1360935", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -104,12 +92,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-06", "division": "Zürich", "gisaid_epi_isl": "EPI_ISL_1361468", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -117,12 +103,10 @@ }, { "age": 55, - "aminoAcidInsertions": null, "country": "Switzerland", "date": null, "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1407962", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.93, "region": "Europe", @@ -130,12 +114,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-03", "division": "Valais", "gisaid_epi_isl": "EPI_ISL_1408062", - "nucleotideInsertions": "22204:CAGAA", "pango_lineage": "B.1.1.7", "qc_value": 0.97, "region": "Europe", @@ -143,12 +125,10 @@ }, { "age": 4, - "aminoAcidInsertions": "S:214:EPE", "country": "Switzerland", "date": "2021-03-18", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_1408408", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -156,12 +136,10 @@ }, { "age": 51, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-21", "division": "Vaud", "gisaid_epi_isl": "EPI_ISL_1597890", - "nucleotideInsertions": "22339:GCTGGT", "pango_lineage": "B.1.1.7", "qc_value": 0.96, "region": null, @@ -169,12 +147,10 @@ }, { "age": 54, - "aminoAcidInsertions": "S:214:EPE", "country": "Switzerland", "date": "2021-03-19", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1597932", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -182,12 +158,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-05", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_1747752", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.93, "region": "Europe", @@ -195,12 +169,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-09", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1747885", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -208,12 +180,10 @@ }, { "age": 52, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-03", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1748215", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.9, "region": "Europe", @@ -221,12 +191,10 @@ }, { "age": null, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-02", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1748243", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -234,12 +202,10 @@ }, { "age": 53, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-25", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_1748395", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.89, "region": "Europe", @@ -247,12 +213,10 @@ }, { "age": 4, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-13", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_1749892", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.95, "region": "Europe", @@ -260,12 +224,10 @@ }, { "age": 5, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-13", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_1749899", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.97, "region": "Europe", @@ -273,12 +235,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-15", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_1749960", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.89, "region": "Europe", @@ -286,12 +246,10 @@ }, { "age": 54, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-12", "division": "Ticino", "gisaid_epi_isl": "EPI_ISL_1760534", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -299,12 +257,10 @@ }, { "age": 56, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-23", "division": "Ticino", "gisaid_epi_isl": "EPI_ISL_1840634", - "nucleotideInsertions": null, "pango_lineage": "Q.7", "qc_value": 0.96, "region": "Europe", @@ -312,12 +268,10 @@ }, { "age": 6, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-25", "division": "Aargau", "gisaid_epi_isl": "EPI_ISL_2016901", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.96, "region": "Europe", @@ -325,12 +279,10 @@ }, { "age": 56, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-23", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_2017036", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -338,12 +290,10 @@ }, { "age": 58, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-28", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_2019235", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.9, "region": "Europe", @@ -351,12 +301,10 @@ }, { "age": 55, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-04-27", "division": "Valais", "gisaid_epi_isl": "EPI_ISL_2019350", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.92, "region": "Europe", @@ -364,12 +312,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-12", "division": "Ticino", "gisaid_epi_isl": "EPI_ISL_2180023", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.93, "region": "Europe", @@ -377,12 +323,10 @@ }, { "age": 57, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-09", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_2180995", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.95, "region": "Europe", @@ -390,12 +334,10 @@ }, { "age": 58, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-05", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_2181005", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -403,12 +345,10 @@ }, { "age": 51, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-08", "division": "Geneva", "gisaid_epi_isl": "EPI_ISL_2213804", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "Q.7", "qc_value": null, "region": "Europe", @@ -416,12 +356,10 @@ }, { "age": 53, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-13", "division": "Geneva", "gisaid_epi_isl": "EPI_ISL_2213934", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.93, "region": "Europe", @@ -429,12 +367,10 @@ }, { "age": 54, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-08", "division": "Geneva", "gisaid_epi_isl": "EPI_ISL_2213984", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.92, "region": "Europe", @@ -442,12 +378,10 @@ }, { "age": 58, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-10", "division": "Geneva", "gisaid_epi_isl": "EPI_ISL_2214128", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.89, "region": "Europe", @@ -455,12 +389,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-03-10", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_2270139", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.92, "region": "Europe", @@ -468,12 +400,10 @@ }, { "age": 52, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-11", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_2307766", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.89, "region": "Europe", @@ -481,12 +411,10 @@ }, { "age": 55, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-08", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_2307888", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.96, "region": "Europe", @@ -494,12 +422,10 @@ }, { "age": 57, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-07", "division": "Zürich", "gisaid_epi_isl": "EPI_ISL_2308054", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -507,12 +433,10 @@ }, { "age": 57, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-23", "division": "Ticino", "gisaid_epi_isl": "EPI_ISL_2360326", - "nucleotideInsertions": null, "pango_lineage": "Q.7", "qc_value": 0.89, "region": "Europe", @@ -520,12 +444,10 @@ }, { "age": 54, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-18", "division": "Aargau", "gisaid_epi_isl": "EPI_ISL_2374969", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.97, "region": "Europe", @@ -533,12 +455,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-16", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_2375097", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.92, "region": "Europe", @@ -546,12 +466,10 @@ }, { "age": 58, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-18", "division": "Basel-Land", "gisaid_epi_isl": "EPI_ISL_2375165", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.93, "region": "Europe", @@ -559,12 +477,10 @@ }, { "age": 56, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-14", "division": "Sankt Gallen", "gisaid_epi_isl": "EPI_ISL_2375247", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": null, "region": "Europe", @@ -572,12 +488,10 @@ }, { "age": 53, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-10", "division": "Valais", "gisaid_epi_isl": "EPI_ISL_2375490", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -585,12 +499,10 @@ }, { "age": 58, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-11", "division": "Valais", "gisaid_epi_isl": "EPI_ISL_2379651", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -598,12 +510,10 @@ }, { "age": 52, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-24", "division": "Vaud", "gisaid_epi_isl": "EPI_ISL_2405276", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", @@ -611,12 +521,10 @@ }, { "age": 59, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-05-25", "division": "Obwalden", "gisaid_epi_isl": "EPI_ISL_2408472", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.98, "region": "Europe", @@ -624,12 +532,10 @@ }, { "age": 56, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-06-05", "division": "Ticino", "gisaid_epi_isl": "EPI_ISL_2544226", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.9, "region": "Europe", @@ -637,12 +543,10 @@ }, { "age": 51, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-06-03", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_2544332", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.9, "region": "Europe", @@ -650,12 +554,10 @@ }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-06-01", "division": "Schwyz", "gisaid_epi_isl": "EPI_ISL_2544452", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -663,12 +565,10 @@ }, { "age": 55, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-06-10", "division": "Sankt Gallen", "gisaid_epi_isl": "EPI_ISL_2574088", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "B.1.1.7", "qc_value": 0.91, "region": "Europe", @@ -676,12 +576,10 @@ }, { "age": null, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-07-05", "division": "Valais", "gisaid_epi_isl": "EPI_ISL_3016465", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.95, "region": "Europe", diff --git a/endToEndTests/test/queries/OffsetLimitOverlap.json b/endToEndTests/test/queries/OffsetLimitOverlap.json index eabfaf622..6e22c8ac1 100644 --- a/endToEndTests/test/queries/OffsetLimitOverlap.json +++ b/endToEndTests/test/queries/OffsetLimitOverlap.json @@ -13,130 +13,110 @@ }, "expectedQueryResult": [ { - "aminoAcidInsertions": null, "age": 53, "country": "Switzerland", "date": "2020-11-24", "division": "Zürich", "gisaid_epi_isl": "EPI_ISL_721941", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.70", "qc_value": 0.9, "region": "Europe", "unsorted_date": "2021-03-15" }, { - "aminoAcidInsertions": null, "age": 53, "country": "Switzerland", "date": "2020-12-14", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_737604", - "nucleotideInsertions": null, "pango_lineage": "B.1.1", "qc_value": 0.92, "region": "Europe", "unsorted_date": "2021-05-14" }, { - "aminoAcidInsertions": "S:247:SGE", "age": 56, "country": "Switzerland", "date": "2020-12-13", "division": "Bern", "gisaid_epi_isl": "EPI_ISL_737715", - "nucleotideInsertions": null, "pango_lineage": "B.1.177", "qc_value": 0.89, "region": "Europe", "unsorted_date": "2021-05-16" }, { - "aminoAcidInsertions": null, "age": 56, "country": "Switzerland", "date": "2020-12-09", "division": "Valais", "gisaid_epi_isl": "EPI_ISL_737860", - "nucleotideInsertions": null, "pango_lineage": "B.1.160", "qc_value": 0.97, "region": "Europe", "unsorted_date": "2021-04-28" }, { - "aminoAcidInsertions": null, "age": 56, "country": "Switzerland", "date": "2020-12-24", "division": "Sankt Gallen", "gisaid_epi_isl": "EPI_ISL_768148", - "nucleotideInsertions": "25701:CCC", "pango_lineage": "GD.1", "qc_value": 0.98, "region": "Europe", "unsorted_date": "2020-03-16" }, { - "aminoAcidInsertions": null, "age": 50, "country": "Switzerland", "date": "2020-10-08", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_830864", - "nucleotideInsertions": null, "pango_lineage": "B.1.177", "qc_value": 0.97, "region": "Europe", "unsorted_date": "2021-03-03" }, { - "aminoAcidInsertions": "S:210:IV", "age": 59, "country": "Switzerland", "date": "2021-01-12", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_899725", - "nucleotideInsertions": null, "pango_lineage": "B.1.177", "qc_value": 0.96, "region": "Europe", "unsorted_date": "2021-07-14" }, { - "aminoAcidInsertions": null, "age": 58, "country": "Switzerland", "date": "2020-12-25", "division": "Schwyz", "gisaid_epi_isl": "EPI_ISL_899762", - "nucleotideInsertions": null, "pango_lineage": "B.1.177", "qc_value": 0.97, "region": "Europe", "unsorted_date": "2021-07-19" }, { - "aminoAcidInsertions": null, "age": 50, "country": "Switzerland", "date": "2020-10-22", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_931031", - "nucleotideInsertions": null, "pango_lineage": "B.1.177", "qc_value": 0.95, "region": "Europe", "unsorted_date": "2021-05-10" }, { - "aminoAcidInsertions": null, "age": 50, "country": "Switzerland", "date": "2020-10-28", "division": "Basel-Stadt", "gisaid_epi_isl": "EPI_ISL_931279", - "nucleotideInsertions": null, "pango_lineage": "B.1.1", "qc_value": 0.96, "region": "Europe", diff --git a/endToEndTests/test/queries/nOf_2of3_details.json b/endToEndTests/test/queries/nOf_2of3_details.json index 4bb18ddec..bce3ed58f 100644 --- a/endToEndTests/test/queries/nOf_2of3_details.json +++ b/endToEndTests/test/queries/nOf_2of3_details.json @@ -31,57 +31,49 @@ } }, "expectedQueryResult": [ - { - "age": 58, - "aminoAcidInsertions": null, - "country": "Switzerland", - "date": "2021-04-28", - "division": "Basel-Stadt", - "gisaid_epi_isl": "EPI_ISL_2019235", - "nucleotideInsertions": null, - "pango_lineage": "B.1.1.7", - "qc_value": 0.9, - "region": "Europe", - "unsorted_date": "2021-01-22" - }, { "age": 50, - "aminoAcidInsertions": null, "country": "Switzerland", "date": "2021-02-23", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1195052", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.95, "region": "Europe", "unsorted_date": "2021-07-04" }, + { + "age": 50, + "country": "Switzerland", + "date": "2020-11-13", + "division": "Solothurn", + "gisaid_epi_isl": "EPI_ISL_1005148", + "pango_lineage": "B.1.221", + "qc_value": 0.92, + "region": "Europe", + "unsorted_date": "2020-12-17" + }, { "age": 54, - "aminoAcidInsertions": "S:214:EPE", "country": "Switzerland", "date": "2021-03-19", "division": "Solothurn", "gisaid_epi_isl": "EPI_ISL_1597932", - "nucleotideInsertions": null, "pango_lineage": "B.1.1.7", "qc_value": 0.94, "region": "Europe", "unsorted_date": "2021-02-10" }, { - "age": 50, - "aminoAcidInsertions": null, + "age": 58, "country": "Switzerland", - "date": "2020-11-13", - "division": "Solothurn", - "gisaid_epi_isl": "EPI_ISL_1005148", - "nucleotideInsertions": "25701:CCC", - "pango_lineage": "B.1.221", - "qc_value": 0.92, + "date": "2021-04-28", + "division": "Basel-Stadt", + "gisaid_epi_isl": "EPI_ISL_2019235", + "pango_lineage": "B.1.1.7", + "qc_value": 0.9, "region": "Europe", - "unsorted_date": "2020-12-17" + "unsorted_date": "2021-01-22" } ] } diff --git a/src/silo/query_engine/actions/details.cpp b/src/silo/query_engine/actions/details.cpp index a352b414d..8afd891ca 100644 --- a/src/silo/query_engine/actions/details.cpp +++ b/src/silo/query_engine/actions/details.cpp @@ -2,6 +2,7 @@ #include #include +#include #include #include @@ -24,7 +25,11 @@ std::vector parseFields( const std::vector& fields ) { if (fields.empty()) { - return database.columns.metadata; + auto filtered_fields = database.columns.metadata | std::views::filter([](const auto& object) { + return object.type != silo::config::ColumnType::NUC_INSERTION && + object.type != silo::config::ColumnType::AA_INSERTION; + }); + return {filtered_fields.begin(), filtered_fields.end()}; } std::vector field_metadata; for (const std::string& field : fields) {