From 29c8a675fb20bdd8ee17ab93cb5c17c88d791fd4 Mon Sep 17 00:00:00 2001
From: mahyargdz <mahyar.goudarzi@outlook.com>
Date: Sun, 4 May 2025 09:54:43 +0330
Subject: [PATCH] update: join  the address to the real and legal user

---
 src/configs/typeorm.config.ts                 |  2 +-
 .../users/repositories/users.repository.ts    | 25 +++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/configs/typeorm.config.ts b/src/configs/typeorm.config.ts
index 8d8378f..9391ab2 100755
--- a/src/configs/typeorm.config.ts
+++ b/src/configs/typeorm.config.ts
@@ -13,7 +13,7 @@ export function databaseConfigs(): TypeOrmModuleAsyncOptions {
         username: configService.getOrThrow<string>("DB_USER"),
         password: configService.getOrThrow<string>("DB_PASS"),
         autoLoadEntities: true,
-        synchronize: configService.getOrThrow<string>("NODE_ENV") == "production" ? false : true,
+        synchronize: configService.getOrThrow<string>("NODE_ENV") == "production" ? false : false,
         logging: configService.getOrThrow<string>("NODE_ENV") == "production" ? false : true,
         migrationsTableName: "typeorm_migrations",
         migrationsRun: false,
diff --git a/src/modules/users/repositories/users.repository.ts b/src/modules/users/repositories/users.repository.ts
index 6c0e321..1583e57 100755
--- a/src/modules/users/repositories/users.repository.ts
+++ b/src/modules/users/repositories/users.repository.ts
@@ -92,9 +92,30 @@ export class UserRepository extends Repository<User> {
       .leftJoin("user.roles", "role")
       .where("role.name = :roleName", { roleName: RoleEnum.USER })
       .leftJoin("user.legalUser", "legalUser")
-      .addSelect(["legalUser.id", "legalUser.registrationName"])
+      .addSelect([
+        "legalUser.id",
+        "legalUser.registrationName",
+        "legalUser.nationalIdentity",
+        "legalUser.economicCode",
+        "legalUser.registrationCode",
+      ])
+      .leftJoinAndSelect("legalUser.address", "address")
+      .leftJoinAndSelect("address.city", "city")
+      .leftJoinAndSelect("city.province", "province")
       .leftJoin("user.realUser", "realUser")
-      .addSelect(["realUser.id", "realUser.firstName", "realUser.lastName"])
+      .addSelect([
+        "realUser.id",
+        "realUser.firstName",
+        "realUser.lastName",
+        "realUser.phone",
+        "realUser.gender",
+        "realUser.nationalCode",
+        "realUser.birthDate",
+        "realUser.nationality",
+      ])
+      .leftJoinAndSelect("realUser.address", "realAddress")
+      .leftJoinAndSelect("realAddress.city", "realCity")
+      .leftJoinAndSelect("realCity.province", "realProvince")
       .loadRelationCountAndMap("user.invoicesCount", "user.invoices")
       .loadRelationCountAndMap("user.subscriptionsCount", "user.subscriptions")
       .loadRelationCountAndMap("user.ticketsCount", "user.tickets");