rez_core 5.0.173 → 5.0.175

package/package.json

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

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

@@ -13,10 +13,16 @@ 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';
+import { EnterpriseRepository } from './repository/enterprise.repository';
+import { EnterpriseData } from './entity/enterprise.entity';
 
 @Module({
   imports: [
-    TypeOrmModule.forFeature([OrganizationData, OrganizationAppMapping]),
+    TypeOrmModule.forFeature([
+      OrganizationData,
+      OrganizationAppMapping,
+      EnterpriseData
+    ]),
     forwardRef(() => UserModule),
     UtilsModule,
     EntityModule,
@@ -28,6 +34,7 @@ import { BrandService } from './service/brand.service';
     SchoolRepository,
     OrganizationRepository,
     EnterpriseService,
+    EnterpriseRepository,
     {
       provide: 'BrandService',
       useClass: BrandService,

package/src/module/entity_json/service/entity_json.service.ts

@@ -24,10 +24,9 @@ export class EntityJSONService extends EntityServiceImpl {
     loggedInUser: any,
     flag?: 'flat_json' | 'dropdown' | 'all',
   ) {
-    const orgId = loggedInUser.organization_id;
     const entId = loggedInUser.entId;
 
-    await this.loggerService.log('info', 'EntityJSONService', 'getAttributeForFlatJSON', `Loading attributes for entity: ${entityType}, org: ${orgId}`);
+    await this.loggerService.log('info', 'EntityJSONService', 'getAttributeForFlatJSON', `Loading attributes for entity: ${entityType}, ent: ${entId}`);
 
     const mainAttributes = await this.dataSource
       .getRepository(AttributeMaster)

package/src/module/filter/controller/filter.controller.ts

@@ -8,7 +8,7 @@ import {
   Param,
   Inject,
   UseGuards,
-  Req,
+  Req, HttpCode, HttpStatus,
 } from '@nestjs/common';
 import { FilterService } from '../service/filter.service';
 import { SavedFilterService } from '../service/saved-filter.service';
@@ -24,6 +24,7 @@ export class FilterController {
 
   @Post()
   @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
   async applyFilter(
     @Body() body: any,
     @Query('page', ParseIntPipe) page = 1,
@@ -68,12 +69,14 @@ export class FilterController {
   }
 
   @Get(':id')
+  @HttpCode(HttpStatus.OK)
   async getFilterById(@Param('id') id: string) {
     return this.savedFilterService.getFilterById(Number(id));
   }
 
   @Get('getsavedfilterbycode/:code')
   @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
   async getSavedFilterByCode(
     @Param('code') code: string,
     @Req() req: Request & { user: any },

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

@@ -240,7 +240,7 @@ export class SavedFilterRepositoryService {
     const filterMaster = await savedFilterMasterRepo.findOne({
       where: {
         code: code,
-        organization_id: loggedInUser.organization_id,
+        enterprise_id: loggedInUser.enterprise_id,
       },
     });
 

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

@@ -20,7 +20,7 @@ export class SavedFilterService extends EntityServiceImpl {
 
     const exists = await this.savedFilterRepo.isFilterNameExists({
       name: master.name,
-      organization_id: loggedInUser.organization_id,
+      enterprise_id: loggedInUser.enterprise_id,
       id: master.id,
       level_type: loggedInUser?.level_type,
       level_id: loggedInUser?.level_id,

package/src/module/layout_preference/repository/layout_preference.repository.ts

@@ -38,7 +38,7 @@ export class LayoutPreferenceRepository {
   ) {
     let queryCondition = {
       mapped_entity_type: entity_type,
-      organization_id: loggedInUser.organization_id,
+      enterprise_id: loggedInUser.enterprise_id,
     };
 
     if (query_payload) {

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

@@ -140,7 +140,7 @@ export class ListMasterController {
 
     return await this.listMasterItemService.getListMasterItemsByType(
       type,
-      loggedInUser.organization_id,
+      loggedInUser.enterprise_id,
       search,
     );
   }
@@ -154,7 +154,7 @@ export class ListMasterController {
   ) {
     const loggedInUser = req.user.userData;
     return await this.service.getAllListMasterByOrganization(
-      loggedInUser.organization_id,
+      loggedInUser.enterprise_id,
       search,
     );
   }

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

@@ -134,13 +134,13 @@ export class ListMasterItemsRepository {
   async findAllItemsByListType(
     type: string,
     sortBy: string,
-    organizationId: number,
+    enterprise_id: number,
     search?: string,
   ) {
     const qb = this.repo
       .createQueryBuilder('item')
       .where('item.listtype = :type', { type })
-      .andWhere('item.organization_id = :organizationId', { organizationId });
+      .andWhere('item.enterprise_id = :enterprise_id', { enterprise_id });
 
     if (search?.trim()) {
       qb.andWhere(

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

@@ -24,11 +24,11 @@ export class ListMasterRepository {
     return await this.repo.findOne({ where: condition });
   }
 
-  async findAllItems(organizationId: number, search?: string) {
+  async findAllItems(enterprise_id: number, search?: string) {
     const qb = this.repo
       .createQueryBuilder('item')
       .where('item.source = :source', { source: 'master' })
-      .andWhere('item.organization_id = :organizationId', { organizationId });
+      .andWhere('item.enterprise_id = :enterprise_id', { enterprise_id });
     // .andWhere('item.is_factory = :isFactory', { isFactory: false });
 
     if (search?.trim()) {

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

@@ -22,14 +22,14 @@ export class ListMasterItemService extends EntityServiceImpl {
 
   async getListMasterItemsByType(
     listType: string,
-    organization_id: number,
+    enterprise_id: number,
     search?: string,
   ) {
     // this method retrieves all list master items for a specific type and organization
     return this.listItemsRepo.findAllItemsByListType(
       listType,
       'asc',
-      organization_id,
+      enterprise_id,
       search,
     );
   }
@@ -60,7 +60,7 @@ export class ListMasterItemService extends EntityServiceImpl {
     items: any[],
     loggedInUser,
   ): Promise<any> {
-    const orgId = loggedInUser.organization_id;
+    const entId = loggedInUser.enterprise_id;
 
     const errors: any[] = [];
 
@@ -79,7 +79,7 @@ export class ListMasterItemService extends EntityServiceImpl {
           const existingItem = await this.listItemsRepo.findOneByCondition({
             code,
             listtype: listType,
-            organization_id: orgId,
+            enterprise_id: entId,
           });
 
           if (existingItem) {
@@ -88,7 +88,7 @@ export class ListMasterItemService extends EntityServiceImpl {
               const nameExists = await this.listItemsRepo.findOneByCondition({
                 name,
                 listtype: listType,
-                organization_id: orgId,
+                enterprise_id: entId,
               });
 
               if (nameExists && nameExists.id !== existingItem.id) {
@@ -117,7 +117,7 @@ export class ListMasterItemService extends EntityServiceImpl {
         const nameExists = await this.listItemsRepo.findOneByCondition({
           name,
           listtype: listType,
-          organization_id: orgId,
+          enterprise_id: entId,
         });
 
         if (nameExists) {
@@ -155,7 +155,7 @@ export class ListMasterItemService extends EntityServiceImpl {
     const updatedItems = await this.listItemsRepo.findAllItemsByListType(
       listType,
       'asc',
-      orgId,
+      entId,
     );
 
     return {

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

@@ -428,10 +428,10 @@ export class ListMasterService {
   }
 
   async getAllListMasterByOrganization(
-    organizationId: number,
+    enterprise_id: number,
     search?: string,
   ): Promise<any[]> {
-    return await this.listMasterRepo.findAllItems(organizationId, search);
+    return await this.listMasterRepo.findAllItems(enterprise_id, search);
   }
 
   async getDropDownData(

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

@@ -19,7 +19,7 @@ export class ViewMaterRespository {
     const viewMaster = await this.viewMasterRepository.findOneBy({
       mapped_entity_type: entityType,
       type: type,
-      organization_id: loggedInUser.organization_id,
+      enterprise_id: loggedInUser.enterprise_id,
       code: code,
     });
 

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

@@ -276,8 +276,8 @@ export class ResolverService {
 
       const item = await listMasterItemsRepo.findOne({
         where: { [attr.data_source_attribute] : displayValue,
-        organization_id: loggedInUser.organization_id,
-        listtype: attr.datasource_list
+          enterprise_id: loggedInUser.enterprise_id,
+          listtype: attr.datasource_list
         }
       })
 

package/src/module/user/entity/user.entity.ts

@@ -24,6 +24,9 @@ export class UserData extends BaseEntity {
   @Column({ type: 'varchar', length: 50, nullable: true })
   mobile: string;
 
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  mobile_cc: string;
+
   @Column({ type: 'int', nullable: true })
   is_firstlogin: number;