From 9e4612d34b3e4b50909d3759b1dfc5050783fa6d Mon Sep 17 00:00:00 2001
From: Fabian Engelniederhammer <fabian.engelniederhammer@tngtech.com>
Date: Wed, 12 Jul 2023 13:19:18 +0200
Subject: [PATCH] fix: parse error messages for mutation filter expressions

---
 src/silo/query_engine/actions/aa_mutations.cpp                | 2 +-
 src/silo/query_engine/filter_expressions/aa_symbol_equals.cpp | 1 -
 src/silo/query_engine/filter_expressions/has_aa_mutation.cpp  | 4 +---
 src/silo/query_engine/filter_expressions/has_mutation.cpp     | 3 +--
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/silo/query_engine/actions/aa_mutations.cpp b/src/silo/query_engine/actions/aa_mutations.cpp
index dd9451181..48eba2f10 100644
--- 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
index 90304a686..35263f8ee 100644
--- 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
index 222bde12f..b1ffad184 100644
--- 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
index 36191ab9e..df9f2407f 100644
--- 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")) {