Simplified json_facade

Author: jkurdek

include/json_facade.h

@@ -38,18 +38,12 @@ class JsonQuery {
 class JsonFacade {
    public:
     virtual ~JsonFacade() = default;
-    virtual void Parse(std::string_view jsonStr) = 0;
-    virtual std::optional<std::string_view> GetString(std::string_view key) const = 0;
+    virtual bool EvaluateQuery(std::string_view jsonStr, const JsonQuery& query) = 0;
 };
 
 class RapidJsonFacade : public JsonFacade {
    public:
-    void Parse(std::string_view jsonStr) override;
-    std::optional<std::string_view> GetString(std::string_view key) const override;
-
-   private:
-    rapidjson::Document doc_;
-    std::unordered_map<std::string_view, std::string_view> key_value_map_;
+    virtual bool EvaluateQuery(std::string_view jsonStr, const JsonQuery& query) override;
 };
 
 class JsonQueryDriver {

src/sparser/json_facade.cpp

@@ -1,6 +1,6 @@
 #include "json_facade.h"
 
-#include <optional>
+#include <cstring>
 #include <sstream>
 #include <stdexcept>
 #include <string>
@@ -36,47 +36,47 @@ std::ostream& operator<<(std::ostream& os, const JsonQuery& query) {
     return os;
 }
 
-void RapidJsonFacade::Parse(std::string_view jsonStr) {
-    rapidjson::ParseResult ok = doc_.Parse(jsonStr.data(), jsonStr.size());
-    if (!ok || !doc_.IsObject()) {
-        throw std::runtime_error("Failed to parse JSON string");
-    }
-    key_value_map_.clear();
+bool RapidJsonFacade::EvaluateQuery(std::string_view jsonStr, const JsonQuery& query) {
+    rapidjson::Document doc;
+    rapidjson::ParseResult ok = doc.Parse(jsonStr.data(), jsonStr.size());
 
-    for (auto it = doc_.MemberBegin(); it != doc_.MemberEnd(); ++it) {
-        const char* key = it->name.GetString();
-        if (it->value.IsString()) {
-            key_value_map_[key] = it->value.GetString();
-        }
+    if (!ok || !doc.IsObject()) {
+#ifndef NDEBUG
+        throw std::runtime_error("Failed to parse JSON string");
+#endif
+        return false;
     }
-}
 
-std::optional<std::string_view> RapidJsonFacade::GetString(std::string_view key) const {
-    auto it = key_value_map_.find(key);
-    if (it == key_value_map_.end()) {
-        return std::nullopt;
-    }
-    return it->second;
-}
-
-bool JsonQueryDriver::RunQuery(std::string_view buffer, const JsonQuery& query) {
-    json_facade_->Parse(buffer);
+    bool ans = false;
 
     for (const auto& conjunction : query.GetDisjunction().conjunctions) {
         bool all_predicates_satisfied = true;
 
         for (const auto& predicate : conjunction.predicates) {
-            auto value = json_facade_->GetString(predicate.key);
-            if (!value.has_value() || !value.value().contains(predicate.value)) {
+            auto itr = doc.FindMember(predicate.key.c_str());
+
+            if (itr == doc.MemberEnd()) {
+#ifndef NDEBUG
+                throw std::runtime_error("Key not found: " + predicate.key);
+#endif
+                return false;
+            }
+
+            if (!itr->value.IsString() || !strstr(itr->value.GetString(), predicate.value.c_str())) {
                 all_predicates_satisfied = false;
                 break;
             }
         }
 
         if (all_predicates_satisfied) {
-            return true;
+            ans = true;
+            break;
         }
     }
 
-    return false;
+    return ans;
+}
+
+bool JsonQueryDriver::RunQuery(std::string_view buffer, const JsonQuery& query) {
+    return json_facade_->EvaluateQuery(buffer, query);
 }

tests/sparser_test.cpp

@@ -92,40 +92,6 @@ TEST(RawFilterQueryGenerator, GenerateRawFilters_GenerateRawFiltersForSinglePred
     }
 }
 
-TEST(RapidJsonFacade, Parse_ValidJson_SuccessfulParsing) {
-    RapidJsonFacade facade;
-    std::string_view validJson = R"({"name":"John","age":"30"})";
-    facade.Parse(validJson);
-
-    auto nameValue = facade.GetString("name");
-    ASSERT_TRUE(nameValue.has_value());
-    EXPECT_EQ(*nameValue, "John");
-
-    auto ageValue = facade.GetString("age");
-    ASSERT_TRUE(ageValue.has_value());
-    EXPECT_EQ(*ageValue, "30");
-}
-
-TEST(RapidJsonFacade, Parse_InvalidJson_ThrowsException) {
-    RapidJsonFacade facade;
-    std::string_view invalidJson = R"({invalid json})";  // Missing quotes, braces, etc.
-    EXPECT_ANY_THROW(facade.Parse(invalidJson)) << "Should fail to parse invalid JSON";
-    EXPECT_FALSE(facade.GetString("randomKey").has_value());
-}
-
-TEST(RapidJsonFacade, GetString_ExistingAndMissingKeys_BehavesCorrectly) {
-    RapidJsonFacade facade;
-    std::string_view json = R"({"fruit":"apple"})";
-    facade.Parse(json);
-
-    auto fruitVal = facade.GetString("fruit");
-    ASSERT_TRUE(fruitVal.has_value());
-    EXPECT_EQ(*fruitVal, "apple");
-
-    auto colorVal = facade.GetString("color");
-    EXPECT_FALSE(colorVal.has_value());
-}
-
 TEST(JsonQueryDriver, RunQuery_AllPredicatesMatch_ReturnsTrue) {
     auto facade = std::make_unique<RapidJsonFacade>();
     JsonQueryDriver driver(std::move(facade));