fix: parse error messages for mutation filter expressions

GenSpectrum · Jul 12, 2023 · 9e4612d · 9e4612d
1 parent e0e2219
commit 9e4612d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/src/silo/query_engine/actions/aa_mutations.cpp b/src/silo/query_engine/actions/aa_mutations.cpp
@@ -170,7 +170,7 @@ QueryResult AAMutations::execute(
 void from_json(const nlohmann::json& json, std::unique_ptr<AAMutations>& action) {
    CHECK_SILO_QUERY(
       json.contains("sequenceName") && json["sequenceName"].is_string(),
-      "AminoAcideMutations action must have the field sequenceName:string"
+      "AminoAcidMutations action must have the string field sequenceName"
    )
    const std::string aa_sequence_name = json["sequenceName"].get<std::string>();
    double min_proportion = AAMutations::DEFAULT_MIN_PROPORTION;

diff --git a/src/silo/query_engine/filter_expressions/aa_symbol_equals.cpp b/src/silo/query_engine/filter_expressions/aa_symbol_equals.cpp
@@ -78,7 +78,6 @@ void from_json(const nlohmann::json& json, std::unique_ptr<AASymbolEquals>& filt
    CHECK_SILO_QUERY(
       json.contains("sequenceName") && json["sequenceName"].is_string(),
       "AminoAcidEquals expression requires the string field sequenceName"
-      "integer"
    )
    CHECK_SILO_QUERY(
       json.is_object() && json.contains("position"),

diff --git a/src/silo/query_engine/filter_expressions/has_aa_mutation.cpp b/src/silo/query_engine/filter_expressions/has_aa_mutation.cpp
@@ -75,13 +75,11 @@ void from_json(const nlohmann::json& json, std::unique_ptr<HasAAMutation>& filte
    )
    CHECK_SILO_QUERY(
       json["position"].is_number_unsigned(),
-      "The field 'position' in a HasAminoAcidMutation expression needs to be an unsigned "
-      "integer"
+      "The field 'position' in a HasAminoAcidMutation expression needs to be an unsigned integer"
    )
    CHECK_SILO_QUERY(
       json.contains("sequenceName") && json["sequenceName"].is_string(),
       "HasAminoAcidMutation expression requires the string field sequenceName"
-      "integer"
    )
    const std::string aa_sequence_name = json["sequenceName"].get<std::string>();
    const uint32_t position = json["position"].get<uint32_t>() - 1;

diff --git a/src/silo/query_engine/filter_expressions/has_mutation.cpp b/src/silo/query_engine/filter_expressions/has_mutation.cpp
@@ -89,8 +89,7 @@ void from_json(const nlohmann::json& json, std::unique_ptr<HasMutation>& filter)
    )
    CHECK_SILO_QUERY(
       json["position"].is_number_unsigned(),
-      "The field 'position' in a HasNucleotideMutation expression needs to be an unsigned "
-      "integer"
+      "The field 'position' in a HasNucleotideMutation expression needs to be an unsigned integer"
    )
    std::optional<std::string> nuc_sequence_name;
    if (json.contains("sequenceName")) {