Review comments

Author: vishnugt

src/lib/indexes.ts

@@ -317,30 +317,24 @@ class Index<T = Record<string, any>> {
     return await this.httpRequest.post(url, documents, options)
   }
 
-    /**
+  /**
    * Add or replace multiples documents to an index in batches
    * @memberof Index
    * @method addDocumentsInBatch
    */
-    async addDocumentsInBatch(
-      documents: Array<Document<T>>,
-      batchSize: number = 1000,
-      options?: AddDocumentParams
-    ): Promise<EnqueuedUpdate[]> {
-      const resultArray = []
-      let batchDocuments = [];
-      for(let i = 0, n = documents.length; i < n; ++i) {
-        if(batchDocuments.length === batchSize) {
-          resultArray.push(await this.addDocuments(batchDocuments, options));
-          batchDocuments = []
-        }
-        batchDocuments.push(documents[i]);
-      }
-      if(batchDocuments.length != 0) {
-        resultArray.push(await this.addDocuments(batchDocuments, options));
-      }
-      return resultArray
+  async addDocumentsInBatch(
+    documents: Array<Document<T>>,
+    batchSize = 1000,
+    options?: AddDocumentParams
+  ): Promise<EnqueuedUpdate[]> {
+    const resultArray = []
+    for (let i = 0, n = documents.length; i < n; i += batchSize) {
+      resultArray.push(
+        await this.addDocuments(documents.slice(i, i + batchSize), options)
+      )
     }
+    return resultArray
+  }
 
   /**
    * Add or update multiples documents to an index
@@ -355,30 +349,24 @@ class Index<T = Record<string, any>> {
     return await this.httpRequest.put(url, documents, options)
   }
 
-    /**
+  /**
    * Add or update multiples documents to an index in batches
    * @memberof Index
    * @method updateDocuments
    */
-    async updateDocumentsInBatch(
+  async updateDocumentsInBatch(
     documents: Array<Document<T>>,
-    batchSize: number = 1000,
+    batchSize = 1000,
     options?: AddDocumentParams
-    ): Promise<EnqueuedUpdate[]> {
-      const resultArray = []
-      let batchDocuments = [];
-      for(let i = 0, n = documents.length; i < n; ++i) {
-        if(batchDocuments.length === batchSize) {
-          resultArray.push(await this.updateDocuments(batchDocuments, options));
-          batchDocuments = []
-        }
-        batchDocuments.push(documents[i]);
-      }
-      if(batchDocuments.length != 0) {
-        resultArray.push(await this.updateDocuments(batchDocuments, options));
-      }
-      return resultArray
+  ): Promise<EnqueuedUpdate[]> {
+    const resultArray = []
+    for (let i = 0, n = documents.length; i < n; i += batchSize) {
+      resultArray.push(
+        await this.updateDocuments(documents.slice(i, i + batchSize), options)
+      )
     }
+    return resultArray
+  }
 
   /**
    * Delete one document

tests/documents_tests.ts

@@ -71,21 +71,19 @@ describe.each([
     await client.index(indexPk.uid).waitForPendingUpdate(updateId)
   })
 
-
   test(`${permission} key: Add documents to uid with primary key in batch`, async () => {
-    const updateIds:number[] = await client
+    const response: EnqueuedUpdate[] = await client
       .index(indexPk.uid)
       .addDocumentsInBatch(dataset, 4)
-      .then((response: EnqueuedUpdate[]) => {
-        expect(response).toBeInstanceOf(Array);
-        expect(response).toHaveLength(2);
-        expect(response[0]).toHaveProperty('updateId', expect.any(Number))
-        const tempIds:number[] = [];
-        response.forEach((entry) => tempIds.push(entry.updateId))
-        return tempIds
-      })
-    for(let updateId of updateIds) {
-      await client.index(indexPk.uid).waitForPendingUpdate(updateId)
+    expect(response).toBeInstanceOf(Array)
+    expect(response).toHaveLength(2)
+    expect(response[0]).toHaveProperty('updateId', expect.any(Number))
+    for (const enqueuedUpdate of response) {
+      const addResponse = await client
+        .index(indexPk.uid)
+        .waitForPendingUpdate(enqueuedUpdate.updateId)
+      expect(addResponse.status).toBe('processed')
+      expect(addResponse.type.name).toBe('DocumentsAddition')
     }
   })
 
@@ -227,30 +225,19 @@ describe.each([
   })
 
   test(`${permission} key: Update document from index that has a primary key in batch`, async () => {
-    const id = 456
-    const title = 'The Little Prince'
-    const comment = 'Updated comment'
-
-    const updateIds = await client
-      .index(indexPk.uid)
-      .updateDocumentsInBatch([{ id, title }, {id, comment}], 1)
-      .then((response: EnqueuedUpdate[]) => {
-        expect(response).toHaveLength(2)
-        expect(response[0]).toHaveProperty('updateId', expect.any(Number))
-        const tempIds:number[] = [];
-        response.forEach((entry) => tempIds.push(entry.updateId))
-        return tempIds
-      })
-    await client.index(indexPk.uid).waitForPendingUpdate(updateIds[0])
-    await client.index(indexPk.uid).waitForPendingUpdate(updateIds[1])
-    await client
+    const response: EnqueuedUpdate[] = await client
       .index(indexPk.uid)
-      .getDocument(id)
-      .then((response) => {
-        expect(response).toHaveProperty('id', id)
-        expect(response).toHaveProperty('title', title)
-        expect(response).toHaveProperty('comment', comment)
-      })
+      .updateDocumentsInBatch(dataset, 2)
+    expect(response).toBeInstanceOf(Array)
+    expect(response).toHaveLength(4)
+    expect(response[0]).toHaveProperty('updateId', expect.any(Number))
+    for (const enqueuedUpdate of response) {
+      const addResponse = await client
+        .index(indexPk.uid)
+        .waitForPendingUpdate(enqueuedUpdate.updateId)
+      expect(addResponse.status).toBe('processed')
+      expect(addResponse.type.name).toBe('DocumentsPartial')
+    }
   })
 
   test(`${permission} key: Add document with update documents function from index that has NO primary key`, async () => {