rez_core 4.0.73 → 4.0.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "4.0.73",
+  "version": "4.0.74",
   "description": "",
   "author": "",
   "private": false,

package/src/module/meta/service/entity-dynamic.service.ts

@@ -218,7 +218,11 @@ export class EntityDynamicService {
     id: number | string,
     loggedInUser: any,
   ): Promise<any> {
-    const mainEntity = await this.getEntity(entityType, id, loggedInUser);
+    const mainEntity = await this.getEntityByDataSource(
+      entityType,
+      id,
+      loggedInUser,
+    );
 
     const relatedEntities = await this.dataSource.query(
       `SELECT * FROM frm_entity_relation_data WHERE  source_entity_id = ? AND target_entity_type IN (
@@ -536,6 +540,55 @@ export class EntityDynamicService {
     return result;
   }
 
+  async getEntityByDataSource(
+    entityType: string,
+    id: number | string,
+    loggedInUser: any,
+  ): Promise<any> {
+    const organizationId = loggedInUser.organization_id;
+
+    const dataSource = await this.getEntitySourceTableName(
+      entityType,
+      organizationId,
+    );
+    const validAttributes = await this.getAttributeCodes(
+      entityType,
+      organizationId,
+    );
+
+    const columns = validAttributes
+      .map((attr) => `\`${attr.attribute_key}\``)
+      .join(', ');
+    const selectQuery = `SELECT ${columns} FROM \`${dataSource}\` WHERE id = ?`;
+
+    const result = await this.dataSource.query(selectQuery, [id]);
+    if (!result.length) return null;
+
+    const row = result[0];
+
+    // Convert boolean columns (1/0) into true/false
+    for (const attr of validAttributes) {
+      if (
+        attr.db_datatype == 'boolean' &&
+        row[attr.attribute_key] !== undefined
+      ) {
+        row[attr.attribute_key] = row[attr.attribute_key] == 1 ? true : false;
+      } else if (
+        attr.element_type == 'upload' &&
+        row[attr.attribute_key] !== undefined
+      ) {
+        row[attr.attribute_key] =
+          row[attr.attribute_key] != null
+            ? await this.mediaDataService.getMediaDownloadUrl(
+                Number(row[attr.attribute_key]),
+                loggedInUser,
+              )
+            : null;
+      }
+    }
+
+    return row;
+  }
   // -----------------------------
   async getEntity(
     entityType: string,
@@ -545,6 +598,10 @@ export class EntityDynamicService {
     const organizationId = loggedInUser.organization_id;
 
     const tableName = await this.getTableName(entityType, organizationId);
+    const dataSource = await this.getEntitySourceTableName(
+      entityType,
+      organizationId,
+    );
     const validAttributes = await this.getAttributeCodes(
       entityType,
       organizationId,
@@ -571,13 +628,6 @@ export class EntityDynamicService {
         attr.element_type == 'upload' &&
         row[attr.attribute_key] !== undefined
       ) {
-        // fetch media data
-        // console.log(
-        //   'Fetching media for',
-        //   attr.attribute_key,
-        //   row[attr.attribute_key],
-        // );
-
         row[attr.attribute_key] =
           row[attr.attribute_key] != null
             ? await this.mediaDataService.getMediaDownloadUrl(
@@ -585,14 +635,27 @@ export class EntityDynamicService {
                 loggedInUser,
               )
             : null;
-
-        // console.log('Fetched media:', row[attr.attribute_key]);
       }
     }
 
     return row;
   }
 
+  private async getEntitySourceTableName(
+    entityType: string,
+    organizationId: string,
+  ): Promise<string> {
+    const result = await this.dataSource.query(
+      `SELECT data_source, db_table_name FROM frm_entity_master WHERE organization_id = ? AND mapped_entity_type = ?`,
+      [organizationId, entityType],
+    );
+    if (!result.length) {
+      console.log(`Entity type '${entityType}' not found in frm_entity_master`);
+    }
+
+    return result[0].data_source;
+  }
+
   // -----------------------------
   private async getTableName(
     entityType: string,

package/src/module/user/service/login.service.ts

@@ -64,7 +64,11 @@ export class LoginService {
       user.status != resolveStatus.id ||
       userOrgData?.status != resolveStatus.id
     ) {
-      throw new BadRequestException('User is inactive.');
+      return {
+        success: false,
+        message:
+          'Your account or organization is inactive. Please contact admin.',
+      };
     }
 
     // 🔹 Step 4: Verify password if not OTP