chore: allow to pick up entities from shared libraries

Vizzuality · May 31, 2021 · fbf3f12 · fbf3f12
1 parent 51ad350
commit fbf3f12
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/api/apps/api/src/ormconfig.ts b/api/apps/api/src/ormconfig.ts
@@ -1,5 +1,6 @@
+import * as path from 'path';
 import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-import { AppConfig } from './utils/config.utils';
+import { AppConfig } from '@marxan-api/utils/config.utils';
 import { DbConnections } from './ormconfig.connections';
 
 /**
@@ -26,7 +27,10 @@ export const apiConnections: Record<
     type: 'postgres',
     url: AppConfig.get('postgresApi.url'),
     ssl: false,
-    entities: [__dirname + '/modules/**/*.api.entity.{ts,js}'],
+    entities: [
+      path.join(__dirname, '/modules/**/*.api.entity.{ts,js}'),
+      path.join(__dirname, '../../../libs/**/*.api.entity.{ts,js}'),
+    ],
     // Logging may be: ['query', 'error', 'schema', 'warn', 'info', 'log'] Use
     // 'query' if needing to see the actual generated SQL statements (this should
     // be limited to `NODE_ENV=development`). Use 'error' for least verbose
@@ -57,7 +61,10 @@ export const apiConnections: Record<
     type: 'postgres',
     url: AppConfig.get('postgresGeoApi.url'),
     ssl: false,
-    entities: [__dirname + '/modules/**/*.geo.entity.{ts,js}'],
+    entities: [
+      path.join(__dirname, '/modules/**/*.geo.entity.{ts,js}'),
+      path.join(__dirname, '../../../libs/**/*.geo.entity.{ts,js}'),
+    ],
     logging: ['error'],
     cache: false,
     // Migrations for this db/data source are handled in the geoprocessing

diff --git a/api/apps/geoprocessing/src/ormconfig.ts b/api/apps/geoprocessing/src/ormconfig.ts
@@ -1,3 +1,4 @@
+import * as path from 'path';
 import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
 import { AppConfig } from '@marxan-geoprocessing/utils/config.utils';
 
@@ -22,7 +23,10 @@ export const geoprocessingConnections: {
     type: 'postgres',
     url: AppConfig.get('postgresGeoApi.url'),
     ssl: false,
-    entities: [__dirname + '/modules/**/*.geo.entity.{ts,js}'],
+    entities: [
+      path.join(__dirname, '/modules/**/*.geo.entity.{ts,js}'),
+      path.join(__dirname, '../../../libs/**/*.geo.entity.{ts,js}'),
+    ],
     // Logging may be: ['query', 'error', 'schema', 'warn', 'info', 'log'] Use
     // 'query' if needing to see the actual generated SQL statements (this should
     // be limited to `NODE_ENV=development`). Use 'error' for least verbose
@@ -46,7 +50,10 @@ export const geoprocessingConnections: {
     type: 'postgres',
     url: AppConfig.get('postgresApi.url'),
     ssl: false,
-    entities: [__dirname + '/modules/**/*.api.entity.{ts,js}'],
+    entities: [
+      __dirname + '/modules/**/*.api.entity.{ts,js}',
+      path.join(__dirname, '../../../libs/**/*.api.entity.{ts,js}'),
+    ],
     // Logging may be: ['query', 'error', 'schema', 'warn', 'info', 'log'] Use
     // 'query' if needing to see the actual generated SQL statements (this should
     // be limited to `NODE_ENV=development`). Use 'error' for least verbose