From 735084e0a8561e640cd32b6a9890014c81efa672 Mon Sep 17 00:00:00 2001
From: Aster Fialla <asterfialla@gmail.com>
Date: Sun, 1 Mar 2026 11:42:55 -0500
Subject: [PATCH] modifying setup for typeORM

---
 database/data-source.ts | 13 +++++++------
 package.json            |  3 ++-
 tsconfig.json           |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/database/data-source.ts b/database/data-source.ts
index 258f778..64e169c 100644
--- a/database/data-source.ts
+++ b/database/data-source.ts
@@ -1,7 +1,5 @@
 import "reflect-metadata"
 import { DataSource } from "typeorm"
-import { Member } from "./entity/Member"
-import { System } from "./entity/System"
 import * as env from 'dotenv';
 
 env.config();
@@ -13,9 +11,12 @@ export const AppDataSource = new DataSource({
     username: "postgres",
     password: process.env.POSTGRES_PASSWORD,
     database: "postgres",
-    synchronize: true,
+    synchronize: false,
     logging: false,
-    entities: [Member, System],
-    migrations: [],
-    subscribers: [],
+    migrations: [__dirname + '/migration/**/*{.js,.ts}'],
+    entities: ["dist/entities/**/*.js"], // Point to compiled JS files
+    subscribers: ["dist/subscribers/**/*.js"],
+    migrationsRun: true,
+    migrationsTableName: 'migrations',
+    migrationsTransactionMode: 'all'
 })
diff --git a/package.json b/package.json
index 9ae178f..be2e1c9 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "start": "node src/bot.js",
     "start-db": "ts-node database/index.ts",
     "build-db": "tsc",
-    "dev-db": "ts-node --watch database/index.ts"
+    "generate-db": "typeorm migration:generate -d database/build/data-source.js -o",
+    "run-migration": "typeorm-ts-node-commonjs migration:run -d database/data-source.ts"
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
index a6468aa..39f751e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,7 +6,7 @@
       "target": "es2021",
       "module": "commonjs",
       "moduleResolution": "node",
-      "outDir": "./build",
+      "outDir": "./database/build",
       "rootDir": "./database",
       "esModuleInterop": true,
       "emitDecoratorMetadata": true,