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

add generic log events (#1877)

Krunal Gandhif625f493eb8b
diff --git a/src/analytics_manager.cpp b/src/analytics_manager.cpp
index 39be9f6e..0a51c859 100644
--- a/src/analytics_manager.cpp
+++ b/src/analytics_manager.cpp
@@ -60,7 +60,7 @@ Option<bool> AnalyticsManager::create_index(nlohmann::json &payload, bool upsert
}
std::string counter_field;
- std::string suggestion_collection;
+ std::string suggestion_collection = "generic";
suggestion_config_t suggestion_config;
suggestion_config.name = suggestion_config_name;
@@ -69,24 +69,24 @@ Option<bool> AnalyticsManager::create_index(nlohmann::json &payload, bool upsert
suggestion_config.rule_type = payload["type"];
//for counter events source collections are not needed
- if(payload["type"] != COUNTER_TYPE) {
- if(!params["source"].contains("collections") || !params["source"]["collections"].is_array()) {
+ if(params["source"].contains("collections")) {
+ if(!params["source"]["collections"].is_array()) {
return Option<bool>(400, "Must contain a valid list of source collections.");
}
for(const auto& coll: params["source"]["collections"]) {
- if(!coll.is_string()) {
+ if (!coll.is_string()) {
return Option<bool>(400, "Must contain a valid list of source collection names.");
}
- const std::string& src_collection = coll.get<std::string>();
+ const std::string &src_collection = coll.get<std::string>();
suggestion_config.query_collections.push_back(src_collection);
- //for log type rule
- if(payload["type"] == LOG_TYPE) {
- suggestion_collection = src_collection;
- }
+ suggestion_collection = src_collection;
}
+ } else if(payload["type"] == POPULAR_QUERIES_TYPE || payload["type"] == NOHITS_QUERIES_TYPE) {
+ //for popular and nohits queries, source collection is mandatory
+ return Option<bool>(400, "Must contain a valid list of source collections.");
}
if((payload["type"] == POPULAR_QUERIES_TYPE || payload["type"] == NOHITS_QUERIES_TYPE)
diff --git a/test/analytics_manager_test.cpp b/test/analytics_manager_test.cpp
index ff652fa4..10c78c98 100644
--- a/test/analytics_manager_test.cpp
+++ b/test/analytics_manager_test.cpp
@@ -595,6 +595,22 @@ TEST_F(AnalyticsManagerTest, EventsValidation) {
})"_json;
req->body = event9.dump();
ASSERT_TRUE(post_create_event(req, res));
+
+ //for log events source collections is optional
+ req->params["name"] = "product_events2";
+ ASSERT_TRUE(del_analytics_rules(req, res));
+ analytics_rule = R"({
+ "name": "product_events2",
+ "type": "log",
+ "params": {
+ "source": {
+ "events": [{"type": "custom", "name": "CP"}]
+ }
+ }
+ })"_json;
+
+ create_op = analyticsManager.create_rule(analytics_rule, true, true);
+ ASSERT_TRUE(create_op.ok());
}
TEST_F(AnalyticsManagerTest, EventsPersist) {
@@ -714,6 +730,60 @@ TEST_F(AnalyticsManagerTest, EventsPersist) {
ASSERT_EQ("13", parsed_json["user_id"]);
ASSERT_EQ("21", parsed_json["doc_id"]);
ASSERT_EQ("technology", parsed_json["query"]);
+
+ //create rule without source collections
+ analytics_rule = R"({
+ "name": "product_click_events2",
+ "type": "log",
+ "params": {
+ "source": {
+ "events": [{"type": "click", "name": "APCT"}]
+ }
+ }
+ })"_json;
+
+ create_op = analyticsManager.create_rule(analytics_rule, true, true);
+ ASSERT_TRUE(create_op.ok());
+
+ event = R"({
+ "type": "click",
+ "name": "APCT",
+ "data": {
+ "q": "technology",
+ "doc_id": "10",
+ "user_id": "1"
+ }
+ })"_json;
+
+ req->body = event.dump();
+ ASSERT_TRUE(post_create_event(req, res));
+
+ //get events
+ payload.clear();
+ collection_events_map = analyticsManager.get_log_events();
+ for (auto &events_collection_it: collection_events_map) {
+ const auto& collection = events_collection_it.first;
+ for(const auto& event: events_collection_it.second) {
+ event.to_json(event_data, collection);
+ payload.push_back(event_data);
+ }
+ }
+
+ //manually trigger write to db
+ ASSERT_TRUE(analyticsManager.write_to_db(payload));
+
+ values.clear();
+ analyticsManager.get_last_N_events("1", "*", 5, values);
+ ASSERT_EQ(1, values.size());
+
+ parsed_json = nlohmann::json::parse(values[0]);
+
+ //events will be fetched in LIFO order
+ ASSERT_EQ("APCT", parsed_json["name"]);
+ ASSERT_EQ("generic", parsed_json["collection"]); //without source collections events are classified into generic collection
+ ASSERT_EQ("1", parsed_json["user_id"]);
+ ASSERT_EQ("10", parsed_json["doc_id"]);
+ ASSERT_EQ("technology", parsed_json["query"]);
}
TEST_F(AnalyticsManagerTest, EventsRateLimitTest) {