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
C++ algoliadatastoreelasticsearchenterprise-searchfacetingfull-text-searchfuzzy-searchgeosearchin-memoryinstantsearchmerchandisingpineconesearchsearch-enginesemantic-searchsimilarity-searchsite-searchsynonymstypo-tolerancevector-search
delete associated events on deleting rule (#1794)
Krunal Gandhie1bdfc1ca6fc
diff --git a/include/analytics_manager.h b/include/analytics_manager.hindex e94b4417..1d160fd8 100644--- a/include/analytics_manager.h+++ b/include/analytics_manager.h@@ -12,6 +12,7 @@ struct event_type_collection {std::string event_type;std::string collection;bool log_to_file = false;+ std::string analytic_rule;};struct event_t {diff --git a/src/analytics_manager.cpp b/src/analytics_manager.cppindex ff9628b8..0194019e 100644--- a/src/analytics_manager.cpp+++ b/src/analytics_manager.cpp@@ -223,7 +223,7 @@ Option<bool> AnalyticsManager::create_index(nlohmann::json &payload, bool upsert}}event_weight_map[event["name"]] = event["weight"];- event_type_collection ec{event["type"], suggestion_collection, log_to_file};+ event_type_collection ec{event["type"], suggestion_collection, log_to_file, suggestion_config_name};event_collection_map.emplace(event["name"], ec);}counter_events.emplace(suggestion_collection, counter_event_t{counter_field, {}, event_weight_map});@@ -239,7 +239,7 @@ Option<bool> AnalyticsManager::create_index(nlohmann::json &payload, bool upsertif(!event.contains("name") || event_collection_map.count(event["name"]) != 0) {return Option<bool>(400, "Events must contain a unique name.");}- event_type_collection ec{event["type"], suggestion_collection, true};+ event_type_collection ec{event["type"], suggestion_collection, true, suggestion_config_name};event_collection_map.emplace(event["name"], ec);}}@@ -356,6 +356,13 @@ Option<bool> AnalyticsManager::remove_index(const std::string &name) {suggestion_configs.erase(name);+ //remove corresponding events with rule+ for(auto it: event_collection_map) {+ if(it.second.analytic_rule == name) {+ event_collection_map.erase(it.first);+ }+ }+auto suggestion_key = std::string(ANALYTICS_RULE_PREFIX) + "_" + name;bool erased = store->remove(suggestion_key);if(!erased) {diff --git a/src/event_manager.cpp b/src/event_manager.cppindex a0f772fe..c462428d 100644--- a/src/event_manager.cpp+++ b/src/event_manager.cpp@@ -64,15 +64,6 @@ Option<bool> EventManager::add_event(const nlohmann::json& event, const std::str}if(event_type != AnalyticsManager::CUSTOM_EVENT) {- //visit event might not contain query so exclude check- if(event_type != AnalyticsManager::VISIT_EVENT && !event_data_val.contains("q")) {- return Option<bool>(500,"event json data fields should contain `q`.");- }-- if (event_data_val.contains("q") && !event_data_val["q"].is_string()) {- return Option<bool>(500, "`q` value should be string.");- }-if (!event_data_val.contains("doc_id") || !event_data_val.contains("user_id")) {return Option<bool>(500,"event json data fields should contain `doc_id`, `user_id`.");diff --git a/test/analytics_manager_test.cpp b/test/analytics_manager_test.cppindex 1139ec41..dfcf8f27 100644--- a/test/analytics_manager_test.cpp+++ b/test/analytics_manager_test.cpp@@ -333,20 +333,6 @@ TEST_F(AnalyticsManagerTest, EventsValidation) {ASSERT_FALSE(post_create_event(req, res));ASSERT_EQ("{\"message\": \"key `name` not found.\"}", res->body);- //missing query param- nlohmann::json event2 = R"({- "type": "click",- "name": "AP",- "data": {- "doc_id": "21",- "user_id": "13"- }- })"_json;-- req->body = event2.dump();- ASSERT_FALSE(post_create_event(req, res));- ASSERT_EQ("{\"message\": \"event json data fields should contain `q`.\"}", res->body);-//should be string typenlohmann::json event3 = R"({"type": "conversion",@@ -464,6 +450,24 @@ TEST_F(AnalyticsManagerTest, EventsValidation) {})"_json;req->body = event8.dump();ASSERT_TRUE(post_create_event(req, res));++ //deleting rule should delete events associated with it+ req->params["name"] = "product_events2";+ ASSERT_TRUE(del_analytics_rules(req, res));+ analytics_rule = R"({+ "name": "product_events2",+ "type": "log",+ "params": {+ "name": "custom_events_logging",+ "source": {+ "collections": ["titles"],+ "events": [{"type": "custom", "name": "CP"}]+ }+ }+ })"_json;++ create_op = analyticsManager.create_rule(analytics_rule, true, true);+ ASSERT_TRUE(create_op.ok());}TEST_F(AnalyticsManagerTest, EventsPersist) {