rez_core 1.0.59 → 1.0.60

package/package.json

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

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

@@ -1,4 +1,4 @@
-import { Body, Controller, HttpCode, HttpStatus, Param, Post } from '@nestjs/common';
+import { Body, Controller, HttpCode, HttpStatus, Param, Post, Query } from '@nestjs/common';
 import { ListMasterService } from '../service/list-master.service';
 
 @Controller('list-master')
@@ -7,7 +7,7 @@ export class ListMasterController {
 
   @Post('/getDropdownData/:type')
   @HttpCode(HttpStatus.OK)
-  async getDropdownData(@Param('type') type: string, @Body() params) {
-    return await this.service.getDropdownOptions(type, params);
+  async getDropdownData(@Param('type') type: string, @Body() params,@Query() query: Record<string, string>,) {
+    return await this.service.getDropdownOptions(type, params,query);
   }
 }

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

@@ -21,14 +21,14 @@ export class ListMasterService extends EntityServiceImpl {
     super();
   }
 
-  async getDropdownOptions(type: string, params: Record<string, string>) {
+  async getDropdownOptions(type: string, params: Record<string, string>,option) {
     const config = await this.listMasterRepo.findByType(type);
 
     if (!config) throw new NotFoundException(`Type ${type} not found`);
 
     switch (config.source) {
       case 'entity':
-        return this.fetchFromEntity(type);
+        return this.fetchFromEntity(type,option);
 
       case 'master':
         return this.listItemsRepo.findItemsByType(type);
@@ -41,15 +41,18 @@ export class ListMasterService extends EntityServiceImpl {
     }
   }
 
-  private async fetchFromEntity(sourceList: string) {
+  private async fetchFromEntity(sourceList: string,option) {
     let result: { label: string; value: number }[] = [];
     if (sourceList) {
       const entityMaster =
         await this.entityMasterService.getEntityData(sourceList);
 
-      let baseEntities = await super.getEntityList(
-        entityMaster.mapped_entity_type,
-      );
+        const filters: any = {};
+        if (option?.onlyActive === 'true') {
+          filters.status = 'ACTIVE';
+        }
+    
+        const baseEntities = await super.getEntityList(entityMaster.mapped_entity_type,filters);
       baseEntities.forEach((entity) => {
         result.push({
           label: entity.name,

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

@@ -62,10 +62,13 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     entityData.created_date = new Date();
     if (loggedInUser) {
       entityData.created_by = loggedInUser.id;
+      if (!entityData.organization_id)
+        entityData.organization_id = loggedInUser.organization_id;
+      if (!entityData.enterprise_id)
+        entityData.enterprise_id = loggedInUser.enterprise_id;
     }
 
-    const savedEntity = repo.save(entityData);
-    return savedEntity;
+    return repo.save(entityData);
   }
 
   deleteEntity(
@@ -110,24 +113,24 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     return await repoService.findOne({ where: { id: id } });
   }
 
-  async getEntityList(entityType: string): Promise<BaseEntity[]> {
+  async getEntityList(entityType: string, filters: Record<string, any> = {}): Promise<BaseEntity[]> {
     const entityData = await this.entityMasterService.getEntityData(entityType);
-    const repoService = this.reflectionHelper.getRepoService(
-      entityData.entity_data_class,
-    );
+    const repoService = this.reflectionHelper.getRepoService(entityData.entity_data_class);
+  
     if (!repoService) {
-      throw new Error(
-        `Repository service not found for entityType: ${entityType}`,
-      );
+      throw new Error(`Repository service not found for entityType: ${entityType}`);
     }
-
-    const result = await repoService.find();
+  
+    const result = await repoService.find({
+      where: filters,
+    });
+  
     return result;
   }
 
   async updateEntity(
     entityData: BaseEntity,
-    loggedInUserData: UserData | null,
+    loggedInUser: UserData | null,
   ): Promise<BaseEntity> {
     const entityMaster = await this.entityMasterService.getEntityData(
       entityData.entity_type,
@@ -143,8 +146,12 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     }
 
     entityData.modified_date = new Date();
-    if (loggedInUserData) {
-      entityData.modified_by = loggedInUserData.id;
+    if (loggedInUser) {
+      entityData.modified_by = loggedInUser.id;
+      if (!entityData.organization_id)
+        entityData.organization_id = loggedInUser.organization_id;
+      if (!entityData.enterprise_id)
+        entityData.enterprise_id = loggedInUser.enterprise_id;
     }
     await repoService.update(entityData.id, entityData);
     return await repoService.findOne({ where: { id: entityData.id } });

package/dist/resources/dev.properties.yaml

@@ -1,21 +0,0 @@
-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"
-AWS:
-  S3:
-    AWS_ACCESS_KEY_ID: "AKIAYYKIBDDSQF3KILGE"
-    AWS_SECRET_KEY: "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"
-    AWS_REGION: "ap-south-1"
-    BUCKET_NAME: "testether"

package/dist/resources/uat.properties.yaml

@@ -1,15 +0,0 @@
-DB_HOST: "13.234.25.234"
-DB_PORT: "3306"
-DB_USER: "root"
-DB_PASS: "Rezolut@123"
-DB_NAME: "ether_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"