Fix merge conflicts

Author: Strift

src/batch.ts

@@ -3,10 +3,7 @@ import {
   BatchObject,
   BatchesQuery,
   BatchesResults,
-<<<<<<< HEAD
   BatchesResultsObject,
-=======
->>>>>>> 87ac02b (Add getBatch)
 } from "./types";
 import { HttpRequests, toQueryParams } from "./http-requests";
 
@@ -54,31 +51,18 @@ class BatchClient {
    * @returns Promise containing all tasks
    */
   async getBatches(parameters: BatchesQuery = {}): Promise<BatchesResults> {
-<<<<<<< HEAD
     const url = `batches`;
 
-    const tasks = await this.httpRequest.get<Promise<BatchesResultsObject>>(
+    const batches = await this.httpRequest.get<Promise<BatchesResultsObject>>(
       url,
       toQueryParams<BatchesQuery>(parameters),
-=======
-    const url = `tasks`;
-
-    const tasks = await this.httpRequest.get<Promise<TasksResultsObject>>(
-      url,
-      toQueryParams<TasksQuery>(parameters),
->>>>>>> 87ac02b (Add getBatch)
     );
 
     return {
-      ...tasks,
-      results: tasks.results.map((task) => new Batch(task)),
+      ...batches,
+      results: batches.results.map((batch) => new Batch(batch)),
     };
   }
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 87ac02b (Add getBatch)
 }
 
 export { BatchClient, Batch };

src/types/types.ts

@@ -666,7 +666,6 @@ export type WaitOptions = {
  ** BATCHES
  */
 
-<<<<<<< HEAD
 /**
  * Represents a batch operation object containing information about tasks
  * processing
@@ -716,37 +715,11 @@ export type BatchObject = {
   /** Timestamp when the batch finished processing (rfc3339 format) */
   finishedAt: string;
   /** Duration of batch processing */
-=======
-export type BatchObject = {
-  uid: number;
-  // TODO
-  details: null;
-  progress: null;
-  stats: {
-    totalNbTasks: number;
-    status: {
-      succeeded: number;
-      failed: number;
-      canceled: number;
-      processing: number;
-      enqueued: number;
-    };
-    // TODO
-    types: null;
-    indexUids: string[];
-  };
-  startedAt: string;
-  finishedAt: string;
-  // TODO
->>>>>>> 87ac02b (Add getBatch)
   duration: string;
 };
 
 export type BatchesQuery = {
-<<<<<<< HEAD
   /** The batch should contain the specified task UIDs */
-=======
->>>>>>> 87ac02b (Add getBatch)
   uids?: number[];
   batchUids?: number[];
   types?: TaskTypes[];
@@ -761,11 +734,7 @@ export type BatchesQuery = {
   afterFinishedAt?: Date;
   limit?: number;
   from?: number;
-<<<<<<< HEAD
 };
-=======
-}
->>>>>>> 87ac02b (Add getBatch)
 
 export type BatchesResults = CursorResults<Batch>;
 export type BatchesResultsObject = CursorResults<BatchObject>;

tests/batch.test.ts

@@ -1,14 +1,5 @@
 import { afterAll, beforeEach, describe, expect, test } from "vitest";
-<<<<<<< HEAD
-import {
-  config,
-  getClient,
-  clearAllIndexes,
-} from "./utils/meilisearch-test-utils";
-import { sleep } from "../src/utils";
-=======
 import { config, getClient, clearAllIndexes } from "./utils/meilisearch-test-utils";
->>>>>>> 87ac02b (Add getBatch)
 
 const index = {
   uid: "batch-test",
@@ -18,49 +9,6 @@ afterAll(() => {
   return clearAllIndexes(config);
 });
 
-<<<<<<< HEAD
-describe.each([{ permission: "Master" }, { permission: "Admin" }])(
-  "Tests on batches",
-  ({ permission }) => {
-    beforeEach(async () => {
-      const client = await getClient("Master");
-      const { taskUid } = await client.createIndex(
-        `${permission}-${index.uid}`,
-      );
-      await client.waitForTask(taskUid);
-    });
-
-    test(`${permission} key: Get all batches`, async () => {
-      const client = await getClient(permission);
-      const { taskUid } = await client.createIndex(
-        `${permission}-${index.uid}-second-index`,
-      );
-      await client.waitForTask(taskUid);
-      const batches = await client.getBatches({ limit: 2 });
-
-      expect(batches.results).toBeInstanceOf(Array);
-      expect(batches.results.length).toEqual(2);
-      expect(batches.total).toBeGreaterThan(0);
-      expect(batches.results[0]).toHaveProperty("uid");
-      expect(batches.results[0]).toHaveProperty("details");
-      expect(batches.results[0]).toHaveProperty("stats");
-      expect(batches.results[0]).toHaveProperty("duration");
-      expect(batches.results[0]).toHaveProperty("startedAt");
-      expect(batches.results[0]).toHaveProperty("finishedAt");
-    });
-
-    test(`${permission} key: Get one batch`, async () => {
-      const client = await getClient(permission);
-
-      const batches = await client.getBatches({
-        limit: 1,
-      });
-      console.log("batches", batches.results[0].uid, "exists");
-
-      const batch = await client.getBatch(batches.results[0].uid);
-      expect(batch.uid).toEqual(batches.results[0].uid);
-      expect(batch.details).toBeInstanceOf(Object);
-=======
 describe.each([
   { permission: "Master" },
   { permission: "Admin" }
@@ -78,7 +26,6 @@ describe.each([
       expect(batch.uid).toEqual(1);
       expect(batch.details).toHaveProperty("receivedDocuments");
       expect(batch.details).toHaveProperty("indexedDocuments");
->>>>>>> 87ac02b (Add getBatch)
       expect(batch.stats).toHaveProperty("totalNbTasks");
       expect(batch.stats).toHaveProperty("status");
       expect(batch.stats).toHaveProperty("types");
@@ -89,7 +36,3 @@ describe.each([
     });
   },
 );
-<<<<<<< HEAD
-=======
-
->>>>>>> 87ac02b (Add getBatch)