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

enable counter events without analytics dir (#1788)

Krunal Gandhi34e864d4a8d5
diff --git a/src/analytics_manager.cpp b/src/analytics_manager.cpp
index 2ae6fbf9..ff9628b8 100644
--- a/src/analytics_manager.cpp
+++ b/src/analytics_manager.cpp
@@ -216,6 +216,11 @@ Option<bool> AnalyticsManager::create_index(nlohmann::json &payload, bool upsert
bool log_to_file = false;
if(event.contains("log_to_file")) {
log_to_file = event["log_to_file"].get<bool>();
+
+ if(log_to_file && !analytics_logs.is_open()) {
+ remove_index(suggestion_config_name);
+ return Option<bool>(400, "Event can't be logged when analytics-dir is not defined.");
+ }
}
event_weight_map[event["name"]] = event["weight"];
event_type_collection ec{event["type"], suggestion_collection, log_to_file};
@@ -379,9 +384,7 @@ void AnalyticsManager::add_suggestion(const std::string &query_collection,
Option<bool> AnalyticsManager::add_event(const std::string& client_ip, const std::string& event_type,
const std::string& event_name, const nlohmann::json& event_json) {
std::unique_lock lock(mutex);
- if(!analytics_logs.is_open()) {
- return Option<bool>(true);
- }
+
const auto event_collection_map_it = event_collection_map.find(event_name);
if(event_collection_map_it == event_collection_map.end()) {
return Option<bool>(404, "No analytics rule defined for event name " + event_name);
diff --git a/test/analytics_manager_test.cpp b/test/analytics_manager_test.cpp
index 07a9057c..1139ec41 100644
--- a/test/analytics_manager_test.cpp
+++ b/test/analytics_manager_test.cpp
@@ -1319,4 +1319,73 @@ TEST_F(AnalyticsManagerTest, PopularityScoreValidation) {
ASSERT_EQ("13", userid);
ASSERT_EQ("21", docid);
ASSERT_EQ("technology", q);
+
+ //counter event rule should not be allowed with logging if analytics-dir is not specified
+ analyticsManager.dispose();
+ analyticsManager.stop();
+ system("rm -rf /tmp/typesense_test/analytics_manager_test/analytics_events.tsv");
+ analyticsManager.init(store, "");
+
+ analytics_rule = R"({
+ "name": "books_popularity3",
+ "type": "counter",
+ "params": {
+ "source": {
+ "collections": ["books"],
+ "events": [{"type": "conversion", "weight": 5, "name": "CNV4", "log_to_file" : true} ]
+ },
+ "destination": {
+ "collection": "books",
+ "counter_field": "popularity"
+ }
+ }
+ })"_json;
+
+ create_op = analyticsManager.create_rule(analytics_rule, false, true);
+ ASSERT_FALSE(create_op.ok());
+ ASSERT_EQ("Event can't be logged when analytics-dir is not defined.", create_op.error());
+
+
+ //counter events should work without analytic-dir
+
+ analyticsManager.dispose();
+ analyticsManager.stop();
+ system("rm -rf /tmp/typesense_test/analytics_manager_test/analytics_events.tsv");
+ analyticsManager.init(store, "");
+
+ analytics_rule = R"({
+ "name": "books_popularity3",
+ "type": "counter",
+ "params": {
+ "source": {
+ "collections": ["books"],
+ "events": [{"type": "conversion", "weight": 5, "name": "CNV4"} ]
+ },
+ "destination": {
+ "collection": "books",
+ "counter_field": "popularity"
+ }
+ }
+ })"_json;
+
+ create_op = analyticsManager.create_rule(analytics_rule, false, true);
+ ASSERT_TRUE(create_op.ok());
+
+ event = R"({
+ "type": "conversion",
+ "name": "CNV4",
+ "data": {
+ "q": "shorts",
+ "doc_id": "1",
+ "user_id": "11"
+ }
+ })"_json;
+ req->body = event.dump();
+ ASSERT_TRUE(post_create_event(req, res));
+
+ popular_clicks = analyticsManager.get_popular_clicks();
+ ASSERT_EQ(1, popular_clicks.size());
+ ASSERT_EQ("popularity", popular_clicks["books"].counter_field);
+ ASSERT_EQ(1, popular_clicks["books"].docid_counts.size());
+ ASSERT_EQ(5, popular_clicks["books"].docid_counts["1"]);
}
\ No newline at end of file