fix(attachemnts): Fix e2e test

Author: LucienShui

src/wizard/dto/fetch-task-request.dto.ts

@@ -0,0 +1,4 @@
+export interface FetchTaskRequest {
+  namespace_id?: string;
+  function?: string;
+}

src/wizard/internal.wizard.controller.ts

@@ -5,7 +5,8 @@ import { transformKeysToSnakeCase } from 'omniboxd/interceptor/utils';
 import { TaskCallbackDto } from 'omniboxd/wizard/dto/task-callback.dto';
 import { ChunkCallbackDto } from 'omniboxd/wizard/dto/chunk-callback.dto';
 import { ChunkManagerService } from 'omniboxd/wizard/chunk-manager.service';
-import { Body, Controller, Get, Post, Res } from '@nestjs/common';
+import { Body, Controller, Get, Post, Query, Res } from '@nestjs/common';
+import { FetchTaskRequest } from 'omniboxd/wizard/dto/fetch-task-request.dto';
 
 @Controller('internal/api/v1/wizard')
 export class InternalWizardController {
@@ -16,8 +17,11 @@ export class InternalWizardController {
 
   @Public()
   @Get('task')
-  async fetchTask(@Res() res: Response): Promise<void> {
-    const task = await this.wizardService.fetchTask();
+  async fetchTask(
+    @Res() res: Response,
+    @Query() query: FetchTaskRequest,
+  ): Promise<void> {
+    const task = await this.wizardService.fetchTask(query);
     res.status(task ? 200 : 204).json(transformKeysToSnakeCase(task));
   }
 

src/wizard/internal.wizard.e2e-spec.ts

@@ -27,12 +27,11 @@ describe('InternalWizardController (e2e)', () => {
       .send(collectData)
       .expect(HttpStatus.CREATED);
 
-    console.log({ taskCreateResponse: taskCreateResponse.body });
-
     const taskId = taskCreateResponse.body.task_id;
 
-    const fetchResponse = await client.get('/internal/api/v1/wizard/task');
-    console.log({ fetchResponse: fetchResponse.body });
+    await client
+      .get(`/internal/api/v1/wizard/task?namespace_id=${client.namespace.id}`)
+      .expect(HttpStatus.OK);
 
     const response = await client
       .post('/internal/api/v1/wizard/callback')
@@ -51,7 +50,6 @@ describe('InternalWizardController (e2e)', () => {
           ] as Image[],
         },
       });
-    console.log({ body: response.body });
     expect(response.status).toBe(HttpStatus.CREATED);
   });
 });

src/wizard/wizard.service.ts

@@ -21,6 +21,7 @@ import { WizardTaskService } from 'omniboxd/tasks/wizard-task.service';
 import { Image, ProcessedImage } from 'omniboxd/wizard/types/wizard.types';
 import { InternalTaskDto } from 'omniboxd/tasks/dto/task.dto';
 import { isEmpty } from 'omniboxd/utils/is-empty';
+import { FetchTaskRequest } from 'omniboxd/wizard/dto/fetch-task-request.dto';
 
 @Injectable()
 export class WizardService {
@@ -241,30 +242,45 @@ export class WizardService {
     task.output.images = processedImages;
   }
 
-  async fetchTask(): Promise<InternalTaskDto | null> {
+  async fetchTask(query: FetchTaskRequest): Promise<InternalTaskDto | null> {
+    const andConditions: string[] = [];
+    if (query.namespace_id) {
+      andConditions.push(`tasks.namespace_id = '${query.namespace_id}'`);
+    }
+    if (query.function) {
+      andConditions.push(`tasks.function = '${query.function}'`);
+    }
+    const andCondition: string = andConditions.map((x) => `AND ${x}`).join(' ');
     const rawQuery = `
-      WITH running_tasks_sub_query AS (SELECT namespace_id,
-                                              COUNT(id) AS running_count
-                                       FROM tasks
-                                       WHERE started_at IS NOT NULL
-                                         AND ended_at IS NULL
-                                         AND canceled_at IS NULL
-                                         AND deleted_at IS NULL
-                                       GROUP BY namespace_id),
-           id_subquery AS (SELECT tasks.id
-                           FROM tasks
-                                  LEFT OUTER JOIN running_tasks_sub_query
-                                                  ON tasks.namespace_id = running_tasks_sub_query.namespace_id
-                                  LEFT OUTER JOIN namespaces
-                                                  ON tasks.namespace_id = namespaces.id
-                           WHERE tasks.started_at IS NULL
-                             AND tasks.canceled_at IS NULL
-                             AND tasks.deleted_at IS NULL
-                             AND COALESCE(running_tasks_sub_query.running_count, 0) <
-                                 COALESCE(namespaces.max_running_tasks, 0)
-                           ORDER BY priority DESC,
-                                    tasks.created_at
-        LIMIT 1)
+      WITH
+        running_tasks_sub_query AS (
+          SELECT
+            namespace_id,
+            COUNT(id) AS running_count
+          FROM tasks
+          WHERE started_at IS NOT NULL
+          AND ended_at IS NULL
+          AND canceled_at IS NULL
+          AND deleted_at IS NULL
+          GROUP BY namespace_id
+        ),
+        id_subquery AS (
+          SELECT tasks.id
+          FROM tasks
+          LEFT OUTER JOIN running_tasks_sub_query
+          ON tasks.namespace_id = running_tasks_sub_query.namespace_id
+          LEFT OUTER JOIN namespaces
+          ON tasks.namespace_id = namespaces.id
+          WHERE tasks.started_at IS NULL
+          AND tasks.canceled_at IS NULL
+          AND tasks.deleted_at IS NULL
+          AND COALESCE(running_tasks_sub_query.running_count, 0) < COALESCE(namespaces.max_running_tasks, 0)
+          ${andCondition}
+          ORDER BY
+            priority DESC,
+            tasks.created_at
+          LIMIT 1
+      )
       SELECT *
       FROM tasks
       WHERE id IN (SELECT id FROM id_subquery)