Merge pull request #226 from import-ai/fix/pipes

fix(app): fix filter and pipe config

Author: ycdzj

src/app/app-config.ts

@@ -2,7 +2,6 @@ import { ConsoleLogger, INestApplication, LogLevel } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import * as express from 'express';
 import * as cookieParser from 'cookie-parser';
-import { I18nValidationExceptionFilter, I18nValidationPipe } from 'nestjs-i18n';
 
 export function configureApp(app: INestApplication): INestApplication {
   app.use(express.json({ limit: '10mb' }));
@@ -16,12 +15,5 @@ export function configureApp(app: INestApplication): INestApplication {
   const logger = new ConsoleLogger({ json: true, logLevels });
   app.useLogger(logger);
 
-  app.useGlobalPipes(new I18nValidationPipe());
-  app.useGlobalFilters(
-    new I18nValidationExceptionFilter({
-      detailedErrors: false,
-    }),
-  );
-
   return app;
 }

src/app/app.module.ts

@@ -3,10 +3,9 @@ import {
   MiddlewareConsumer,
   Module,
   NestModule,
-  ValidationPipe,
 } from '@nestjs/common';
 import { SerializerInterceptor } from 'omniboxd/interceptor/serializer.interceptor';
-import { APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core';
+import { APP_FILTER, APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { TagModule } from 'omniboxd/tag/tag.module';
 import { CacheModule } from '@nestjs/cache-manager';
@@ -22,6 +21,8 @@ import {
   AcceptLanguageResolver,
   HeaderResolver,
   I18nModule,
+  I18nValidationExceptionFilter,
+  I18nValidationPipe,
   QueryResolver,
 } from 'nestjs-i18n';
 import * as path from 'path';
@@ -82,7 +83,7 @@ export class AppModule implements NestModule {
       providers: [
         {
           provide: APP_PIPE,
-          useValue: new ValidationPipe({
+          useValue: new I18nValidationPipe({
             transform: true,
             // whitelist: true,
             // forbidNonWhitelisted: true,
@@ -100,6 +101,12 @@ export class AppModule implements NestModule {
           provide: APP_INTERCEPTOR,
           useClass: UserInterceptor,
         },
+        {
+          provide: APP_FILTER,
+          useValue: new I18nValidationExceptionFilter({
+            detailedErrors: false,
+          }),
+        },
       ],
       imports: [
         ConfigModule.forRoot({

src/wizard/wizard.service.ts

@@ -393,12 +393,17 @@ export class WizardService {
     const andCondition: string = andConditions.map((x) => `AND ${x}`).join(' ');
     const rawQuery = `
       WITH
+        cutoff_time AS (
+          SELECT NOW() - INTERVAL '10 minutes' AS time
+        ),
         running_tasks_sub_query AS (
           SELECT
             namespace_id,
             COUNT(id) AS running_count
           FROM tasks
+          CROSS JOIN cutoff_time
           WHERE started_at IS NOT NULL
+          AND started_at > cutoff_time.time
           AND ended_at IS NULL
           AND canceled_at IS NULL
           AND deleted_at IS NULL
@@ -407,11 +412,13 @@ export class WizardService {
         id_subquery AS (
           SELECT tasks.id
           FROM tasks
+          CROSS JOIN cutoff_time
           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
+          WHERE (tasks.started_at IS NULL OR tasks.started_at <= cutoff_time.time)
+          AND tasks.ended_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)
@@ -423,8 +430,7 @@ export class WizardService {
       )
       SELECT *
       FROM tasks
-      WHERE id IN (SELECT id FROM id_subquery)
-        FOR UPDATE SKIP LOCKED;
+      WHERE id IN (SELECT id FROM id_subquery);
     `;
 
     const queryResult =