From e5eb47af18d073094acc2c497da77f5b56c3454a Mon Sep 17 00:00:00 2001 From: Pranav C Date: Thu, 13 Apr 2023 11:48:57 +0530 Subject: [PATCH] fix: database reset path correction Signed-off-by: Pranav C --- packages/nocodb-nest/src/guards/global/global.guard.ts | 4 +--- .../test/TestResetService/resetMetaSakilaSqliteProject.ts | 4 ++-- .../modules/test/TestResetService/resetMysqlSakilaProject.ts | 2 +- .../src/modules/test/TestResetService/resetPgSakilaProject.ts | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/nocodb-nest/src/guards/global/global.guard.ts b/packages/nocodb-nest/src/guards/global/global.guard.ts index 4b0700468f..d02fee8359 100644 --- a/packages/nocodb-nest/src/guards/global/global.guard.ts +++ b/packages/nocodb-nest/src/guards/global/global.guard.ts @@ -1,7 +1,5 @@ -import { Inject, Injectable } from '@nestjs/common'; -import { ExecutionContextHost } from '@nestjs/core/helpers/execution-context-host'; +import { Injectable } from '@nestjs/common'; import { AuthGuard } from '@nestjs/passport'; -import passport from 'passport'; import { lastValueFrom, Observable } from 'rxjs'; import { JwtStrategy } from '../../strategies/jwt.strategy'; import type { ExecutionContext } from '@nestjs/common'; diff --git a/packages/nocodb-nest/src/modules/test/TestResetService/resetMetaSakilaSqliteProject.ts b/packages/nocodb-nest/src/modules/test/TestResetService/resetMetaSakilaSqliteProject.ts index 0f0989559e..3afce9b44a 100644 --- a/packages/nocodb-nest/src/modules/test/TestResetService/resetMetaSakilaSqliteProject.ts +++ b/packages/nocodb-nest/src/modules/test/TestResetService/resetMetaSakilaSqliteProject.ts @@ -3,7 +3,7 @@ import axios from 'axios'; const sqliteFilePath = (parallelId: string) => { const rootDir = __dirname.replace( - '/src/lib/services/test/TestResetService', + '/src/modules/test/TestResetService', '', ); @@ -79,7 +79,7 @@ const deleteSqliteFileIfExists = async (parallelId: string) => { const seedSakilaSqliteFile = async (parallelId: string) => { const testsDir = __dirname.replace( - '/src/lib/services/test/TestResetService', + '/src/modules/test/TestResetService', '/tests', ); diff --git a/packages/nocodb-nest/src/modules/test/TestResetService/resetMysqlSakilaProject.ts b/packages/nocodb-nest/src/modules/test/TestResetService/resetMysqlSakilaProject.ts index 7e7695db3f..6bcd3f1181 100644 --- a/packages/nocodb-nest/src/modules/test/TestResetService/resetMysqlSakilaProject.ts +++ b/packages/nocodb-nest/src/modules/test/TestResetService/resetMysqlSakilaProject.ts @@ -86,7 +86,7 @@ const resetSakilaMysql = async ( isEmptyProject: boolean, ) => { const testsDir = __dirname.replace( - '/src/lib/services/test/TestResetService', + '/src/modules/test/TestResetService', '/tests', ); diff --git a/packages/nocodb-nest/src/modules/test/TestResetService/resetPgSakilaProject.ts b/packages/nocodb-nest/src/modules/test/TestResetService/resetPgSakilaProject.ts index e1b94513cb..1a042c36d7 100644 --- a/packages/nocodb-nest/src/modules/test/TestResetService/resetPgSakilaProject.ts +++ b/packages/nocodb-nest/src/modules/test/TestResetService/resetPgSakilaProject.ts @@ -79,7 +79,7 @@ const isSakilaPgToBeReset = async (parallelId: string, project?: Project) => { const resetSakilaPg = async (parallelId: string, isEmptyProject: boolean) => { const testsDir = __dirname.replace( - '/src/lib/services/test/TestResetService', + '/src/modules/test/TestResetService', '/tests', );