@koalarx/nest-cli 3.0.46 → 3.0.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koalarx/nest-cli",
-  "version": "3.0.46",
+  "version": "3.0.48",
   "description": "CLI para criação de projetos utilizando Koala Nest",
   "main": "index.js",
   "bin": {

package/templates/startup-project/src/host/controllers/person/{person.controller.e2e-spec.ts → person.controller.spec.ts}

@@ -19,7 +19,7 @@ describe(`CRUD OF PERSON`, () => {
         name: 'John Doe',
         phones: [],
         address: {
-          address: 'Streat 1',
+          address: 'Street 1',
         },
       })
 
@@ -46,7 +46,7 @@ describe(`CRUD OF PERSON`, () => {
       phones: [],
       address: {
         id: expect.any(Number),
-        address: 'Streat 1',
+        address: 'Street 1',
       },
       active: true,
     })
@@ -66,7 +66,7 @@ describe(`CRUD OF PERSON`, () => {
           phones: [],
           address: {
             id: addressId,
-            address: 'Streat 1',
+            address: 'Street 1',
           },
           active: true,
         },
@@ -101,7 +101,7 @@ describe(`CRUD OF PERSON`, () => {
           phones: [],
           address: {
             id: addressId,
-            address: 'Streat 1',
+            address: 'Street 1',
           },
           active: true,
         },
@@ -118,7 +118,7 @@ describe(`CRUD OF PERSON`, () => {
         phones: [],
         address: {
           id: addressId,
-          address: 'Streat 2',
+          address: 'Street 2',
         },
         active: true,
       })
@@ -135,7 +135,7 @@ describe(`CRUD OF PERSON`, () => {
       phones: [],
       address: {
         id: addressId,
-        address: 'Streat 2',
+        address: 'Street 2',
       },
       active: true,
     })

package/templates/startup-project/src/test/create-e2e-test-app.ts

@@ -5,13 +5,10 @@ import { KoalaAppTest } from '@koalarx/nest/test/koala-app-test'
 import { Test } from '@nestjs/testing'
 import { PrismaPg } from '@prisma/adapter-pg'
 import 'dotenv/config'
-import { Pool } from 'pg'
+import { pgClient } from './setup-e2e'
 
 export async function createE2ETestApp() {
-  const pool = new Pool({
-    connectionString: process.env.DATABASE_URL,
-  })
-  const adapter = new PrismaPg(pool)
+  const adapter = new PrismaPg(pgClient.pool)
   setPrismaClientOptions({ adapter })
 
   return Test.createTestingModule({ imports: [AppModule] })

package/templates/startup-project/src/test/setup-e2e.ts

@@ -1,12 +1,69 @@
 import { createE2EDatabase } from '@koalarx/nest/test/utils/create-e2e-database'
-import { dropE2EDatabase } from '@koalarx/nest/test/utils/drop-e2e-database'
+import { E2EDatabaseClient } from '@koalarx/nest/test/utils/e2e-database-client'
+import { delay } from '@koalarx/utils'
+import { Pool } from 'pg'
 
-let schemaId: string
+export let pgClient: E2EPostgresClient
+
+class E2EPostgresClient extends E2EDatabaseClient {
+  private baseUrl: URL
+
+  public pool: Pool
+
+  constructor(url: string, schemaName: string) {
+    super(url, schemaName)
+
+    this.baseUrl = new URL(this.url)
+    this.baseUrl.pathname = `/${this.schemaName}`
+
+    this.pool = this.createSession()
+  }
+
+  private createSession(idleTimeout?: number) {
+    return new Pool({
+      connectionString: this.baseUrl.toString(),
+      ...(idleTimeout ? { idleTimeoutMillis: idleTimeout } : {}),
+    })
+  }
+
+  async createDatabase(schemaName: string): Promise<void> {
+    this.baseUrl.pathname = `/postgres`
+
+    const pool = this.createSession()
+
+    await pool.query(`CREATE DATABASE "${schemaName}"`)
+    await pool.end()
+
+    this.baseUrl.pathname = `/${schemaName}`
+  }
+
+  async dropDatabase(): Promise<void> {
+    await this.pool.end()
+
+    await delay(1000)
+
+    this.baseUrl.pathname = '/postgres'
+    const pool = this.createSession(100)
+
+    await pool.query(`
+      SELECT pg_terminate_backend(pg_stat_activity.pid)
+      FROM pg_stat_activity
+      WHERE pg_stat_activity.datname = '${this.schemaName}'
+      AND pid <> pg_backend_pid()
+    `)
+
+    await delay(500)
+
+    await pool.query(`DROP DATABASE IF EXISTS "${this.schemaName}"`)
+    await pool.end()
+  }
+}
 
 beforeAll(async () => {
-  schemaId = await createE2EDatabase('bun')
+  const { client } = await createE2EDatabase('bun', E2EPostgresClient)
+  pgClient = client
 }, 60000)
 
 afterAll(async () => {
-  await dropE2EDatabase(schemaId)
+  await pgClient.dropDatabase()
 })