rez_core 2.1.95 → 2.1.97

package/package.json

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

package/src/module/enterprise/repository/school.repository.ts

@@ -78,32 +78,62 @@ export class SchoolRepository {
             school_status,
           } = row;
 
+          const orgStatus = await this.dataSource
+            .createQueryBuilder()
+            .select('*')
+            .from('cr_list_master_items', 'cli')
+            .where('cli.id = :id AND cli.organization_id = :orgId', {
+              id: org_status,
+              orgId: org_id,
+            })
+            .getRawOne();
+
           if (!result[org_id]) {
             result[org_id] = {
               org_id,
               org_name,
               org_address,
-              status: org_status,
+              status: orgStatus ? orgStatus.name : org_status,
               type: 'Organization',
               brands: {},
             };
           }
 
+          const brandStatus = await this.dataSource
+            .createQueryBuilder()
+            .select('*')
+            .from('cr_list_master_items', 'cli')
+            .where('cli.id = :id AND cli.organization_id = :orgId', {
+              id: brand_status,
+              orgId: org_id,
+            })
+            .getRawOne();
+
           if (!result[org_id].brands[brand_id]) {
             result[org_id].brands[brand_id] = {
               brand_id,
               brand_name,
-              status: brand_status,
+              status: brandStatus ? brandStatus.name : brand_status,
               type: 'Brand',
               schools: [],
             };
           }
 
+          const schoolStatus = await this.dataSource
+            .createQueryBuilder()
+            .select('*')
+            .from('cr_list_master_items', 'cli')
+            .where('cli.id = :id AND cli.organization_id = :orgId', {
+              id: school_status,
+              orgId: org_id,
+            })
+            .getRawOne();
+
           result[org_id].brands[brand_id].schools.push({
             school_id,
             school_name,
             school_location,
-            status: school_status,
+            status: schoolStatus ? schoolStatus.name : school_status,
             type: 'School',
           });
         }

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

@@ -71,7 +71,7 @@ export class SavedFilterService extends EntityServiceImpl {
 
   async updateEntity(
     entityData: BaseEntity,
-    loggedInUser: UserData | null,
+    loggedInUser: UserData,
   ): Promise<BaseEntity> {
     const master = entityData as SavedFilterMaster;
 

package/src/module/listmaster/repository/list-master-items.repository.ts

@@ -32,6 +32,18 @@ export class ListMasterItemsRepository {
     return items.map((i) => ({ label: i.name, value: i.id }));
   }
 
+  async findOperatorsByType(type: string, organizationId?: number) {
+    const items = await this.repo.find({
+      where: {
+        listtype: type,
+        organization_id: organizationId,
+        status: 'ACTIVE',
+      },
+      order: { sortindex: 'ASC' },
+    });
+    return items.map((i) => ({ label: i.name, value: i.value }));
+  }
+
   async findItemByCode(
     code: string,
     organizationId?: number,

package/src/module/listmaster/service/list-master.service.ts

@@ -58,6 +58,7 @@ export class ListMasterService {
       loggedInUser?.organization_id,
     );
 
+    console.log(config, 'config');
     if (!config) throw new NotFoundException(`Type ${type} not found`);
 
     switch (config.source) {
@@ -75,6 +76,11 @@ export class ListMasterService {
           loggedInUser?.organization_id,
         );
 
+      case 'operator':
+        return this.listItemsRepo.findOperatorsByType(
+          type,
+          loggedInUser?.organization_id,
+        );
       case 'custom':
         return this.fetchFromExternalSource(config.custom_source_id, params);
 

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

@@ -36,6 +36,8 @@ export class EntityTableRepository {
     displayType: string,
     organization_id: number,
   ) {
+    console.log(entityType, listType, displayType, organization_id);
+
     const whereCondition: any = {
       mapped_entity_type: entityType,
       list_type: listType,

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

@@ -7,7 +7,7 @@ import { BaseEntity } from '../entity/base-entity.entity';
 import { LoggingService } from '../../../utils/service/loggingUtil.service';
 import { EntityListData } from '../dto/entity-list-data.dto';
 import { EntityListService } from './entity-list.service';
-import { EntityManager } from 'typeorm';
+import { DataSource, EntityManager } from 'typeorm';
 import { ExcelData } from '../../../utils/dto/excel-data.dto';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -15,8 +15,12 @@ import { ExcelHelper } from '../../../utils/service/excel-helper.service';
 import { ExcelsheetData } from '../../../utils/dto/excelsheet-data.dto';
 import { EntityTableService } from './entity-table.service';
 import { EntityTableColumnService } from './entity-table-column.service';
-import { ENTITYTYPE_ENTITYMASTER } from '../../../constant/global.constant';
+import {
+  ENTITYTYPE_ENTITYMASTER,
+  STATUS_ACTIVE,
+} from '../../../constant/global.constant';
 import { EntityValidationService } from './entity-validation.service';
+import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 
 @Injectable()
 export class EntityServiceImpl implements EntityService<BaseEntity> {
@@ -29,6 +33,8 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
   @Inject() protected readonly loggingService: LoggingService;
   @Inject()
   protected readonly entityValidationService: EntityValidationService;
+  // @Inject('ListMasterService')
+  // private readonly listMasterService: ListMasterService;
 
   async createEntity(
     entityData: BaseEntity,
@@ -80,6 +86,16 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
       entityData.code = entityData.entity_type + maxSeqNo;
     }
 
+    // const resolveStatus = await this.listMasterService.getResolvedListCode(
+    //   STATUS_ACTIVE,
+    //   loggedInUser?.organization_id || 0,
+    // );
+
+    const statusList = await repo.query(
+      `SELECT id FROM cr_list_master_items WHERE code = ? AND organization_id = ?`,
+      [STATUS_ACTIVE, loggedInUser?.organization_id || 0],
+    );
+
     entityData.created_date = new Date();
     if (loggedInUser) {
       entityData.created_by = loggedInUser.id;
@@ -89,8 +105,8 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
         entityData.enterprise_id = loggedInUser.enterprise_id;
       if (!entityData.level_type)
         entityData.level_type = loggedInUser.level_type;
-
       if (!entityData.level_id) entityData.level_id = loggedInUser.level_id;
+      if (!entityData.status) entityData.status = statusList.id;
     }
 
     return repo.save(entityData);
@@ -221,7 +237,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
 
   async updateEntity(
     entityData: BaseEntity,
-    loggedInUser: UserData | null,
+    loggedInUser: UserData,
     appcode?: string,
   ) {
     const entityMaster = await this.entityMasterService.getEntityData(

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

@@ -81,13 +81,14 @@ export class EntityTableService {
     displayType: string,
     loggedInUser: any,
   ) {
+    console.log(entityType, listType, displayType, loggedInUser);
     let entityTable = await this.findByEntityTypeAndListTypeAndDisplayType(
       entityType,
       listType,
       displayType,
       loggedInUser?.organization_id,
     );
-
+    console.log(entityTable, 'entityTable');
     let entityTableDto = entityTable as EntityTableDto;
     if (entityTable) {
       entityTableDto.column_list =

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

@@ -83,7 +83,7 @@ export class RoleService extends EntityServiceImpl {
 
   async updateEntity(
     entityData: BaseEntity,
-    loggedInUser: UserData | null,
+    loggedInUser: UserData,
   ): Promise<ServiceResult<BaseEntity>> {
     if (!entityData.name) {
       return { success: false, error: 'Role name is required' };

package/src/resources/dev.properties.yaml

@@ -1,19 +1,19 @@
 # DB_HOST: "13.234.25.234"
-DB_HOST: "13.234.25.234"
-DB_PORT: "3306"
-DB_USER: "root"
-DB_PASS: "Rezolut@123"
-DB_NAME: "core"
-MASTER_KEY: "0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh"
-MASTER_IV: "heuUQf5uPVtkotrFAOKUVw=="
-SECRET_KEY: "1hard_to_guess_secret7890a"
-CLIENT_ID: "324529881356-596sc8ksrb9lg01i7sktofqqqf0fv2ug.apps.googleusercontent.com"
-CLIENT_SECRET: "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"
-CALLBACK_URL: "http://localhost:3000/auth/google/callback"
-OTP_EXPIRY: "10"
-OTP_LENGTH: "6"
-VERIFY_OTP: "false"
-DEFAULT_OTP: "123456"
+DB_HOST: '13.234.25.234'
+DB_PORT: '3306'
+DB_USER: 'root'
+DB_PASS: 'Rezolut@123'
+DB_NAME: 'core'
+MASTER_KEY: '0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh'
+MASTER_IV: 'heuUQf5uPVtkotrFAOKUVw=='
+SECRET_KEY: '1hard_to_guess_secret7890a'
+CLIENT_ID: '324529881356-596sc8ksrb9lg01i7sktofqqqf0fv2ug.apps.googleusercontent.com'
+CLIENT_SECRET: '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'
+CALLBACK_URL: 'http://localhost:3000/auth/google/callback'
+OTP_EXPIRY: '10'
+OTP_LENGTH: '6'
+VERIFY_OTP: 'false'
+DEFAULT_OTP: '123456'
 TOKEN_EXPIRY: 1
 # AWS:
 #   S3: