Skip to content

Open Source alternative to Algolia + Pinecone and an Easier-to-Use alternative to ElasticSearch ⚡ 🔍 ✨ Fast, typo tolerant, in-memory fuzzy Search Engine for building delightful search experiences

Fix export not including joined documents. (#1952)

Harpreet Sangarcf6cc3e6cc62
diff --git a/src/core_api_utils.cpp b/src/core_api_utils.cpp
index 7d440dd5..4a536c9c 100644
--- a/src/core_api_utils.cpp
+++ b/src/core_api_utils.cpp
@@ -66,14 +66,10 @@ Option<bool> stateful_export_docs(export_state_t* export_state, size_t batch_siz
Collection::remove_reference_helper_fields(doc);
if(get_op.ok()) {
- if(export_state->include_fields.empty() && export_state->exclude_fields.empty()) {
- export_state->res_body->append(doc.dump());
- } else {
- coll->prune_doc_with_lock(doc, export_state->include_fields, export_state->exclude_fields,
- filter_result.coll_to_references[j], seq_id,
- export_state->ref_include_exclude_fields_vec);
- export_state->res_body->append(doc.dump());
- }
+ coll->prune_doc_with_lock(doc, export_state->include_fields, export_state->exclude_fields,
+ filter_result.coll_to_references[j], seq_id,
+ export_state->ref_include_exclude_fields_vec);
+ export_state->res_body->append(doc.dump());
export_state->res_body->append("\n");
}
diff --git a/test/core_api_utils_test.cpp b/test/core_api_utils_test.cpp
index 3cadd548..201de550 100644
--- a/test/core_api_utils_test.cpp
+++ b/test/core_api_utils_test.cpp
@@ -1027,6 +1027,35 @@ TEST_F(CoreAPIUtilsTest, ExportWithJoin) {
doc = nlohmann::json::parse(export_state.res_body->c_str());
ASSERT_EQ("soap", doc["product_name"]);
ASSERT_EQ(73.5, doc["Customers"]["product_price"]);
+
+ std::shared_ptr<http_req> req = std::make_shared<http_req>();
+ std::shared_ptr<http_res> res = std::make_shared<http_res>(nullptr);
+ req->params["collection"] = "Products";
+ req->params["q"] = "*";
+ req->params["filter_by"] = "$Customers(customer_id: customer_a)";
+
+ get_export_documents(req, res);
+
+ std::vector<std::string> res_strs;
+ StringUtils::split(res->body, res_strs, "\n");
+
+ doc = nlohmann::json::parse(res_strs[0]);
+ ASSERT_EQ(6, doc.size());
+ ASSERT_EQ(1, doc.count("product_name"));
+ ASSERT_EQ("shampoo", doc["product_name"]);
+ ASSERT_EQ(1, doc.count("Customers"));
+ ASSERT_EQ(5, doc["Customers"].size());
+ ASSERT_EQ(1, doc["Customers"].count("product_price"));
+ ASSERT_EQ(143, doc["Customers"]["product_price"]);
+
+ doc = nlohmann::json::parse(res_strs[1]);
+ ASSERT_EQ(6, doc.size());
+ ASSERT_EQ(1, doc.count("product_name"));
+ ASSERT_EQ("soap", doc["product_name"]);
+ ASSERT_EQ(1, doc.count("Customers"));
+ ASSERT_EQ(5, doc["Customers"].size());
+ ASSERT_EQ(1, doc["Customers"].count("product_price"));
+ ASSERT_EQ(73.5, doc["Customers"]["product_price"]);
}
TEST_F(CoreAPIUtilsTest, TestParseAPIKeyIPFromMetadata) {