nest-knexjs 0.0.14 → 0.0.16

package/.github/workflows/nodejs-environment.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [16.x, 18.x]
 
     steps:
       - uses: actions/checkout@v3
@@ -23,3 +23,32 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: npm ci
       - run: npm run build --if-present
+      
+  integration-test:
+
+    runs-on: ubuntu-latest
+  
+    strategy:
+      matrix:
+        node-version: [16.x, 18.x]
+    needs: [build]
+  
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Start Docker-Compose
+        run: cd tests && docker-compose up -d
+      - name: Install npm
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm install
+      - name: Run migrations for test
+        run: cd tests/src/apps/app-knex && npx knex migrate:up
+      - name: Run tests e2e
+        run: npm run test:e2e
+      - name: Stop Docker-Compose
+        run: cd tests && docker-compose down

package/dist/common/knex.utils.d.ts

@@ -17,4 +17,4 @@ export declare function getConnectionToken(connection?: KnexModuleOptions | stri
 export declare function getConnectionPrefix(connection?: KnexModuleOptions | string): string;
 export declare function handleRetry(retryAttempts?: number, retryDelay?: number): <T>(source: Observable<T>) => Observable<T>;
 export declare function getConnectionName(options: KnexModuleOptions): string;
-export declare const generateString: () => any;
+export declare const generateString: () => `${string}-${string}-${string}-${string}-${string}`;

package/dist/common/knex.utils.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateString = exports.getConnectionName = exports.handleRetry = exports.getConnectionPrefix = exports.getConnectionToken = exports.getModelToken = void 0;
 const knex_constants_1 = require("../knex.constants");
 const operators_1 = require("rxjs/operators");
-const uuid_1 = require("uuid");
+const node_crypto_1 = require("node:crypto");
 const common_1 = require("@nestjs/common");
 const circular_dependency_exception_1 = require("../exceptions/circular-dependency.exception");
 const logger = new common_1.Logger('KnexModule');
@@ -61,5 +61,5 @@ function getConnectionName(options) {
     return options && options.name ? options.name : knex_constants_1.DEFAULT_CONNECTION_NAME;
 }
 exports.getConnectionName = getConnectionName;
-const generateString = () => (0, uuid_1.v4)();
+const generateString = () => (0, node_crypto_1.randomUUID)();
 exports.generateString = generateString;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nest-knexjs",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "Knexjs module for Nest framework (node.js) 😻",
   "author": "Tony133",
   "license": "MIT",
@@ -12,41 +12,41 @@
     "publish:npm": "npm publish --access public",
     "prepublish:next": "npm run build",
     "publish:next": "npm publish --access public --tag next",
-    "test:e2e": "jest --config ./tests/jest-e2e.json --runInBand",
+    "test:e2e": "jest --config ./tests/jest-e2e.json --detectOpenHandles --forceExit",
     "test:e2e:dev": "jest --config ./tests/jest-e2e.json --runInBand --watch",
     "prerelease": "npm run build",
     "release": "release-it",
     "prepare": "husky install"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.4.4",
-    "@commitlint/config-angular": "17.4.4",
-    "@nestjs/common": "9.3.2",
-    "@nestjs/core": "9.3.2",
-    "@nestjs/platform-express": "9.3.2",
-    "@nestjs/testing": "9.3.2",
+    "@commitlint/cli": "17.6.3",
+    "@commitlint/config-angular": "17.6.3",
+    "@nestjs/common": "9.4.2",
+    "@nestjs/core": "9.4.2",
+    "@nestjs/platform-express": "9.4.2",
+    "@nestjs/testing": "9.4.2",
     "@types/express": "4.17.17",
-    "@types/jest": "29.4.0",
-    "@types/node": "18.14.0",
+    "@types/jest": "29.5.1",
+    "@types/node": "20.2.5",
     "@types/supertest": "2.0.12",
-    "@typescript-eslint/eslint-plugin": "5.52.0",
-    "@typescript-eslint/parser": "5.52.0",
-    "eslint": "8.34.0",
-    "eslint-config-prettier": "8.6.0",
+    "@typescript-eslint/eslint-plugin": "5.59.7",
+    "@typescript-eslint/parser": "5.59.7",
+    "eslint": "8.41.0",
+    "eslint-config-prettier": "8.8.0",
     "eslint-plugin-import": "2.27.5",
     "husky": "8.0.3",
-    "jest": "29.4.3",
+    "jest": "29.5.0",
     "knex": "2.4.2",
     "mysql": "2.18.1",
-    "prettier": "2.8.4",
+    "prettier": "2.8.8",
     "reflect-metadata": "0.1.13",
-    "release-it": "15.6.0",
-    "rxjs": "7.8.0",
+    "release-it": "15.10.3",
+    "rxjs": "7.8.1",
     "supertest": "6.3.3",
-    "ts-jest": "29.0.5",
+    "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
-    "tsconfig-paths": "4.1.2",
-    "typescript": "4.9.5"
+    "tsconfig-paths": "4.2.0",
+    "typescript": "5.0.4"
   },
   "peerDependencies": {
     "@nestjs/common": "^7.0.0 || ^8.0.0 || ^9.0.0",
@@ -61,8 +61,5 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/tony133/nestjs-knexjs"
-  },
-  "dependencies": {
-    "uuid": "9.0.0"
   }
 }

package/tests/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3"
+
+services:
+   mysql:
+    image: mysql:5
+    environment:
+       MYSQL_ROOT_USER: root
+       MYSQL_ROOT_PASSWORD: root
+       MYSQL_DATABASE: test
+    ports:
+       - "3306:3306"
+    restart: always
+

package/tests/{user.e2e-spec.ts → e2e/knex-app-user.spec.ts}

@@ -1,10 +1,10 @@
 import { INestApplication, HttpStatus } from '@nestjs/common';
 import { TestingModule, Test } from '@nestjs/testing';
-import { UsersModule } from './app-knex/app/users/users.module';
-import { KnexModule } from '../lib';
+import { UsersModule } from '../src/apps/app-knex/app/users/users.module';
+import { KnexModule } from '../../lib';
 import * as request from 'supertest';
 
-describe('[Feature] User - /user', () => {
+describe('[Feature] Users - /users', () => {
   let app: INestApplication;
 
   beforeAll(async () => {
@@ -19,7 +19,7 @@ describe('[Feature] User - /user', () => {
             connection: {
               host: '127.0.0.1',
               user: 'root',
-              port: 3308,
+              port: 3306,
               password: 'root',
               database: 'test',
             },
@@ -32,44 +32,29 @@ describe('[Feature] User - /user', () => {
     await app.init();
   });
 
-  it('Create [POST /]', () => {
+  it('should create a new user [POST /users]', () => {
     return request(app.getHttpServer())
-      .post('/user')
+      .post('/users')
       .expect(HttpStatus.CREATED)
       .set('Accept', 'application/json')
       .send({
         firstName: 'firstName',
         lastName: 'lastName',
       })
-      .then((res) => {
-        res.body;
+      .then(({ body }) => {
+        expect(body).toEqual({ users: [1] });
       });
   });
 
-  it('Get all [GET /]', () => {
+  it('should get all users [GET /users]', () => {
     return request(app.getHttpServer())
-      .get('/user')
+      .get('/users')
       .expect(HttpStatus.OK)
       .set('Accept', 'application/json')
       .then(({ body }) => {
         expect(body['users']).toEqual([
           {
             id: 1,
-            firstName: 'firstName #1',
-            lastName: 'lastName #1',
-          },
-          {
-            id: 2,
-            firstName: 'firstName #1',
-            lastName: 'lastName #1',
-          },
-          {
-            id: 3,
-            firstName: 'firstName #1',
-            lastName: 'lastName #1',
-          },
-          {
-            id: 4,
             firstName: 'firstName',
             lastName: 'lastName',
           },
@@ -77,39 +62,38 @@ describe('[Feature] User - /user', () => {
       });
   });
 
-  it('Get one [GET /:id]', () => {
+  it('should get a user by id [GET /users/:id]', () => {
     return request(app.getHttpServer())
-      .get('/user/2')
+      .get('/users/1')
       .expect(HttpStatus.OK)
       .set('Accept', 'application/json')
       .then(({ body }) => {
         expect(body['users']).toEqual([
           {
-            id: 2,
-            firstName: 'firstName #1',
-            lastName: 'lastName #1',
+            id: 1,
+            firstName: 'firstName',
+            lastName: 'lastName',
           },
         ]);
       });
   });
 
-  it('Update one [PUT /:id]', () => {
+  it('should update a user by id [PUT /users/:id]', () => {
     return request(app.getHttpServer())
-      .put('/user/2')
+      .put('/users/1')
       .expect(HttpStatus.OK)
       .send({
-        firstName: 'firstName update',
-        lastName: 'lastName update',
+        firstName: 'firstName',
+        lastName: 'lastName',
       })
-      .then((res) => {
-        res.body;
+      .then(({ body }) => {
+        expect(body).toEqual({ users: 1 });
       });
   });
 
-  it('Delete one [DELETE /:id]', () => {
+  it('should delete a user by id [DELETE /users/:id]', () => {
     return request(app.getHttpServer())
-      .delete('/user/1')
-      .set('Accept', 'application/json')
+      .delete('/users/1')
       .expect(HttpStatus.OK);
   });
 

package/tests/e2e/knex-async-class.spec.ts

@@ -0,0 +1,35 @@
+import { HttpStatus, INestApplication } from '@nestjs/common';
+import { Test } from '@nestjs/testing';
+import { AsyncOptionsClassModule } from '../src/async-class-options.module';
+import * as request from 'supertest';
+
+describe('Knex (async configuration)', () => {
+  let app: INestApplication;
+
+  beforeAll(async () => {
+    const module = await Test.createTestingModule({
+      imports: [AsyncOptionsClassModule],
+    }).compile();
+
+    app = module.createNestApplication();
+    await app.init();
+  });
+
+  it(`should return created entity`, () => {
+    return request(app.getHttpServer())
+      .post('/users')
+      .expect(HttpStatus.CREATED)
+      .set('Accept', 'application/json')
+      .send({
+        firstName: 'firstName',
+        lastName: 'lastName',
+      })
+      .expect(({ body }) => {
+        expect(body).toEqual({ users: [body.users[0]] });
+      });
+  });
+
+  afterAll(async () => {
+    await app.close();
+  });
+});

package/tests/e2e/knex-async-existing.spec.ts

@@ -0,0 +1,35 @@
+import { HttpStatus, INestApplication } from '@nestjs/common';
+import { Test } from '@nestjs/testing';
+import { AsyncOptionsExistingModule } from '../src/async-existing-options.module';
+import * as request from 'supertest';
+
+describe('Knex (async configuration)', () => {
+  let app: INestApplication;
+
+  beforeAll(async () => {
+    const module = await Test.createTestingModule({
+      imports: [AsyncOptionsExistingModule],
+    }).compile();
+
+    app = module.createNestApplication();
+    await app.init();
+  });
+
+  it(`should return created entity`, () => {
+    return request(app.getHttpServer())
+      .post('/users')
+      .expect(HttpStatus.CREATED)
+      .set('Accept', 'application/json')
+      .send({
+        firstName: 'firstName',
+        lastName: 'lastName',
+      })
+      .expect(({ body }) => {
+        expect(body).toEqual({ users: [body.users[0]] });
+      });
+  });
+
+  afterAll(async () => {
+    await app.close();
+  });
+});

package/tests/e2e/knex-async.spec.ts

@@ -0,0 +1,35 @@
+import { HttpStatus, INestApplication } from '@nestjs/common';
+import { Test } from '@nestjs/testing';
+import { AsyncApplicationModule } from '../src/app-async.module';
+import * as request from 'supertest';
+
+describe('Knex (async configuration)', () => {
+  let app: INestApplication;
+
+  beforeAll(async () => {
+    const module = await Test.createTestingModule({
+      imports: [AsyncApplicationModule],
+    }).compile();
+
+    app = module.createNestApplication();
+    await app.init();
+  });
+
+  it(`should return created entity`, () => {
+    return request(app.getHttpServer())
+      .post('/users')
+      .expect(HttpStatus.CREATED)
+      .set('Accept', 'application/json')
+      .send({
+        firstName: 'firstName',
+        lastName: 'lastName',
+      })
+      .expect(({ body }) => {
+        expect(body).toEqual({ users: [body.users[0]] });
+      });
+  });
+
+  afterAll(async () => {
+    await app.close();
+  });
+});

package/tests/e2e/knex.spec.ts

@@ -0,0 +1,35 @@
+import { INestApplication } from '@nestjs/common';
+import { Test } from '@nestjs/testing';
+import { ApplicationModule } from '../src/app.module';
+import * as request from 'supertest';
+
+describe('Knex', () => {
+  let app: INestApplication;
+
+  beforeAll(async () => {
+    const module = await Test.createTestingModule({
+      imports: [ApplicationModule],
+    }).compile();
+
+    app = module.createNestApplication();
+    await app.init();
+  });
+
+  it(`should return created entity`, () => {
+    return request(app.getHttpServer())
+      .post('/users')
+      .expect(201)
+      .set('Accept', 'application/json')
+      .send({
+        firstName: 'firstName',
+        lastName: 'lastName',
+      })
+      .expect(({ body }) => {
+        expect(body).toEqual({ users: [body.users[0]] });
+      });
+  });
+
+  afterAll(async () => {
+    await app.close();
+  });
+});

package/tests/jest-e2e.json

@@ -1,8 +1,8 @@
 {
     "moduleFileExtensions": ["js", "json", "ts"],
-    "rootDir": "..",
+    "rootDir": ".",
     "testEnvironment": "node",
-    "testRegex": ".e2e-spec.ts$",
+    "testRegex": ".spec.ts$",
     "transform": {
       "^.+\\.(t|j)s$": "ts-jest"
     }

package/tests/src/app-async.module.ts

@@ -0,0 +1,8 @@
+import { Module } from '@nestjs/common';
+import { AppModule } from './apps/app-knex/app/app.module';
+import { DatabaseModule } from './database.module';
+
+@Module({
+  imports: [DatabaseModule.forRoot(), AppModule],
+})
+export class AsyncApplicationModule {}

package/tests/src/app.module.ts

@@ -0,0 +1,28 @@
+import { Module } from '@nestjs/common';
+import { KnexModule } from '../../lib';
+import { UsersModule } from './apps/app-knex/app/users/users.module';
+
+@Module({
+  imports: [
+    KnexModule.forRoot({
+      config: {
+        client: 'mysql',
+        version: '5.7',
+        useNullAsDefault: true,
+        connection: {
+          host: '127.0.0.1',
+          user: 'root',
+          port: 3306,
+          password: 'root',
+          database: 'test',
+        },
+        pool: {
+          min: 2,
+          max: 10,
+        },
+      },
+    }),
+    UsersModule,
+  ],
+})
+export class ApplicationModule {}

package/tests/{app-knex → src/apps/app-knex}/app/app.module.ts

@@ -1,5 +1,5 @@
 import { Module } from '@nestjs/common';
-import { KnexModule } from '../../../lib';
+import { KnexModule } from '../../../../../lib';
 import { UsersModule } from './users/users.module';
 
 @Module({
@@ -11,7 +11,7 @@ import { UsersModule } from './users/users.module';
         useNullAsDefault: true,
         connection: {
           host: '127.0.0.1',
-          port: 3308,
+          port: 3306,
           user: 'root',
           password: 'root',
           database: 'test',

package/tests/{app-knex → src/apps/app-knex}/app/users/users.service.ts

@@ -5,7 +5,7 @@ import {
   NotFoundException,
 } from '@nestjs/common';
 import { Knex } from 'knex';
-import { InjectModel } from '../../../../lib';
+import { InjectModel } from '../../../../../../lib';
 import { CreateUserDto } from './dto/create-user.dto';
 import { UpdateUserDto } from './dto/update-user.dto';
 

package/tests/{app-knex → src/apps/app-knex}/docker-compose.yml

@@ -9,4 +9,4 @@ services:
        MYSQL_ROOT_PASSWORD: root
        MYSQL_DATABASE: test
      ports:
-       - "3308:3306"
+       - "3306:3306"

package/tests/{app-multi-database → src/apps/app-multi-database}/app/users/users.service.ts

@@ -5,7 +5,7 @@ import {
   NotFoundException,
 } from '@nestjs/common';
 import { Knex } from 'knex';
-import { InjectConnection } from '../../../../lib';
+import { InjectConnection } from '../../../../../../lib';
 import { CreateUserDto } from './dto/create-user.dto';
 import { UpdateUserDto } from './dto/update-user.dto';
 

package/tests/src/async-class-options.module.ts

@@ -0,0 +1,54 @@
+import { Module } from '@nestjs/common';
+import { KnexOptionsFactory, KnexModuleOptions, KnexModule } from '../../lib';
+import { UsersModule } from './apps/app-knex/app/users/users.module';
+
+class ConfigService implements KnexOptionsFactory {
+  createKnexOptions(): KnexModuleOptions {
+    return {
+      config: {
+        client: 'mysql',
+        version: '5.7',
+        useNullAsDefault: true,
+        connection: {
+          host: '127.0.0.1',
+          user: 'root',
+          port: 3306,
+          password: 'root',
+          database: 'test',
+        },
+        pool: {
+          min: 2,
+          max: 10,
+        },
+      },
+    };
+  }
+}
+
+@Module({
+  imports: [
+    KnexModule.forRootAsync({
+      useClass: ConfigService,
+    }),
+    KnexModule.forRoot({
+      config: {
+        client: 'mysql',
+        version: '5.7',
+        useNullAsDefault: true,
+        connection: {
+          host: '127.0.0.1',
+          user: 'root',
+          port: 3306,
+          password: 'root',
+          database: 'test',
+        },
+        pool: {
+          min: 2,
+          max: 10,
+        },
+      },
+    }),
+    UsersModule,
+  ],
+})
+export class AsyncOptionsClassModule {}

package/tests/src/async-existing-options.module.ts

@@ -0,0 +1,62 @@
+import { Module } from '@nestjs/common';
+import { UsersModule } from '../src/apps/app-knex/app/users/users.module';
+import { KnexModule } from '../../lib/knex.module';
+import { KnexModuleOptions, KnexOptionsFactory } from '../../lib';
+
+class ConfigService implements KnexOptionsFactory {
+  createKnexOptions(): KnexModuleOptions {
+    return {
+      config: {
+        client: 'mysql',
+        version: '5.7',
+        useNullAsDefault: true,
+        connection: {
+          host: '127.0.0.1',
+          user: 'root',
+          port: 3306,
+          password: 'root',
+          database: 'test',
+        },
+        pool: {
+          min: 2,
+          max: 10,
+        },
+      },
+    };
+  }
+}
+
+@Module({
+  providers: [ConfigService],
+  exports: [ConfigService],
+})
+class ConfigModule {}
+
+@Module({
+  imports: [
+    KnexModule.forRootAsync({
+      imports: [ConfigModule],
+      useExisting: ConfigService,
+    }),
+    KnexModule.forRoot({
+      config: {
+        client: 'mysql',
+        version: '5.7',
+        useNullAsDefault: true,
+        connection: {
+          host: '127.0.0.1',
+          user: 'root',
+          port: 3306,
+          password: 'root',
+          database: 'test',
+        },
+        pool: {
+          min: 2,
+          max: 10,
+        },
+      },
+    }),
+    UsersModule,
+  ],
+})
+export class AsyncOptionsExistingModule {}

package/tests/src/database.module.ts

@@ -0,0 +1,58 @@
+import { DynamicModule, Module } from '@nestjs/common';
+import { KnexModule } from '../../lib';
+
+@Module({})
+export class DatabaseModule {
+  static async forRoot(): Promise<DynamicModule> {
+    await new Promise((resolve) => setTimeout(resolve, 1000));
+    return {
+      module: DatabaseModule,
+      imports: [
+        KnexModule.forRoot(
+          {
+            name: 'db1Connection',
+            config: {
+              client: 'mysql',
+              version: '5.7',
+              useNullAsDefault: true,
+              connection: {
+                host: '127.0.0.1',
+                user: 'root',
+                port: 3306,
+                password: 'root',
+                database: 'test',
+              },
+              pool: {
+                min: 2,
+                max: 10,
+              },
+            },
+          },
+          'db1Connection',
+        ),
+        KnexModule.forRoot(
+          {
+            name: 'db2Connection',
+            config: {
+              client: 'mysql',
+              version: '5.7',
+              useNullAsDefault: true,
+              connection: {
+                host: '127.0.0.1',
+                user: 'root',
+                port: 3306,
+                password: 'root',
+                database: 'test',
+              },
+              pool: {
+                min: 2,
+                max: 10,
+              },
+            },
+          },
+          'db2Connection',
+        ),
+      ],
+    };
+  }
+}

package/tags

@@ -1,19 +0,0 @@
-!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
-!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
-!_TAG_PROGRAM_AUTHOR	Darren Hiebert	/dhiebert@users.sourceforge.net/
-!_TAG_PROGRAM_NAME	Exuberant Ctags	//
-!_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/
-!_TAG_PROGRAM_VERSION	5.8	//
-exports.down	tests/app-knex/migrations/20210223224919_api.js	/^exports.down = function (knex) {$/;"	f
-exports.down	tests/app-multi-database/migrations/posts/20210902093735_posts.js	/^exports.down = function (knex) {$/;"	f
-exports.down	tests/app-multi-database/migrations/users/20210808150144_users.js	/^exports.down = function (knex) {$/;"	f
-exports.seed	tests/app-knex/seeds/users.js	/^exports.seed = function (knex) {$/;"	f
-exports.seed	tests/app-multi-database/seeds/posts.js	/^exports.seed = function (knex) {$/;"	f
-exports.seed	tests/app-multi-database/seeds/users.js	/^exports.seed = function (knex) {$/;"	f
-exports.up	tests/app-knex/migrations/20210223224919_api.js	/^exports.up = function (knex) {$/;"	f
-exports.up	tests/app-multi-database/migrations/posts/20210902093735_posts.js	/^exports.up = function (knex) {$/;"	f
-exports.up	tests/app-multi-database/migrations/users/20210808150144_users.js	/^exports.up = function (knex) {$/;"	f
-module.exports.development	tests/app-knex/knexfile.js	/^  development: {$/;"	p
-module.exports.development	tests/app-multi-database/knexfile.js	/^  development: {$/;"	p
-module.exports.parser	.eslintrc.js	/^    parser: '@typescript-eslint\/parser',$/;"	p
-module.exports.parserOptions	.eslintrc.js	/^    parserOptions: {$/;"	p

package/tests/app-knex/app/users/users.service.spec.ts

@@ -1,18 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { UsersService } from './users.service';
-
-describe('UsersService', () => {
-  let service: UsersService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [UsersService],
-    }).compile();
-
-    service = module.get<UsersService>(UsersService);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});

package/tests/app-multi-database/app/post/post.service.spec.ts

@@ -1,18 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { PostService } from './post.service';
-
-describe('PostService', () => {
-  let service: PostService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [PostService],
-    }).compile();
-
-    service = module.get<PostService>(PostService);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});

package/tests/app-multi-database/app/users/users.service.spec.ts

@@ -1,18 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { UsersService } from './users.service';
-
-describe('UsersService', () => {
-  let service: UsersService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [UsersService],
-    }).compile();
-
-    service = module.get<UsersService>(UsersService);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});

package/tests/posts.e2e-spec.ts

@@ -1,130 +0,0 @@
-import { INestApplication, HttpStatus } from '@nestjs/common';
-import { TestingModule, Test } from '@nestjs/testing';
-import { UsersModule } from './app-multi-database/app/users/users.module';
-import { KnexModule } from '../lib';
-import * as request from 'supertest';
-import { PostModule } from './app-multi-database/app/post/post.module';
-
-describe('[Feature] Posts - /posts', () => {
-  let app: INestApplication;
-
-  beforeAll(async () => {
-    const moduleFixture: TestingModule = await Test.createTestingModule({
-      imports: [
-        KnexModule.forRootAsync(
-          {
-            useFactory: () => ({
-              config: {
-                client: 'mysql',
-                version: '5.7',
-                useNullAsDefault: true,
-                connection: {
-                  host: '127.0.0.1',
-                  user: 'root',
-                  port: 3307,
-                  password: 'root',
-                  database: 'test2',
-                },
-                pool: {
-                  min: 2,
-                  max: 10,
-                },
-              },
-            }),
-          },
-          'db2Connection',
-        ),
-        UsersModule,
-        PostModule,
-      ],
-    }).compile();
-
-    app = moduleFixture.createNestApplication();
-    await app.init();
-  });
-
-  it('Create [POST /]', () => {
-    return request(app.getHttpServer())
-      .post('/posts')
-      .expect(HttpStatus.CREATED)
-      .set('Accept', 'application/json')
-      .send({
-        title: 'title #1',
-        description: 'description #1',
-      })
-      .then((res) => {
-        res.body;
-      });
-  });
-
-  it('Get all [GET /]', () => {
-    return request(app.getHttpServer())
-      .get('/posts')
-      .expect(HttpStatus.OK)
-      .set('Accept', 'application/json')
-      .then(({ body }) => {
-        expect(body['users']).toEqual([
-          {
-            id: 1,
-            title: 'title #1',
-            description: 'description #1',
-          },
-          {
-            id: 2,
-            title: 'title #1',
-            description: 'description #1',
-          },
-          {
-            id: 3,
-            title: 'title #1',
-            description: 'description #1',
-          },
-          {
-            id: 4,
-            title: 'title #1',
-            description: 'description #1',
-          },
-        ]);
-      });
-  });
-
-  it('Get one [GET /:id]', () => {
-    return request(app.getHttpServer())
-      .get('/posts/2')
-      .expect(HttpStatus.OK)
-      .set('Accept', 'application/json')
-      .then(({ body }) => {
-        expect(body['users']).toEqual([
-          {
-            id: 2,
-            title: 'title #1',
-            description: 'description #1',
-          },
-        ]);
-      });
-  });
-
-  it('Update one [PUT /:id]', () => {
-    return request(app.getHttpServer())
-      .put('/posts/2')
-      .expect(HttpStatus.OK)
-      .send({
-        title: 'title update',
-        description: 'description update',
-      })
-      .then((res) => {
-        res.body;
-      });
-  });
-
-  it('Delete one [DELETE /:id]', () => {
-    return request(app.getHttpServer())
-      .delete('/posts/1')
-      .set('Accept', 'application/json')
-      .expect(HttpStatus.OK);
-  });
-
-  afterAll(async () => {
-    await app.close();
-  });
-});

package/tests/users.e2e-spec.ts

@@ -1,128 +0,0 @@
-import { INestApplication, HttpStatus } from '@nestjs/common';
-import { TestingModule, Test } from '@nestjs/testing';
-import { UsersModule } from './app-multi-database/app/users/users.module';
-import { KnexModule } from '../lib';
-import * as request from 'supertest';
-
-describe('[Feature] Users - /users', () => {
-  let app: INestApplication;
-
-  beforeAll(async () => {
-    const moduleFixture: TestingModule = await Test.createTestingModule({
-      imports: [
-        UsersModule,
-        KnexModule.forRootAsync(
-          {
-            useFactory: () => ({
-              config: {
-                client: 'mysql',
-                version: '5.7',
-                useNullAsDefault: true,
-                connection: {
-                  host: '127.0.0.1',
-                  user: 'root',
-                  port: 3306,
-                  password: 'root',
-                  database: 'test1',
-                },
-                pool: {
-                  min: 2,
-                  max: 10,
-                },
-              },
-            }),
-          },
-          'db1Connection',
-        ),
-      ],
-    }).compile();
-
-    app = moduleFixture.createNestApplication();
-    await app.init();
-  });
-
-  it('Create [POST /]', () => {
-    return request(app.getHttpServer())
-      .post('/users')
-      .expect(HttpStatus.CREATED)
-      .set('Accept', 'application/json')
-      .send({
-        firstName: 'firstName',
-        lastName: 'lastName',
-      })
-      .then((res) => {
-        res.body;
-      });
-  });
-
-  it('Get all [GET /]', () => {
-    return request(app.getHttpServer())
-      .get('/users')
-      .expect(HttpStatus.OK)
-      .set('Accept', 'application/json')
-      .then(({ body }) => {
-        expect(body['users']).toEqual([
-          {
-            id: 1,
-            firstName: 'firstName #1',
-            lastName: 'lastName #1',
-          },
-          {
-            id: 2,
-            firstName: 'firstName #1',
-            lastName: 'lastName #1',
-          },
-          {
-            id: 3,
-            firstName: 'firstName #1',
-            lastName: 'lastName #1',
-          },
-          {
-            id: 4,
-            firstName: 'firstName',
-            lastName: 'lastName',
-          },
-        ]);
-      });
-  });
-
-  it('Get one [GET /:id]', () => {
-    return request(app.getHttpServer())
-      .get('/users/2')
-      .expect(HttpStatus.OK)
-      .set('Accept', 'application/json')
-      .then(({ body }) => {
-        expect(body['users']).toEqual([
-          {
-            id: 2,
-            firstName: 'firstName #1',
-            lastName: 'lastName #1',
-          },
-        ]);
-      });
-  });
-
-  it('Update one [PUT /:id]', () => {
-    return request(app.getHttpServer())
-      .put('/users/2')
-      .expect(HttpStatus.OK)
-      .send({
-        firstName: 'firstName update',
-        lastName: 'lastName update',
-      })
-      .then((res) => {
-        res.body;
-      });
-  });
-
-  it('Delete one [DELETE /:id]', () => {
-    return request(app.getHttpServer())
-      .delete('/users/1')
-      .set('Accept', 'application/json')
-      .expect(HttpStatus.OK);
-  });
-
-  afterAll(async () => {
-    await app.close();
-  });
-});