rez_core 6.5.61 → 6.5.62

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

@@ -3,10 +3,7 @@ import { ENTITYTYPE_ENTITYMASTER } from '../../../constant/global.constant';
 import { Column, Entity, Index } from 'typeorm';
 
 @Entity({ name: 'frm_entity_master' })
-@Index('idx_entity_master_mapped_type_org', [
-  'mapped_entity_type',
-  'organization_id',
-])
+@Index('idx_entity_master_mapped_type_org', ['mapped_entity_type', 'organization_id'])
 export class EntityMaster extends BaseEntity {
   constructor() {
     super();
@@ -80,12 +77,9 @@ export class EntityMaster extends BaseEntity {
   @Column({ name: 'is_workflow', nullable: true })
   is_workflow: boolean;
 
-  @Column({ name: 'doc_upload_path', nullable: true, length: 50 })
+  @Column({ name: 'doc_upload_path', nullable: true, length:50 })
   doc_upload_path: string;
 
-  @Column({ name: 'overwrite_path', type: 'int', nullable: true })
+  @Column({name: 'overwrite_path', type: 'int', nullable: true})
   overwrite_path: number;
-
-  @Column({ name: 'is_flag_json', nullable: true })
-  is_flag_json: boolean;
 }

package/src/module/meta/entity.module.ts

@@ -38,13 +38,8 @@ import { FilterModule } from '../filter/filter.module';
 // import { UserAppMappingService } from './service/user-app-mapping.service';
 // import { UserAppMappingRepository } from './repository/user-app-mapping.repository';
 // import { UserAppMapping } from './entity/user-app-mapping.entity';
-import { AppMasterController } from './controller/app-master.controller';
 import { UserRoleMappingRepository } from '../user/repository/user-role-mapping.repository';
 import { UserRoleMapping } from '../user/entity/user-role-mapping.entity';
-import { AppMasterService } from './service/app-master.service';
-import { AppMasterRespository } from './repository/app-master.repository';
-import { AppMaster } from './entity/app-master.entity';
-import { PopulateMetaService } from './service/populate-meta.service';
 import { AttributeMasterController } from './controller/attribute-master.controller';
 import { EntityDynamicController } from './controller/entity-dynamic.controller';
 import { EntityDynamicService } from './service/entity-dynamic.service';
@@ -62,6 +57,7 @@ import { EntityPublicController } from './controller/entity.public.controller';
 import { EntityUpdateService } from './service/entity-attribute-update.service';
 import { EntityUpdateRepository } from './repository/entity-attribute-update.repository';
 import { EntityRelationRepository } from './repository/entity-relation.repository';
+import { AppMasterModule } from '../app_master/app-master.module';
 
 @Module({
   imports: [
@@ -74,16 +70,14 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
       MediaData,
       ViewMaster,
       UserRoleMapping,
-      AppMaster,
       EntityRelation,
       EntityRelationData,
     ]),
     forwardRef(() => ListMasterModule),
     forwardRef(() => FilterModule),
-    forwardRef(() => require('../entity_json/entity_json.module').EntityJSONModule),
     UtilsModule,
     forwardRef(() => WorkflowAutomationModule),
-
+    AppMasterModule,
   ],
   providers: [
     EntityMasterService,
@@ -97,7 +91,6 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     MasterService,
     EntityTableRepository,
     EntityTableService,
-    PopulateMetaService,
     EntityTableColumnRepository,
     EntityTableColumnService,
     MediaDataRepository,
@@ -118,11 +111,9 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     // UserAppMappingService,
     // UserAppMappingRepository,
     UserRoleMappingRepository,
-    AppMasterRespository,
-    AppMasterService,
     ResolverService,
     EntityMasterRepository,
-    EntityRelationRepository
+    EntityRelationRepository,
   ],
   exports: [
     EntityMasterService,
@@ -130,18 +121,12 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     PreferenceService,
     EntityValidationService,
     EntityTableService,
-    PopulateMetaService,
     EntityTableColumnService,
     MediaDataService,
     EntityUpdateService,
     EntityUpdateRepository,
-    // SectionMasterService,
-    // FieldGroupService,
     'ViewMasterService',
     AttributeMasterService,
-    // UserAppMappingService,
-    // UserAppMappingRepository,
-    AppMasterService,
     MasterService,
     ResolverService,
     EntityDynamicService,
@@ -154,12 +139,13 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     MediaController,
     ViewMasterController,
     MetaController,
-    AppMasterController,
     AttributeMasterController,
     EntityDynamicController,
     EntityRelationController,
     EntityMasterController,
     EntityPublicController,
+
   ],
 })
-export class EntityModule {}
+export class EntityModule {
+}

package/src/module/meta/service/attribute-master.service.ts

@@ -1,18 +1,12 @@
-import { forwardRef, Inject, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { AttributeMasterRepository } from '../repository/attribute-master.repository';
 import { UserData } from 'src/module/user/entity/user.entity';
 import { AttributeMaster } from '../entity/attribute-master.entity';
-import { EntityMasterRepository } from '../repository/entity-master.repository';
-import { EntityJSONService } from 'src/module/entity_json/service/entity_json.service';
 
 @Injectable()
 export class AttributeMasterService {
   constructor(
     private readonly attributeMasterRepository: AttributeMasterRepository,
-    @Inject(forwardRef(() => EntityMasterRepository))
-    private readonly entityMasterRepository: EntityMasterRepository,
-    @Inject(forwardRef(() => EntityJSONService))
-    private readonly entityJSONService: EntityJSONService,
   ) {
   }
 
@@ -30,7 +24,6 @@ export class AttributeMasterService {
     attributeData: AttributeMaster,
     loggedInUser: UserData,
   ): Promise<AttributeMaster> {
-    attributeData.organization_id = loggedInUser.organization_id;
     attributeData.enterprise_id = loggedInUser.enterprise_id;
     attributeData.level_type = loggedInUser.level_type;
     attributeData.level_id = loggedInUser.level_id;
@@ -92,7 +85,6 @@ export class AttributeMasterService {
     id: number,
     loggedInUser: UserData,
   ): Promise<AttributeMaster | null> {
-    attributeData.organization_id = loggedInUser.organization_id;
     attributeData.enterprise_id = loggedInUser.enterprise_id;
     attributeData.level_type = loggedInUser.level_type;
     attributeData.level_id = loggedInUser.level_id;
@@ -135,26 +127,4 @@ export class AttributeMasterService {
       loggedInUser.enterprise_id
     );
   }
-
-    async getAttributes(entityType: string, loggedInUser: any) {
-
-
-    const entityData = await this.entityMasterRepository.getEntityByMappedEntityType(
-      entityType,
-      loggedInUser.enterprise_id,
-    );
-
-    if (entityData && entityData.is_flag_json) {
-      return this.entityJSONService.getAttributeForFlatJSON(
-        entityType,
-        loggedInUser,
-        'filter_attribute',
-      );
-    }
-
-    return await this.findAttributesByMappedEntityType(
-      entityType,
-      loggedInUser,
-    );
-  }
 }

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

@@ -3,27 +3,25 @@ import { STATUS_ACTIVE } from 'src/constant/global.constant';
 import { EntityManager, In } from 'typeorm';
 import { UserData } from 'src/module/user/entity/user.entity';
 import { MediaDataService } from './media-data.service';
-import { ResolverService } from './resolver.service';
 import { EntityMasterRepository } from '../repository/entity-master.repository';
-import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 import { ConfigService } from '@nestjs/config';
+import { EntityServiceImpl } from './entity-service-impl.service';
 
 @Injectable()
-export class EntityDynamicService {
+export class EntityDynamicService extends EntityServiceImpl{
   constructor(
     private readonly entityManager: EntityManager,
     private readonly mediaDataService: MediaDataService,
-    private readonly resolverService: ResolverService,
     private readonly entityMasterRepo: EntityMasterRepository,
-    private readonly reflectionHelper: ReflectionHelper,
     private readonly configService: ConfigService,
   ) {
+    super();
   }
 
   schema = this.configService.get('DB_SCHEMA');
 
   // -----------------------------
-  async createEntity(
+  async createEntityData(
     entityType: string,
     entityData: Record<string, any>,
     loggedInUser: any,
@@ -136,7 +134,7 @@ export class EntityDynamicService {
     const placeholders: string[] = [];
 
     for (const attr of validAttributes) {
-      if (attr.attribute_key === 'id') continue;
+      if (attr.attribute_key === 'id' && !entityData.id) continue;
 
       columns.push(attr.attribute_key);
       values.push(entityData[attr.attribute_key] ?? null);
@@ -159,11 +157,11 @@ export class EntityDynamicService {
   // ----------------------------- get entity with relations
 
   // ----------------------------- create entity with relations
-  async createEntityWithRelation(
-    entityType: string,
+  async createEntity(
     data: Record<string, any>,
     loggedInUser: any,
   ): Promise<any> {
+    const entityType = data.entity_type;
     const enterpriseId = loggedInUser.enterprise_id;
     const organizationId = loggedInUser.organization_id;
 
@@ -179,7 +177,7 @@ export class EntityDynamicService {
     const { mappedEntities, ...mainData } = data;
 
     // create main entity
-    const createdEntityData = await this.createEntity(
+    const createdEntityData = await this.createEntityData(
       entityType,
       mainData,
       loggedInUser,
@@ -204,7 +202,7 @@ export class EntityDynamicService {
             entity_type: targetEntityType,
           };
 
-          const createdRelatedEntity = await this.createEntity(
+          const createdRelatedEntity = await this.createEntityData(
             targetEntityType,
             itemWithRef,
             loggedInUser,
@@ -237,7 +235,7 @@ export class EntityDynamicService {
   }
 
   // ----------------------------- get entity with relations
-  async getEntityWithRelation(
+  async getEntityData(
     entityType: string,
     id: number | string,
     loggedInUser: any,
@@ -320,20 +318,19 @@ export class EntityDynamicService {
   // ----------------------------- update with relations
 
   // ----------------------------- update entity with relations
-  async updateEntityWithRelations(
-    entityType: string,
-    id: number | string,
+  async updateEntity(
     data: Record<string, any>,
     loggedInUser: any,
   ): Promise<any> {
+    const entityType = data.entity_type;
     const organizationId = loggedInUser.organization_id;
     const enterpriseId = loggedInUser.enterprise_id;
     const { mappedEntities, ...mainData } = data;
 
     // Update main entity
-    const updatedMainEntity = await this.updateEntity(
+    const updatedMainEntity = await this.updateEntityData(
       entityType,
-      id,
+      data.id,
       mainData,
       loggedInUser,
     );
@@ -373,12 +370,12 @@ export class EntityDynamicService {
 
           if (item.id) {
             // Update existing entity
-            await this.updateEntity(
+            await this.updateEntityData(
               targetEntityType,
               item.id,
               item,
               loggedInUser,
-              Number(id), // pass main entity id as parent_id
+              Number(data.id), // pass main entity id as parent_id
             );
             targetEntityId = item.id;
             entityData = await this.getEntity(
@@ -388,11 +385,11 @@ export class EntityDynamicService {
             );
           } else {
             // Create new entity
-            const createdEntity = await this.createEntity(
+            const createdEntity = await this.createEntityData(
               targetEntityType,
               item,
               loggedInUser,
-              Number(id), // pass main entity id as parent_id
+              Number(data.id), // pass main entity id as parent_id
             );
             targetEntityId = createdEntity.insertId || createdEntity.id;
             entityData = await this.getEntity(
@@ -407,7 +404,7 @@ export class EntityDynamicService {
             await entityRelationDataRepo.save({
               organizationId: organizationId,
               enterprise_id: enterpriseId,
-              source_entity_id: id,
+              source_entity_id: data.id,
               source_entity_type: entityType,
               target_entity_id: targetEntityId,
               target_entity_type: targetEntityType,
@@ -433,7 +430,7 @@ export class EntityDynamicService {
 
     return {
       mainEntity: {
-        id,
+        id: data.id,
         entityType,
         data: updatedMainEntity,
       },
@@ -442,7 +439,7 @@ export class EntityDynamicService {
   }
 
   // -----------------------------
-  async updateEntity(
+  async updateEntityData(
     entityType: string,
     id: number | string,
     entityData: Record<string, any>,
@@ -710,7 +707,7 @@ export class EntityDynamicService {
     }));
   }
 
-  private async deleteEntity(
+  async deleteEntity(
     entityType: string,
     id: number | string,
     loggedInUser: any,
@@ -785,7 +782,7 @@ export class EntityDynamicService {
     entity: string,
     loggedInUser: UserData,
   ): Promise<any> {
-    const leadData = await this.getEntityWithRelation(entity, id, loggedInUser);
+    const leadData = await this.getEntityData(entity, id, loggedInUser);
 
     const { mappedEntities, ...data } = leadData as any;
 

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

@@ -17,7 +17,6 @@ export class EntityMasterService {
     private readonly dataSource: DataSource,
     @Inject('ListMasterService')
     private readonly listMasterService: ListMasterService,
-    @Inject(forwardRef(() => SavedFilterRepositoryService))
     private readonly savedFilterRepoService: SavedFilterRepositoryService,
   ) {}
 

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

@@ -1,18 +1,14 @@
-import { Inject, Injectable, forwardRef } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { EntityServiceImpl } from './entity-service-impl.service';
 import { EntityMasterRepository } from '../repository/entity-master.repository';
-import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 import { EntityRelationRepository } from '../repository/entity-relation.repository';
 
 @Injectable()
-export class EntityRelationService {
-  constructor(
-    @Inject(forwardRef(() => EntityMasterRepository))
-    private entityMasterRepo: EntityMasterRepository,
-    @Inject(forwardRef(() => ReflectionHelper))
-    private readonly reflectionHelper: ReflectionHelper,
-       private entityRelationRepository: EntityRelationRepository
-  ) {}
+export class EntityRelationService extends EntityServiceImpl {
+  constructor(private entityMasterRepo: EntityMasterRepository,
+              private entityRelationRepository: EntityRelationRepository) {
+    super();
+  }
 
   async getEntityRelations(
     entityType: string,

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

@@ -14,14 +14,24 @@ import { ResolverService } from './resolver.service';
 
 @Injectable()
 export class EntityServiceImpl implements EntityService<BaseEntity> {
-  @Inject() protected readonly entityMasterService: EntityMasterService;
-  @Inject()
+  @Inject(forwardRef(() => EntityMasterService))
+  protected readonly entityMasterService: EntityMasterService;
+
+  @Inject(forwardRef(() => EntityTableColumnService))
   protected readonly entityTableColumnService: EntityTableColumnService;
-  @Inject() protected readonly entityTableService: EntityTableService;
-  @Inject() protected readonly reflectionHelper: ReflectionHelper;
-  @Inject() protected readonly loggingService: LoggingService;
-  @Inject()
+
+  @Inject(forwardRef(() => EntityTableService))
+  protected readonly entityTableService: EntityTableService;
+
+  @Inject(forwardRef(() => ReflectionHelper))
+  protected readonly reflectionHelper: ReflectionHelper;
+
+  @Inject(forwardRef(() => LoggingService))
+  protected readonly loggingService: LoggingService;
+
+  @Inject(forwardRef(() => EntityValidationService))
   protected readonly entityValidationService: EntityValidationService;
+
   @Inject(forwardRef(() => ResolverService))
   protected readonly resolverService: ResolverService;
 
@@ -29,7 +39,6 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     entityData: BaseEntity,
     loggedInUser: UserData | null,
     manager?: EntityManager | null,
-    appcode?: string,
   ) {
     if (!entityData.entity_type) {
       throw new BadRequestException(`EntityType is missing`);
@@ -77,21 +86,19 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     const statusList = await listMasterItemsRepo.findOne({
       where: {
         code: STATUS_ACTIVE,
-        organization_id: loggedInUser?.organization_id || 0,
+        enterprise_id: loggedInUser?.enterprise_id || 0,
       },
       select: ['id'],
     });
 
     console.log('Status List:', statusList); // Debug log
     console.log(
-      `status_code,${STATUS_ACTIVE},statusList, ${loggedInUser?.organization_id}`,
+      `status_code,${STATUS_ACTIVE},statusList, ${loggedInUser?.enterprise_id}`,
     ); // Debug log
 
     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;
       if (!entityData.level_type)
@@ -291,8 +298,6 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     entityData.modified_date = new Date();
     if (loggedInUser) {
       entityData.modified_by = loggedInUser.id;
-      if (!entityData.organization_id && entityData.entity_type !== 'ORG')
-        entityData.organization_id = loggedInUser.organization_id;
       if (!entityData.enterprise_id)
         entityData.enterprise_id = loggedInUser.enterprise_id;
     }
@@ -344,7 +349,6 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     entityType: string,
     entityId: number,
     loggedInUser: UserData,
-    format_disable?: boolean,
   ): Promise<any> {
     const entityData = await this.entityMasterService.getEntityData(
       entityType,
@@ -362,7 +366,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     }
     const data = await repoService.findOne({ where: { id: entityId } });
 
-    return this.resolverService.getResolvedData(loggedInUser, data, entityType,format_disable);
+    return this.resolverService.getResolvedData(loggedInUser, data, entityType);
   }
 
   async getResolvedEntityDataByDataSource(

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

@@ -5,22 +5,18 @@ import { EntityTableDto } from '../dto/entity-table.dto';
 import { DISPLAY_LIST } from '../../../constant/global.constant';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 import { SavedFilterRepositoryService } from 'src/module/filter/repository/saved-filter.repository';
-import { AttributeMasterService } from './attribute-master.service';
 
 @Injectable()
 export class EntityTableService {
   constructor(
     private entityTableRepository: EntityTableRepository,
     private readonly entityTableColumnRepository: EntityTableColumnRepository,
-    // private readonly entityJSONService: EntityJSONService,
 
     @Inject(forwardRef(() => 'ListMasterService'))
     @Inject('ListMasterService')
     private readonly listMasterService: ListMasterService,
 
-    @Inject(forwardRef(() => SavedFilterRepositoryService))
     private readonly savedFilterRepoService: SavedFilterRepositoryService,
-    private readonly attributeMasterService: AttributeMasterService,
   ) {}
 
   async getEntityData(mappedEntityType: string | null, loggedInUser) {
@@ -83,87 +79,77 @@ export class EntityTableService {
     displayType: string,
     loggedInUser: any,
   ) {
-    let entityTableDto: any = {};
-
-    entityTableDto.column_list = [
-      {
-        name:'Code',
-        attribute_key:'code',
-        data_type:'text'
-      },
-      {
-        name:'name',
-        attribute_key:'name',
-        data_type:'text'
-      },
-      {
-        name:'status',
-        attribute_key:'status',
-        data_type:'select'
-      },
-      {
-        name:'description',
-        attribute_key:'description',
-        data_type:'text'
-      }
-    ];
-
-    entityTableDto.operation_list = {
-      text: await this.listMasterService.getDropdownOptions(
-        'OPT',
-        {},
-        [],
-        loggedInUser,
-      ),
-      number: await this.listMasterService.getDropdownOptions(
-        'OPN',
-        {},
-        [],
-        loggedInUser,
-      ),
-      date: await this.listMasterService.getDropdownOptions(
-        'OPD',
-        {},
-        [],
-        loggedInUser,
-      ),
-      select: await this.listMasterService.getDropdownOptions(
-        'OPS',
-        {},
-        [],
-        loggedInUser,
-      ),
-      multiselect: await this.listMasterService.getDropdownOptions(
-        'OPM',
-        {},
-        [],
-        loggedInUser,
-      ),
-      year: await this.listMasterService.getDropdownOptions(
-        'OPY',
-        {},
-        [],
-        loggedInUser,
-      ),
-      // Add any other operations you want to include
-    };
-    entityTableDto.default_filter =
-      await this.savedFilterRepoService.getDefaultFilterByEntityType(
-        entityType,
-      );
-    if (loggedInUser.id) {
-      entityTableDto.saved_filter =
-        await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(
-          loggedInUser.id,
-          entityType,
+    const entityTable = await this.findByEntityTypeAndListTypeAndDisplayType(
+      entityType,
+      listType,
+      displayType,
+      loggedInUser?.enterprise_id,
+    );
+    const entityTableDto = entityTable as EntityTableDto;
+    if (entityTable) {
+      entityTableDto.column_list =
+        await this.entityTableColumnRepository.findByParentIdAndParentType(
+          entityTable.id,
+          entityTable.entity_type,
+          loggedInUser.enterprise_id,
         );
-    }
-    if (loggedInUser.id) {
-      entityTableDto.shared_filter =
-        await this.savedFilterRepoService.getSharedFiltersByLevelTypeAndLevelId(
+      entityTableDto.operation_list = {
+        text: await this.listMasterService.getDropdownOptions(
+          'OPT',
+          {},
+          [],
+          loggedInUser,
+        ),
+        number: await this.listMasterService.getDropdownOptions(
+          'OPN',
+          {},
+          [],
+          loggedInUser,
+        ),
+        date: await this.listMasterService.getDropdownOptions(
+          'OPD',
+          {},
+          [],
+          loggedInUser,
+        ),
+        select: await this.listMasterService.getDropdownOptions(
+          'OPS',
+          {},
+          [],
           loggedInUser,
-          entityType,
+        ),
+        multiselect: await this.listMasterService.getDropdownOptions(
+          'OPM',
+          {},
+          [],
+          loggedInUser,
+        ),
+        year: await this.listMasterService.getDropdownOptions(
+          'OPY',
+          {},
+          [],
+          loggedInUser,
+        ),
+        // Add any other operations you want to include
+      };
+      entityTableDto.default_filter =
+        await this.savedFilterRepoService.getDefaultFilterByEntityType(
+          entityTable.list_type,
         );
+      if (loggedInUser.id) {
+        entityTableDto.saved_filter =
+          await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(
+            loggedInUser,
+            entityTable.list_type,
+          );
+      }
+      if (loggedInUser.id) {
+        entityTableDto.shared_filter =
+          await this.savedFilterRepoService.getSharedFiltersByLevelTypeAndLevelId(
+            loggedInUser,
+            entityTable.list_type,
+          );
+      }
     }
 
     return entityTableDto;

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

@@ -2,6 +2,7 @@ import { UserData } from '../../user/entity/user.entity';
 import { BaseEntity } from '../entity/base-entity.entity';
 import { EntityListData } from '../dto/entity-list-data.dto';
 import { EntityManager } from 'typeorm';
+import { FilterRequestDto } from '../../filter/dto/filter-request.dto';
 
 export interface EntityService<T extends BaseEntity> {
   createEntity(