From d58250840460bde21d518f67a3798efd4f1d25a4 Mon Sep 17 00:00:00 2001 From: krunal Date: Mon, 28 Aug 2023 18:36:33 +0530 Subject: [PATCH] updating changes --- include/core_api.h | 2 +- src/core_api.cpp | 2 +- src/main/typesense_server.cpp | 2 +- src/stopwords_manager.cpp | 5 ++--- test/stopwords_manager_test.cpp | 12 ++++++------ 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/include/core_api.h b/include/core_api.h index 2b813f5c..6d4fe6a9 100644 --- a/include/core_api.h +++ b/include/core_api.h @@ -69,7 +69,7 @@ bool get_stopwords(const std::shared_ptr& req, const std::shared_ptr& req, const std::shared_ptr& res); -bool upsert_stopword(const std::shared_ptr& req, const std::shared_ptr& res); +bool put_upsert_stopword(const std::shared_ptr& req, const std::shared_ptr& res); bool del_stopword(const std::shared_ptr& req, const std::shared_ptr& res); diff --git a/src/core_api.cpp b/src/core_api.cpp index ac12d340..5b3b8bea 100644 --- a/src/core_api.cpp +++ b/src/core_api.cpp @@ -1932,7 +1932,7 @@ bool get_stopword(const std::shared_ptr& req, const std::shared_ptr& req, const std::shared_ptr& res) { +bool put_upsert_stopword(const std::shared_ptr& req, const std::shared_ptr& res) { nlohmann::json req_json; try { diff --git a/src/main/typesense_server.cpp b/src/main/typesense_server.cpp index addaa02c..735b70e8 100644 --- a/src/main/typesense_server.cpp +++ b/src/main/typesense_server.cpp @@ -70,7 +70,7 @@ void master_server_routes() { server->get("/stopwords", get_stopwords); server->get("/stopwords/:name", get_stopword); - server->put("/stopwords/:name", upsert_stopword); + server->put("/stopwords/:name", put_upsert_stopword); server->del("/stopwords/:name", del_stopword); // analytics diff --git a/src/stopwords_manager.cpp b/src/stopwords_manager.cpp index 3d608830..af72c39f 100644 --- a/src/stopwords_manager.cpp +++ b/src/stopwords_manager.cpp @@ -28,7 +28,7 @@ Option StopwordsManager::upsert_stopword(const std::string& stopword_name, const char* STOPWORD_VALUES = "stopwords"; const char* STOPWORD_LOCALE = "locale"; - bool locale_exist = false; + std::string locale = ""; if(stopwords_json.count(STOPWORD_VALUES) == 0){ return Option(400, (std::string("Parameter `") + STOPWORD_VALUES + "` is required")); @@ -39,10 +39,10 @@ Option StopwordsManager::upsert_stopword(const std::string& stopword_name, } if(stopwords_json.count(STOPWORD_LOCALE) != 0) { - locale_exist = true; if (!stopwords_json[STOPWORD_LOCALE].is_string()) { return Option(400, (std::string("Parameter `") + STOPWORD_LOCALE + "` is required as string value")); } + locale = stopwords_json[STOPWORD_LOCALE]; } if(write_to_store) { @@ -55,7 +55,6 @@ Option StopwordsManager::upsert_stopword(const std::string& stopword_name, std::vector tokens; spp::sparse_hash_set stopwords_set; const auto& stopwords = stopwords_json[STOPWORD_VALUES]; - const auto& locale = locale_exist? stopwords_json[STOPWORD_LOCALE] : ""; for (const auto &stopword: stopwords.items()) { const auto& val = stopword.value().get(); diff --git a/test/stopwords_manager_test.cpp b/test/stopwords_manager_test.cpp index ce02fbbe..bb06eb10 100644 --- a/test/stopwords_manager_test.cpp +++ b/test/stopwords_manager_test.cpp @@ -211,7 +211,7 @@ TEST_F(StopwordsManagerTest, StopwordsBasics) { req->params["name"] = "articles"; req->body = stopword_value.dump(); - auto result = upsert_stopword(req, res); + auto result = put_upsert_stopword(req, res); if(!result) { LOG(ERROR) << res->body; FAIL(); @@ -247,7 +247,7 @@ TEST_F(StopwordsManagerTest, StopwordsBasics) { req->params["name"] = "continents"; req->body = stopword_value.dump(); - result = upsert_stopword(req, res); + result = put_upsert_stopword(req, res); if(!result) { LOG(ERROR) << res->body; FAIL(); @@ -337,7 +337,7 @@ TEST_F(StopwordsManagerTest, StopwordsValidation) { req->params["name"] = "continents"; req->body = stopword_value.dump(); - auto result = upsert_stopword(req, res); + auto result = put_upsert_stopword(req, res); ASSERT_EQ(400, res->status_code); ASSERT_STREQ("{\"message\": \"Parameter `stopwords` is required\"}", res->body.c_str()); @@ -350,7 +350,7 @@ TEST_F(StopwordsManagerTest, StopwordsValidation) { req->params["name"] = "continents"; req->body = stopword_value.dump(); - result = upsert_stopword(req, res); + result = put_upsert_stopword(req, res); ASSERT_EQ(400, res->status_code); ASSERT_STREQ("{\"message\": \"Parameter `locale` is required as string value\"}", res->body.c_str()); @@ -362,7 +362,7 @@ TEST_F(StopwordsManagerTest, StopwordsValidation) { req->params["name"] = "continents"; req->body = stopword_value.dump(); - result = upsert_stopword(req, res); + result = put_upsert_stopword(req, res); ASSERT_EQ(400, res->status_code); ASSERT_STREQ("{\"message\": \"Parameter `stopwords` is required as string array value\"}", res->body.c_str()); @@ -392,7 +392,7 @@ TEST_F(StopwordsManagerTest, ReloadStopwordsOnRestart) { req->params["name"] = "genre"; req->body = stopword_value.dump(); - auto result = upsert_stopword(req, res); + auto result = put_upsert_stopword(req, res); if(!result) { LOG(ERROR) << res->body; FAIL();