Add beforeFinishedAt and AfterFinished At

meilisearch · Nov 2, 2022 · f436d73 · f436d73
1 parent b1ce6bf
commit f436d73
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 9 deletions.
diff --git a/src/task.ts b/src/task.ts
@@ -74,6 +74,8 @@ class TaskClient {
       afterEnqueuedAt,
       beforeStartedAt,
       afterStartedAt,
+      beforeFinishedAt,
+      afterFinishedAt,
     } = parameters
 
     const queryParams = {
@@ -84,11 +86,8 @@ class TaskClient {
       afterEnqueuedAt: afterEnqueuedAt && afterEnqueuedAt.toISOString(),
       beforeStartedAt: beforeStartedAt && beforeStartedAt.toISOString(),
       afterStartedAt: afterStartedAt && afterStartedAt.toISOString(),
-      // afterEnqueuedAt?: parameters?.,
-      // beforeStartedAt?: parameters?.,
-      // afterStartedAt?: parameters?.,
-      // beforeFinishedAt?: parameters?.,
-      // afterFinishedAt?: parameters?.,
+      beforeFinishedAt: beforeFinishedAt && beforeFinishedAt.toISOString(),
+      afterFinishedAt: afterFinishedAt && afterFinishedAt.toISOString(),
       from: parameters.from,
       limit: parameters.limit,
     }

diff --git a/tests/task.test.ts b/tests/task.test.ts
@@ -225,7 +225,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
     })
 
     // beforeEnqueuedAt
-    test.only(`${permission} key: Get all tasks with beforeEnqueuedAt filter`, async () => {
+    test(`${permission} key: Get all tasks with beforeEnqueuedAt filter`, async () => {
       const client = await getClient(permission)
       const currentTimeStamp = Date.now()
       const currentTime = new Date(currentTimeStamp)
@@ -244,7 +244,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
     })
 
     // afterEnqueuedAt
-    test.only(`${permission} key: Get all tasks with afterEnqueuedAt filter`, async () => {
+    test(`${permission} key: Get all tasks with afterEnqueuedAt filter`, async () => {
       const client = await getClient(permission)
       const { taskUid } = await client
         .index(index.uid)
@@ -263,7 +263,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
     })
 
     // beforeStartedAt
-    test.only(`${permission} key: Get all tasks with beforeStartedAt filter`, async () => {
+    test(`${permission} key: Get all tasks with beforeStartedAt filter`, async () => {
       const client = await getClient(permission)
       const currentTimeStamp = Date.now()
       const currentTime = new Date(currentTimeStamp)
@@ -284,7 +284,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
     })
 
     // afterStartedAt
-    test.only(`${permission} key: Get all tasks with afterStartedAt filter`, async () => {
+    test(`${permission} key: Get all tasks with afterStartedAt filter`, async () => {
       const client = await getClient(permission)
       const { taskUid } = await client
         .index(index.uid)
@@ -303,6 +303,47 @@ describe.each([{ permission: 'Master' }, { permission: 'Admin' }])(
       expect(tasksUids.includes(taskUid)).toBeFalsy()
     })
 
+    // beforeFinishedAt
+    test(`${permission} key: Get all tasks with beforeFinishedAt filter`, async () => {
+      const client = await getClient(permission)
+
+      const currentTimeStamp = Date.now()
+      const currentTime = new Date(currentTimeStamp)
+      await sleep(1) // in ms
+
+      const { taskUid } = await client
+        .index(index.uid)
+        .addDocuments([{ id: 1 }])
+      await client.index(index.uid).waitForTask(taskUid) // ensures the tasks has a `startedAt` value
+
+      const tasks = await client.getTasks({
+        beforeFinishedAt: currentTime,
+      })
+      const tasksUids = tasks.results.map((t) => t.uid)
+
+      expect(tasksUids.includes(taskUid)).toBeFalsy()
+    })
+
+    // afterFinishedAt
+    test(`${permission} key: Get all tasks with afterFinishedAt filter`, async () => {
+      const client = await getClient(permission)
+      const { taskUid } = await client
+        .index(index.uid)
+        .addDocuments([{ id: 1 }])
+      await client.index(index.uid).waitForTask(taskUid) // ensures the tasks has a `startedAt` value
+      await sleep(1) // in ms
+
+      const currentTimeStamp = Date.now()
+      const currentTime = new Date(currentTimeStamp)
+
+      const tasks = await client.getTasks({
+        afterFinishedAt: currentTime,
+      })
+      const tasksUids = tasks.results.map((t) => t.uid)
+
+      expect(tasksUids.includes(taskUid)).toBeFalsy()
+    })
+
     test(`${permission} key: Get all indexes tasks with index instance`, async () => {
       const client = await getClient(permission)
       await client.index(index.uid).addDocuments([{ id: 1 }])