rez_core 5.0.94 → 5.0.96

package/package.json

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

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

@@ -581,24 +581,29 @@ export class EntityDynamicService {
   ): Promise<any> {
     const organizationId = loggedInUser.organization_id;
 
-    const tableName = await this.getTableName(entityType, organizationId);
-    const dataSource = await this.getEntitySourceTableName(
-      entityType,
-      organizationId,
-    );
+    const entityMaster = await this.entityMasterRepo.getEntityByMappedEntityType(entityType, organizationId);
+    if(!entityMaster) return null;
+
     const validAttributes = await this.getAttributeCodes(
       entityType,
       organizationId,
     );
 
-    const columns = validAttributes
-      .map((attr) => `t.${attr.attribute_key}`)
-      .join(', ');
-    const selectQuery = `SELECT ${columns}
-                         FROM ${tableName} t
-                         WHERE id = $1`;
+    const entityRepo = this.reflectionHelper.getRepoService(entityMaster?.entity_data_class);
 
-    const result = await this.entityManager.query(selectQuery, [id]);
+    const columns = validAttributes.map(attr => `${attr.attribute_key}`);
+
+    const result = await entityRepo.find({
+      where: {
+        id: id
+      },
+      select: columns
+    });
+    // const selectQuery = `SELECT ${columns}
+    //                      FROM ${tableName} t
+    //                      WHERE id = $1`;
+
+    // const result = await this.entityManager.query(selectQuery, [id]);
     if (!result.length) return null;
 
     const row = result[0];