rez_core 5.0.170 → 5.0.173

package/package.json

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

package/src/module/enterprise/enterprise.module.ts

@@ -10,6 +10,9 @@ import { UtilsModule } from 'src/utils/utils.module';
 import { EntityModule } from '../meta/entity.module';
 import { OrganizationRepository } from './repository/organization.repository';
 import { SchoolRepository } from './repository/school.repository';
+import { WorkflowAutomationModule } from '../workflow-automation/workflow-automation.module';
+import { EnterpriseService } from './service/enterprise.service';
+import { BrandService } from './service/brand.service';
 
 @Module({
   imports: [
@@ -24,7 +27,12 @@ import { SchoolRepository } from './repository/school.repository';
     OrganizationAppMappingService,
     SchoolRepository,
     OrganizationRepository,
+    EnterpriseService,
+    {
+      provide: 'BrandService',
+      useClass: BrandService,
+    },
   ],
-  exports: [OrganizationService, OrganizationRepository],
+  exports: [OrganizationService, OrganizationRepository,EnterpriseService],
 })
 export class EnterpriseModule {}

package/src/module/filter/repository/saved-filter.repository.ts

@@ -98,14 +98,17 @@ export class SavedFilterRepositoryService {
       where: {
         user_id: loggedInUser.id,
         mapped_entity_type: entityType,
+        level_type: loggedInUser.level_type,
+        level_id: loggedInUser.level_id,
         status: 'ACTIVE',
+        is_shared: false,
       },
       order: {
         created_date: 'DESC',
       },
     });
 
-    if (!filters?.length) {
+    if (filters?.length) {
       for (const filter of filters) {
         try {
           const baseUrl = this.configService.get<string>('REDIRECT_BE_URL');
@@ -151,14 +154,13 @@ export class SavedFilterRepositoryService {
         mapped_entity_type: entityType,
         is_shared: true,
         status: 'ACTIVE',
-        user_id: Not(loggedInUser.id),
       },
       order: {
         created_date: 'DESC',
       },
     });
 
-    if (!filters?.length) {
+    if (filters?.length) {
       for (const filter of filters) {
         try {
           const baseUrl = this.configService.get<string>('REDIRECT_BE_URL');

package/src/module/meta/repository/entity-master.repository.ts

@@ -27,8 +27,8 @@ export class EntityMasterRepository {
     if (data) {
       const listMasterItemsRepo = this.reflectionHelper.getRepoService('ListMasterItems');
       let listMasterItemsata = await listMasterItemsRepo.findOne({
-        where: { id: data.status }
-      })
+        where: { id: data.status },
+      });
 
       data.status = listMasterItemsata?.name;
     }
@@ -94,13 +94,27 @@ export class EntityMasterRepository {
       where: {
         mapped_entity_type: entity_type,
         data_type: 'DATE',
-        enterprise_id
-      }
-    })
+        enterprise_id,
+      },
+    });
 
     return attributes.map((attr) => ({
       label: attr.name,
       value: attr.attribute_key,
     }));
   }
+
+  async findByEnterpriseIdAndAppCode(enterprise_id, appcode?) {
+    let where = {
+      enterprise_id,
+    };
+
+    if (appcode) {
+      where['appcode'] = appcode;
+    }
+    return await this.entityMasterRepository.find({
+      where,
+      select: ['name', 'mapped_entity_type']
+    });
+  }
 }

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

@@ -19,6 +19,7 @@ export class EntityDynamicService {
     private readonly configService: ConfigService,
   ) {
   }
+
   schema = this.configService.get('DB_SCHEMA');
 
   // -----------------------------
@@ -76,15 +77,16 @@ export class EntityDynamicService {
     // -------------------------------------------------------
     // AUTO-CODE GENERATION (POSTGRES SAFE)
     // -------------------------------------------------------
-    const entityMaster = await this.entityMasterRepo.getEntityByMappedEntityType(entityType, loggedInUser.enterprise_id)
+    const entityMaster = await this.entityMasterRepo.getEntityByMappedEntityType(entityType, loggedInUser.enterprise_id);
 
     if (!entityData.code && entityData.entity_type && entityMaster) {
       // Extract integer suffix
       // const repo = this.reflectionHelper.getRepoService(entityMaster.entity_data_class);
 
       const result = this.entityManager.query(
-        `SELECT MAX(id) as seq_no FROM ${this.schema}.${entityMaster.db_table_name}`
-      )
+        `SELECT MAX(id) as seq_no
+         FROM ${this.schema}.${entityMaster.db_table_name}`,
+      );
 
       let maxSeq = Number(result[0]?.max_seq_no) || 0;
       maxSeq++;
@@ -251,7 +253,7 @@ export class EntityDynamicService {
     const relations = await relationRepo.find({
       where: {
         source_entity_type: entityType,
-        organization_id: loggedInUser.organization_id,
+        enterprise_id: loggedInUser.enterprise_id,
       },
     });
 
@@ -569,9 +571,9 @@ export class EntityDynamicService {
         row[attr.attribute_key] =
           row[attr.attribute_key] != null
             ? await this.mediaDataService.getMediaDownloadUrl(
-                Number(row[attr.attribute_key]),
-                loggedInUser,
-              )
+              Number(row[attr.attribute_key]),
+              loggedInUser,
+            )
             : null;
       }
     }
@@ -590,7 +592,7 @@ export class EntityDynamicService {
     const organizationId = loggedInUser.organization_id;
 
     const entityMaster = await this.entityMasterRepo.getEntityByMappedEntityType(entityType, enterprise_id);
-    if(!entityMaster) return null;
+    if (!entityMaster) return null;
 
     const validAttributes = await this.getAttributeCodes(
       entityType,
@@ -630,9 +632,9 @@ export class EntityDynamicService {
         row[attr.attribute_key] =
           row[attr.attribute_key] != null
             ? await this.mediaDataService.getMediaDownloadUrl(
-                Number(row[attr.attribute_key]),
-                loggedInUser,
-              )
+              Number(row[attr.attribute_key]),
+              loggedInUser,
+            )
             : null;
       }
     }
@@ -730,19 +732,15 @@ export class EntityDynamicService {
     loggedInUser: any,
     appcode?: string,
   ): Promise<any> {
-    const organizationId = loggedInUser.organization_id;
 
-    let query = `SELECT name as label, mapped_entity_type as value
-                 FROM frm_entity_master
-                 WHERE organization_id = $1`;
-    const params = [organizationId];
+    const entityMasters = await this.entityMasterRepo.findByEnterpriseIdAndAppCode(loggedInUser.enterprise_id, appcode);
 
-    if (appcode) {
-      query += ` AND appcode = $2`;
-      params.push(appcode);
-    }
+    let dropdown = [] as any;
+    entityMasters.map(entityMaster => dropdown.push({
+      label: entityMaster.name,
+      value: entityMaster.mapped_entity_type,
+    }));
 
-    const dropdown = await this.entityManager.query(query, params);
     return dropdown;
   }
 

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

@@ -1,8 +1,8 @@
 import { Injectable } from '@nestjs/common';
 import { AttributeMasterService } from 'src/module/meta/service/attribute-master.service';
 import { AttributeMaster } from '../entity/attribute-master.entity';
-import { ReflectionHelper } from 'src/utils/service/reflection-helper.service';
-import { DataSource } from 'typeorm';
+import { EntityManager } from 'typeorm';
+import { ConfigService } from '@nestjs/config';
 
 interface ValidationError {
   field: string;
@@ -13,9 +13,12 @@ interface ValidationError {
 export class EntityValidationService {
   constructor(
     private readonly attributeMasterService: AttributeMasterService,
-    private readonly reflectionHelper: ReflectionHelper,
-    private dataSource: DataSource,
-  ) {}
+    private entityManager: EntityManager,
+    private configService: ConfigService,
+  ) {
+  }
+
+  schema = this.configService.get('DB_SCHEMA');
 
   /**
    * Validates required fields based on attribute metadata.
@@ -58,23 +61,21 @@ export class EntityValidationService {
       const value = entityData[attr.attribute_key];
 
       if (this.hasValidValue(value)) {
-        let qb = this.dataSource
+        let qb = this.entityManager
           .createQueryBuilder()
           .select('*')
-          .from(db_table_name, db_table_name)
+          .from(`${this.schema}.${db_table_name}`, db_table_name)
           .where(`${db_table_name}.${attr.attribute_key} = :value`, { value });
 
         // Add AND condition for organization_id/level_type/level_id if present
         if (entityType !== 'ORG' && entityType !== 'ORGP') {
-          const orgId = loggedInUser.organization_id;
           const level_type = loggedInUser.level_type;
           const level_id = loggedInUser.level_id;
 
-          if (orgId !== undefined && orgId !== null) {
+          if (level_type !== undefined && level_type !== null) {
             qb = qb.andWhere(
-              `${db_table_name}.organization_id = :organization_id AND ${db_table_name}.level_type = :level_type AND ${db_table_name}.level_id = :level_id`,
+              `${db_table_name}.level_type = :level_type AND ${db_table_name}.level_id = :level_id`,
               {
-                organization_id: orgId,
                 level_type,
                 level_id,
               },

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

@@ -196,27 +196,25 @@ export class ResolverService {
 
     // -------- MASTER data_source_type --------
     else if (attr.data_source_type === 'master') {
+      const repo = this.reflectionHelper.getRepoService('ListMasterItems');
       if (Array.isArray(rawValue)) {
         const resolvedValues: string[] = [];
         for (const code of rawValue) {
-          const repo = this.reflectionHelper.getRepoService('ListMasterItems');
-
           let item = repo.findOne({
             where: {
               id: code,
-              organization_id: loggedInUser.organization_id,
+              enterprise_id: loggedInUser.enterprise_id,
             },
           });
           resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
         }
         return resolvedValues;
       } else {
-        const repo = this.reflectionHelper.getRepoService('ListMasterItems');
         if (typeof rawValue !== 'number') return rawValue;
         let item = await repo.findOne({
           where: {
             id: Number(rawValue),
-            organization_id: loggedInUser.organization_id,
+            enterprise_id: loggedInUser.enterprise_id,
           },
         });
         return item?.[attr.data_source_attribute] ?? rawValue;