Add support for /:index/_bulk with JSON object as body

Author: lalinsky

src/server/http.cpp

@@ -226,17 +226,31 @@ static HttpResponse handleSearchRequest(const HttpRequest &request, const QShare
 static HttpResponse handleBulkRequest(const HttpRequest &request, const QSharedPointer<Index> &indexes) {
     auto index = getIndex(request, indexes);
 
-    auto body = request.json();
-    if (!body.isArray()) {
-        return errBadRequest("invalid_bulk_operation", "invalid bulk operation");
+    QJsonArray opsJsonArray;
+
+    auto doc = request.json();
+    if (doc.isObject()) {
+        auto obj = doc.object();
+        if (obj.contains("operations")) {
+            auto value = obj.value("operations");
+            if (value.isArray()) {
+                opsJsonArray = value.toArray();
+            } else {
+                return errBadRequest("invalid_bulk_operation", "'operations' must be an array");
+            }
+        }
+    } else if (doc.isArray()) {
+        opsJsonArray = doc.array();
+    } else {
+        return errBadRequest("invalid_bulk_operation",
+                             "request body must be either an array or an object with 'operations' key in it");
     }
-    auto operations = body.array();
 
     try {
         auto writer = index->openWriter(true, 1000);
-        for (auto operation : operations) {
+        for (auto operation : opsJsonArray) {
             if (!operation.isObject()) {
-                return errBadRequest("invalid_bulk_operation", "invalid bulk operation");
+                return errBadRequest("invalid_bulk_operation", "operation must be an object");
             }
             auto operationObj = operation.toObject();
             if (operationObj.contains("upsert")) {

src/server/http_test.cpp

@@ -135,7 +135,7 @@ TEST_F(HttpTest, TestSearchNoResults) {
     ASSERT_EQ(response.body().toStdString(), "{\"results\":[]}");
 }
 
-TEST_F(HttpTest, TestBulk) {
+TEST_F(HttpTest, TestBulkArray) {
     indexes->createIndex("testidx");
     indexes->getIndex("testidx")->insertOrUpdateDocument(112, {31, 41, 51});
     indexes->getIndex("testidx")->insertOrUpdateDocument(113, {31, 41, 51});
@@ -157,3 +157,22 @@ TEST_F(HttpTest, TestBulk) {
     ASSERT_FALSE(indexes->getIndex("testidx")->containsDocument(113));
     ASSERT_EQ(indexes->getIndex("testidx")->getAttribute("foo").toStdString(), "bar");
 }*/
+
+TEST_F(HttpTest, TestBulkObject) {
+    auto request = HttpRequest(HTTP_POST, QUrl("/main/_bulk"));
+    request.setBody(QJsonDocument(QJsonObject{
+        {"operations", QJsonArray{
+            QJsonObject{{"upsert", QJsonObject{{"id", 111}, {"terms", QJsonArray{1, 2, 3}}}}},
+            QJsonObject{{"upsert", QJsonObject{{"id", 112}, {"terms", QJsonArray{3, 4, 5}}}}},
+            QJsonObject{{"set", QJsonObject{{"name", "foo"}, {"value", "bar"}}}},
+        }},
+    }));
+
+    auto response = handler->router().handle(request);
+    ASSERT_EQ(response.body().toStdString(), "{}");
+    ASSERT_EQ(response.status(), HTTP_OK);
+
+    // ASSERT_TRUE(index->containsDocument(111));
+    // ASSERT_TRUE(index->containsDocument(112));
+    ASSERT_EQ(index->info().attribute("foo").toStdString(), "bar");
+}