From 851153c8e1312cb090420927af00924e3e59c247 Mon Sep 17 00:00:00 2001
From: Francesco Spilla <francesco.spilla@maiora.eu>
Date: Mon, 10 Feb 2025 14:34:21 +0100
Subject: [PATCH] chore(repo): update AppDatabase module

---
 .../ebitemp-api/src/app/modules/database/database.module.ts | 5 ++---
 .../modules/database/utils/typeorm-data-source-factory.ts   | 2 +-
 .../database/utils/typeorm-module-options-factory.ts        | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/ebitemp-api/src/app/modules/database/database.module.ts b/apps/ebitemp-api/src/app/modules/database/database.module.ts
index e12ad9a..b1e526e 100644
--- a/apps/ebitemp-api/src/app/modules/database/database.module.ts
+++ b/apps/ebitemp-api/src/app/modules/database/database.module.ts
@@ -11,13 +11,12 @@ const dataSources: DataSource[] = [];
 
 const typeormModules = [
   TypeOrmModule.forRootAsync({
-    name: 'ebitemp-api',
-    dataSourceFactory: typeormTransactionalDataSourceFactory('ebitemp-api', dataSources),
+    dataSourceFactory: typeormTransactionalDataSourceFactory(dataSources),
     useFactory: async (dbConfig: DatabaseConfig) => {
       // const entities = await import('./path/to/entities');
       const entities = {};
 
-      const config = await typeormModuleOptionsFactory('ebitemp-api', dbConfig, [
+      const config = await typeormModuleOptionsFactory(dbConfig, [
         typeormEntitiesFromImport(entities),
       ]);
       return config;
diff --git a/apps/ebitemp-api/src/app/modules/database/utils/typeorm-data-source-factory.ts b/apps/ebitemp-api/src/app/modules/database/utils/typeorm-data-source-factory.ts
index a2a867b..b210302 100644
--- a/apps/ebitemp-api/src/app/modules/database/utils/typeorm-data-source-factory.ts
+++ b/apps/ebitemp-api/src/app/modules/database/utils/typeorm-data-source-factory.ts
@@ -7,7 +7,7 @@ export const typeormDataSourceFactory = (dataSources: DataSource[]) => async (op
 };
 
 export const typeormTransactionalDataSourceFactory =
-  (name: string, dataSources: DataSource[]) => async (options?: DataSourceOptions) => {
+  (dataSources: DataSource[], name?: string) => async (options?: DataSourceOptions) => {
     const tt = await import('typeorm-transactional');
     const dataSource = tt.addTransactionalDataSource({ name: name, dataSource: new DataSource(options!) });
     dataSources.push(dataSource);
diff --git a/apps/ebitemp-api/src/app/modules/database/utils/typeorm-module-options-factory.ts b/apps/ebitemp-api/src/app/modules/database/utils/typeorm-module-options-factory.ts
index fa4bf79..c40448f 100644
--- a/apps/ebitemp-api/src/app/modules/database/utils/typeorm-module-options-factory.ts
+++ b/apps/ebitemp-api/src/app/modules/database/utils/typeorm-module-options-factory.ts
@@ -2,9 +2,9 @@ import { TypeOrmModuleOptions } from '@nestjs/typeorm';
 import { DatabaseConfig } from '../database.config';
 
 export const typeormModuleOptionsFactory = async (
-  name: string,
   databaseConfig: DatabaseConfig,
-  entities: any[]
+  entities: any[],
+  name?: string
 ): Promise<TypeOrmModuleOptions> => {
   return {
     name: name,
@@ -19,6 +19,6 @@ export const typeormModuleOptionsFactory = async (
     logging: process.env['NODE_ENV'] !== 'production',
     options: {
       ...(!databaseConfig.secure ? { trustServerCertificate: true } : {}),
-    }
+    },
   };
 };