rez_core 5.0.14 → 5.0.16

package/package.json

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

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

@@ -1,10 +1,12 @@
 import { Injectable } from '@nestjs/common';
 import { EntityServiceImpl } from './entity-service-impl.service';
 import { DataSource } from 'typeorm';
+import { EntityMasterRepository } from '../repository/entity-master.repository';
 
 @Injectable()
 export class EntityRelationService extends EntityServiceImpl {
-  constructor(private readonly dataSource: DataSource) {
+  constructor(private readonly dataSource: DataSource,
+              private entityMasterRepo: EntityMasterRepository) {
     super();
   }
 
@@ -21,16 +23,11 @@ export class EntityRelationService extends EntityServiceImpl {
     );
   
     if (includeSelf) {
-      const [entity] = await this.dataSource.query(
-        `SELECT name as label 
-         FROM frm_entity_master 
-         WHERE mapped_entity_type = $1 AND organization_id = $2`,
-        [entityType, loggedInUser.organization_id],
-      );
+      const entity = await this.entityMasterRepo.getEntityByMappedEntityType(entityType, loggedInUser.organization_id);
   
       if (entity) {
         relations.unshift({
-          label: entity.label,
+          label: entity.name,
           value: entityType,
           id: null, // or some special marker
         });

package/src/module/meta/service/resolver.service.ts

@@ -4,6 +4,7 @@ import { UserData } from '../../user/entity/user.entity';
 import * as moment from 'moment';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 import { ModuleRef } from '@nestjs/core';
+import { AttributeMasterRepository } from '../repository/attribute-master.repository';
 
 @Injectable()
 export class ResolverService {
@@ -14,6 +15,7 @@ export class ResolverService {
     @Inject('ListMasterService')
     private readonly listMasterService: ListMasterService,
     private readonly moduleRef: ModuleRef,
+    private readonly attributeMasterRepo: AttributeMasterRepository
   ) {}
 
   private async getMediaDataService() {
@@ -31,10 +33,7 @@ export class ResolverService {
     entityData: any,
     entityType: string,
   ): Promise<any> {
-    const attributeItems = await this.dataSource.query(
-      `SELECT * FROM frm_entity_attribute WHERE mapped_entity_type = $1 AND organization_id = $2`,
-      [entityType, loggedInUser.organization_id],
-    );
+    const attributeItems = await this.attributeMasterRepo.findAttributesByMappedEntityType(entityType, loggedInUser.organization_id);
 
     const resolvedEntityData = { ...entityData };
 

package/src/module/workflow/service/action-template-mapping.service.ts

@@ -44,16 +44,25 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
 
       const commTemplates = await this.dataSource.query(
         `
-  SELECT code as value, name as label , id
-  FROM frm_wf_comm_template
-  WHERE mode = $1 AND organization_id = $2 AND level_type = $3 AND level_id = $4 AND status IN (SELECT id FROM frm_list_master_items WHERE code = 'STATUS_ACTIVE' AND organization_id = $5)
-  `,
+            SELECT code as value, name as label , id
+            FROM frm_wf_comm_template
+            WHERE mode = $1
+              AND organization_id = $2
+              AND level_type = $3
+              AND level_id::int = $4
+              AND status::int IN (
+                SELECT id
+                FROM frm_list_master_items
+                WHERE code = 'STATUS_ACTIVE'
+              AND organization_id = $5
+                )
+        `,
         [
-          modeId,
-          loggedInUser.organization_id,
-          loggedInUser.level_type,
-          loggedInUser.level_id,
-          loggedInUser.organization_id,
+          String(modeId),
+          String(loggedInUser.organization_id),
+          String(loggedInUser.level_type),
+          Number(loggedInUser.level_id),    // keep number
+          String(loggedInUser.organization_id),
         ],
       );