From b0c0537e6e3b9a856df44853fdb0b45cfbb3ffb1 Mon Sep 17 00:00:00 2001
From: radmehr <radmehrtarnasi135@gmail.com>
Date: Wed, 8 Jul 2026 11:34:44 +0330
Subject: [PATCH] fix: fix datasource

---
 package.json                                               | 2 +-
 src/database/data-source.ts                                | 7 +++++--
 ...015-InitialSchema.ts => 1783497761523-InitialSchema.ts} | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)
 rename src/migrations/{1783489241015-InitialSchema.ts => 1783497761523-InitialSchema.ts} (99%)

diff --git a/package.json b/package.json
index e8a6579..75c25b7 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json",
-    "typeorm:dev": "cross-env NODE_ENV=development typeorm-ts-node-commonjs -d src/database/data-source.ts",
+    "typeorm:dev": "cross-env NODE_ENV=development node -r ts-node/register -r tsconfig-paths/register ./node_modules/typeorm/cli.js -d src/database/data-source.ts",
     "typeorm:prod": "cross-env NODE_ENV=production typeorm -d dist/database/data-source.js",
     "migration:generate": "npm run typeorm:dev -- migration:generate",
     "migration:create": "npm run typeorm:dev -- migration:create",
diff --git a/src/database/data-source.ts b/src/database/data-source.ts
index 5ddefff..aa31ecb 100644
--- a/src/database/data-source.ts
+++ b/src/database/data-source.ts
@@ -1,5 +1,6 @@
 import { DataSource } from 'typeorm';
 import * as dotenv from 'dotenv';
+import * as path from 'path';
 
 const ENV = process.env.NODE_ENV;
 
@@ -7,6 +8,8 @@ dotenv.config({
   path: !ENV ? '.env' : `.env.${ENV}`,
 });
 
+const extension = ENV === 'production' ? 'js' : 'ts';
+
 export default new DataSource({
   type: 'postgres',
   host: process.env.DATABASE_HOST,
@@ -15,6 +18,6 @@ export default new DataSource({
   password: process.env.DATABASE_PASS,
   database: process.env.DATABASE_NAME,
   synchronize: false,
-  entities: ['dist/**/*.entity.js'],
-  migrations: ['dist/migrations/*.js'],
+  entities: [path.join(__dirname, `../**/*.entity.${extension}`)],
+  migrations: [path.join(__dirname, `../migrations/*.${extension}`)],
 });
diff --git a/src/migrations/1783489241015-InitialSchema.ts b/src/migrations/1783497761523-InitialSchema.ts
similarity index 99%
rename from src/migrations/1783489241015-InitialSchema.ts
rename to src/migrations/1783497761523-InitialSchema.ts
index 1399ab5..98db621 100644
--- a/src/migrations/1783489241015-InitialSchema.ts
+++ b/src/migrations/1783497761523-InitialSchema.ts
@@ -1,7 +1,7 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
 
-export class InitialSchema1783489241015 implements MigrationInterface {
-    name = 'InitialSchema1783489241015'
+export class InitialSchema1783497761523 implements MigrationInterface {
+    name = 'InitialSchema1783497761523'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
         await queryRunner.query(`CREATE TYPE "public"."user_role_enum" AS ENUM('superuser', 'admin', 'user')`);