rez_core 5.0.54 → 5.0.56

package/package.json

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

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

@@ -18,7 +18,8 @@ export class ResolverService {
     private readonly moduleRef: ModuleRef,
     private readonly attributeMasterRepo: AttributeMasterRepository,
     private readonly reflectionHelper: ReflectionHelper,
-  ) {}
+  ) {
+  }
 
   private async getMediaDataService() {
     if (!this.mediaDataService) {
@@ -139,7 +140,11 @@ export class ResolverService {
 
     // fetch attribute meta only for the given attributeKey
     const [attr] = await this.dataSource.query(
-      `SELECT * FROM frm_entity_attribute WHERE mapped_entity_type = $1 AND organization_id = $2 AND attribute_key = $3`,
+      `SELECT *
+       FROM frm_entity_attribute
+       WHERE mapped_entity_type = $1
+         AND organization_id = $2
+         AND attribute_key = $3`,
       [entityType, loggedInUser.organization_id, attrKey],
     );
 
@@ -148,7 +153,10 @@ export class ResolverService {
     // -------- ENTITY data_source_type --------
     if (attr.data_source_type === 'entity') {
       const [entityDef] = await this.dataSource.query(
-        `SELECT * FROM frm_entity_master WHERE mapped_entity_type = $1 AND organization_id = $2`,
+        `SELECT *
+         FROM frm_entity_master
+         WHERE mapped_entity_type = $1
+           AND organization_id = $2`,
         [attr.datasource_list, loggedInUser.organization_id],
       );
 
@@ -161,8 +169,13 @@ export class ResolverService {
         for (const code of rawValue) {
           const query =
             tableName === 'sso_organization'
-              ? `SELECT * FROM ${tableName} WHERE code = $1`
-              : `SELECT * FROM ${tableName} WHERE id = $1 AND organization_id = $2`;
+              ? `SELECT *
+                 FROM ${tableName}
+                 WHERE code = $1`
+              : `SELECT *
+                 FROM ${tableName}
+                 WHERE id = $1
+                   AND organization_id = $2`;
 
           const params =
             tableName === 'sso_organization'
@@ -176,8 +189,13 @@ export class ResolverService {
       } else {
         const query =
           tableName === 'sso_organization'
-            ? `SELECT * FROM ${tableName} WHERE id = $1`
-            : `SELECT * FROM ${tableName} WHERE id = $1 AND organization_id = $2`;
+            ? `SELECT *
+               FROM ${tableName}
+               WHERE id = $1`
+            : `SELECT *
+               FROM ${tableName}
+               WHERE id = $1
+                 AND organization_id = $2`;
 
         const params =
           tableName === 'sso_organization'
@@ -197,7 +215,7 @@ export class ResolverService {
           const repo =
             await this.reflectionHelper.getRepoService('ListMasterItems');
 
-          let item = await repo.findOne({
+          let item = repo.findOne({
             where: {
               id: code,
               organization_id: loggedInUser.organization_id,
@@ -207,16 +225,11 @@ export class ResolverService {
         }
         return resolvedValues;
       } else {
-        // const [item] = await this.dataSource.query(
-        //   `SELECT * FROM frm_list_master_items WHERE id = $1 AND organization_id = $2`,
-        //   [rawValue, loggedInUser.organization_id],
-        // );
-
         const repo =
           await this.reflectionHelper.getRepoService('ListMasterItems');
-        let item = await repo.findOne({
+        let item = repo.findOne({
           where: {
-            id: rawValue,
+            id: Number(rawValue),
             organization_id: loggedInUser.organization_id,
           },
         });
@@ -243,8 +256,11 @@ export class ResolverService {
 
     // fetch attribute meta
     const [attr] = await this.dataSource.query(
-      `SELECT * FROM frm_entity_attribute 
-       WHERE mapped_entity_type = $1 AND organization_id = $2 AND attribute_key = $3`,
+      `SELECT *
+       FROM frm_entity_attribute
+       WHERE mapped_entity_type = $1
+         AND organization_id = $2
+         AND attribute_key = $3`,
       [entityType, loggedInUser.organization_id, attrKey],
     );
 
@@ -253,8 +269,10 @@ export class ResolverService {
     // -------- ENTITY data_source_type --------
     if (attr.data_source_type === 'entity') {
       const [entityDef] = await this.dataSource.query(
-        `SELECT * FROM frm_entity_master 
-         WHERE mapped_entity_type = $1 AND organization_id = $2`,
+        `SELECT *
+         FROM frm_entity_master
+         WHERE mapped_entity_type = $1
+           AND organization_id = $2`,
         [attr.datasource_list, loggedInUser.organization_id],
       );
 
@@ -264,8 +282,13 @@ export class ResolverService {
 
       const query =
         tableName === 'sso_organization'
-          ? `SELECT id FROM ${tableName} WHERE ${attr.data_source_attribute} = $1`
-          : `SELECT id FROM ${tableName} WHERE ${attr.data_source_attribute} = $1 AND organization_id = $2`;
+          ? `SELECT id
+             FROM ${tableName}
+             WHERE ${attr.data_source_attribute} = $1`
+          : `SELECT id
+             FROM ${tableName}
+             WHERE ${attr.data_source_attribute} = $1
+               AND organization_id = $2`;
 
       const params =
         tableName === 'sso_organization'
@@ -279,8 +302,11 @@ export class ResolverService {
     // -------- MASTER data_source_type --------
     else if (attr.data_source_type === 'master') {
       const [item] = await this.dataSource.query(
-        `SELECT id FROM frm_list_master_items 
-         WHERE ${attr.data_source_attribute} = $1 AND organization_id = $2 AND listtype = $3`,
+        `SELECT id
+         FROM frm_list_master_items
+         WHERE ${attr.data_source_attribute} = $1
+           AND organization_id = $2
+           AND listtype = $3`,
         [displayValue, loggedInUser.organization_id, attr.datasource_list],
       );
       return item?.id ?? displayValue;

package/src/module/workflow/repository/action-category.repository.ts

@@ -57,15 +57,15 @@ export class ActionCategoryRepository {
   async actionscategoryinfo(entity_type: string) {
     const result = await this.actionCategoryRepository
       .createQueryBuilder('ac')
-      .select(['ac.id', 'ac.name', 'ac.logo', 'ac.modalName'])
+      .select('ac.*')
       .where('ac.mapped_entity_type = :entityType', { entityType: entity_type })
       .getRawMany();
 
     const mapped = result.map((row) => ({
-      label: row.ac_name,
-      logo: row.ac_logo,
-      modalName: row.ac_modalName,
-      value: String(row.ac_id),
+      label: row.name,
+      logo: row.logo,
+      modalname: row.modalname,
+      value: String(row.id),
     }));
 
     return mapped.reduce(

package/src/resources/dev.properties.yaml

@@ -5,7 +5,7 @@ DB_PORT: '5432'
 DB_USER: 'root'
 DB_PASS: 'Rezolut123'
 DB_NAME: 'universal'
-DB_SCHEMA: 'preprod_ether_sso'
+DB_SCHEMA: 'preprod_ether_crm'
 MASTER_KEY: '0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh'
 MASTER_IV: 'heuUQf5uPVtkotrFAOKUVw=='
 SECRET_KEY: '1hard_to_guess_secret7890a'

package/.idea/prettier.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-  </component>
-</project>