Fix ORM Config generation (#289)

antoinejaussoin · Aug 10, 2021 · 950bb86 · 950bb86
1 parent 930d41f
commit 950bb86
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 25 deletions.
diff --git a/backend/src/build-config.ts b/backend/src/build-config.ts
@@ -29,16 +29,17 @@ async function buildOrmConfigTs() {
 }
 
 function getConfig(extension: 'js' | 'ts') {
-  const config = getOrmConfig();
   const rootPath = path.resolve(__dirname);
   const entities = path.resolve(rootPath, 'db', 'entities');
-  const migrations = path.resolve(rootPath, 'db', 'migrations');
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  (config as any).entities = [`${entities}/*.${extension}`];
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  (config as any).migrations = [`${migrations}/*.${extension}`];
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  (config as any).cli.migrationsDir = migrations;
+  const migrations =
+    extension === 'ts' ? 'src/db/migrations' : 'dist/src/db/migrations';
+
+  const config = getOrmConfig({
+    entities: [`${entities}/*.${extension}`],
+    migrations: [`${migrations}/*.${extension}`],
+    migrationDir: migrations,
+  });
+
   return config;
 }
 

diff --git a/backend/src/db/orm-config.ts b/backend/src/db/orm-config.ts
@@ -17,33 +17,50 @@ import SessionOptionsEntity from './entities/SessionOptions';
 
 const migrationsDirectory = 'src/db/migrations';
 
-export default function (): ConnectionOptions {
+export type ConnectionOptionsCustomisation = {
+  entities: string[];
+  migrations: string[];
+  migrationDir: string;
+};
+
+export default function (
+  customisation?: Partial<ConnectionOptionsCustomisation>
+): ConnectionOptions {
   return {
     type: 'postgres',
     host: config.DB_HOST,
     port: config.DB_PORT,
     username: config.DB_USER,
     password: config.DB_PASSWORD,
     database: config.DB_NAME,
-    entities: [
-      PostEntity,
-      PostGroupEntity,
-      SessionEntity,
-      UserEntity,
-      UserView,
-      ColumnDefinitionEntity,
-      VoteEntity,
-      SessionTemplateEntity,
-      TemplateColumnDefinitionEntity,
-      SubscriptionEntity,
-      LicenceEntity,
-      SessionOptionsEntity,
-    ],
+    entities:
+      customisation && customisation.entities
+        ? customisation.entities
+        : [
+            PostEntity,
+            PostGroupEntity,
+            SessionEntity,
+            UserEntity,
+            UserView,
+            ColumnDefinitionEntity,
+            VoteEntity,
+            SessionTemplateEntity,
+            TemplateColumnDefinitionEntity,
+            SubscriptionEntity,
+            LicenceEntity,
+            SessionOptionsEntity,
+          ],
     synchronize: false,
     logging: config.SQL_LOG ? 'all' : undefined,
-    migrations: [`${migrationsDirectory}/*.ts`],
+    migrations:
+      customisation && customisation.migrations
+        ? customisation.migrations
+        : [`${migrationsDirectory}/*.ts`],
     cli: {
-      migrationsDir: migrationsDirectory,
+      migrationsDir:
+        customisation && customisation.migrationDir
+          ? customisation.migrationDir
+          : migrationsDirectory,
     },
   };
 }