rez_core 6.5.59 → 6.5.61

package/src/module/{app_master → meta}/entity/app-master.entity.ts

@@ -1,31 +1,15 @@
 import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { BaseEntity } from './base-entity.entity';
 
 @Entity({ name: 'sso_app_master' })
-export class AppMaster {
+export class AppMaster extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = 'APM';
+  }
 
   @PrimaryGeneratedColumn()
   id: number;
-  
-  @Column({ name: 'name', type: 'varchar', length: 100, nullable: true })
-  name: string;
-
-  @Column({ name: 'status', type: 'varchar', nullable: true, length: 100 })
-  status: string;
-
-  @Column({ name: 'code', type: 'varchar', length: 100, nullable: true })
-  code: string;
-
-  @Column({ name: 'created_by', type: 'bigint', nullable: true })
-  created_by: number;
-
-  @Column({ name: 'created_date',nullable: true })
-  created_date: Date;
-
-  @Column({ name: 'modified_by', type: 'bigint', nullable: true })
-  modified_by: number;
-
-  @Column({ name: 'modified_date', nullable: true })
-  modified_date: Date;
 
   @Column({ name: 'type', type: 'varchar', nullable: true })
   type: string;
@@ -47,4 +31,7 @@ export class AppMaster {
 
   @Column({ name: 'version', type: 'varchar', nullable: true })
   version: string;
+
+   @Column({ name: 'show_in_ui', type: 'boolean', nullable: true })
+  show_in_ui: string;
 }

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

@@ -89,17 +89,4 @@ export class AttributeMaster extends BaseEntity {
 
   @Column({ name: 'flat_json_key', nullable: true })
   flat_json_key: string;
-
-  // Dropdown data source fields
-  @Column({ name: 'ds_category', type: 'varchar', nullable: true, length: 50 })
-  ds_category: string;
-
-  @Column({ name: 'ds_entitytype', type: 'varchar', nullable: true, length: 255 })
-  ds_entitytype: string;
-
-  @Column({ name: 'ds_filtercode', type: 'varchar', nullable: true, length: 500 })
-  ds_filtercode: string;
-
-  @Column({ name: 'ds_appcode', type: 'varchar', nullable: true, length: 50 })
-  ds_appcode: string;
 }

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

@@ -3,7 +3,10 @@ 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();
@@ -77,9 +80,12 @@ 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,8 +38,13 @@ 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';
@@ -57,7 +62,6 @@ 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: [
@@ -70,14 +74,16 @@ import { AppMasterModule } from '../app_master/app-master.module';
       MediaData,
       ViewMaster,
       UserRoleMapping,
+      AppMaster,
       EntityRelation,
       EntityRelationData,
     ]),
     forwardRef(() => ListMasterModule),
     forwardRef(() => FilterModule),
+    forwardRef(() => require('../entity_json/entity_json.module').EntityJSONModule),
     UtilsModule,
     forwardRef(() => WorkflowAutomationModule),
-    AppMasterModule,
+
   ],
   providers: [
     EntityMasterService,
@@ -91,6 +97,7 @@ import { AppMasterModule } from '../app_master/app-master.module';
     MasterService,
     EntityTableRepository,
     EntityTableService,
+    PopulateMetaService,
     EntityTableColumnRepository,
     EntityTableColumnService,
     MediaDataRepository,
@@ -111,9 +118,11 @@ import { AppMasterModule } from '../app_master/app-master.module';
     // UserAppMappingService,
     // UserAppMappingRepository,
     UserRoleMappingRepository,
+    AppMasterRespository,
+    AppMasterService,
     ResolverService,
     EntityMasterRepository,
-    EntityRelationRepository,
+    EntityRelationRepository
   ],
   exports: [
     EntityMasterService,
@@ -121,12 +130,18 @@ import { AppMasterModule } from '../app_master/app-master.module';
     PreferenceService,
     EntityValidationService,
     EntityTableService,
+    PopulateMetaService,
     EntityTableColumnService,
     MediaDataService,
     EntityUpdateService,
     EntityUpdateRepository,
+    // SectionMasterService,
+    // FieldGroupService,
     'ViewMasterService',
     AttributeMasterService,
+    // UserAppMappingService,
+    // UserAppMappingRepository,
+    AppMasterService,
     MasterService,
     ResolverService,
     EntityDynamicService,
@@ -139,13 +154,12 @@ import { AppMasterModule } from '../app_master/app-master.module';
     MediaController,
     ViewMasterController,
     MetaController,
+    AppMasterController,
     AttributeMasterController,
     EntityDynamicController,
     EntityRelationController,
     EntityMasterController,
     EntityPublicController,
-
   ],
 })
-export class EntityModule {
-}
+export class EntityModule {}

package/src/module/{app_master → meta}/repository/app-master.repository.ts

@@ -7,14 +7,14 @@ import { AppMaster } from '../entity/app-master.entity';
 export class AppMasterRespository {
   constructor(
     @InjectRepository(AppMaster)
-    private readonly appMasterRespository: Repository<AppMaster>,
+    private readonly AppMasterRespository: Repository<AppMaster>,
   ) {}
 
   async getAppMasterDataByAppCode(
     appCode: string,
   ): Promise<AppMaster[] | null> {
-    return await this.appMasterRespository.find({
-      where: { code: appCode },
+    return await this.AppMasterRespository.find({
+      where: { appcode: appCode },
     });
   }
 }

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

@@ -1,12 +1,18 @@
-import { Injectable } from '@nestjs/common';
+import { forwardRef, Inject, 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,
   ) {
   }
 
@@ -24,6 +30,7 @@ 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;
@@ -85,6 +92,7 @@ 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;
@@ -127,4 +135,26 @@ 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,25 +3,27 @@ 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 extends EntityServiceImpl{
+export class EntityDynamicService {
   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 createEntityData(
+  async createEntity(
     entityType: string,
     entityData: Record<string, any>,
     loggedInUser: any,
@@ -134,7 +136,7 @@ export class EntityDynamicService extends EntityServiceImpl{
     const placeholders: string[] = [];
 
     for (const attr of validAttributes) {
-      if (attr.attribute_key === 'id' && !entityData.id) continue;
+      if (attr.attribute_key === 'id') continue;
 
       columns.push(attr.attribute_key);
       values.push(entityData[attr.attribute_key] ?? null);
@@ -157,11 +159,11 @@ export class EntityDynamicService extends EntityServiceImpl{
   // ----------------------------- get entity with relations
 
   // ----------------------------- create entity with relations
-  async createEntity(
+  async createEntityWithRelation(
+    entityType: string,
     data: Record<string, any>,
     loggedInUser: any,
   ): Promise<any> {
-    const entityType = data.entity_type;
     const enterpriseId = loggedInUser.enterprise_id;
     const organizationId = loggedInUser.organization_id;
 
@@ -177,7 +179,7 @@ export class EntityDynamicService extends EntityServiceImpl{
     const { mappedEntities, ...mainData } = data;
 
     // create main entity
-    const createdEntityData = await this.createEntityData(
+    const createdEntityData = await this.createEntity(
       entityType,
       mainData,
       loggedInUser,
@@ -202,7 +204,7 @@ export class EntityDynamicService extends EntityServiceImpl{
             entity_type: targetEntityType,
           };
 
-          const createdRelatedEntity = await this.createEntityData(
+          const createdRelatedEntity = await this.createEntity(
             targetEntityType,
             itemWithRef,
             loggedInUser,
@@ -235,7 +237,7 @@ export class EntityDynamicService extends EntityServiceImpl{
   }
 
   // ----------------------------- get entity with relations
-  async getEntityData(
+  async getEntityWithRelation(
     entityType: string,
     id: number | string,
     loggedInUser: any,
@@ -318,19 +320,20 @@ export class EntityDynamicService extends EntityServiceImpl{
   // ----------------------------- update with relations
 
   // ----------------------------- update entity with relations
-  async updateEntity(
+  async updateEntityWithRelations(
+    entityType: string,
+    id: number | string,
     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.updateEntityData(
+    const updatedMainEntity = await this.updateEntity(
       entityType,
-      data.id,
+      id,
       mainData,
       loggedInUser,
     );
@@ -370,12 +373,12 @@ export class EntityDynamicService extends EntityServiceImpl{
 
           if (item.id) {
             // Update existing entity
-            await this.updateEntityData(
+            await this.updateEntity(
               targetEntityType,
               item.id,
               item,
               loggedInUser,
-              Number(data.id), // pass main entity id as parent_id
+              Number(id), // pass main entity id as parent_id
             );
             targetEntityId = item.id;
             entityData = await this.getEntity(
@@ -385,11 +388,11 @@ export class EntityDynamicService extends EntityServiceImpl{
             );
           } else {
             // Create new entity
-            const createdEntity = await this.createEntityData(
+            const createdEntity = await this.createEntity(
               targetEntityType,
               item,
               loggedInUser,
-              Number(data.id), // pass main entity id as parent_id
+              Number(id), // pass main entity id as parent_id
             );
             targetEntityId = createdEntity.insertId || createdEntity.id;
             entityData = await this.getEntity(
@@ -404,7 +407,7 @@ export class EntityDynamicService extends EntityServiceImpl{
             await entityRelationDataRepo.save({
               organizationId: organizationId,
               enterprise_id: enterpriseId,
-              source_entity_id: data.id,
+              source_entity_id: id,
               source_entity_type: entityType,
               target_entity_id: targetEntityId,
               target_entity_type: targetEntityType,
@@ -430,7 +433,7 @@ export class EntityDynamicService extends EntityServiceImpl{
 
     return {
       mainEntity: {
-        id: data.id,
+        id,
         entityType,
         data: updatedMainEntity,
       },
@@ -439,7 +442,7 @@ export class EntityDynamicService extends EntityServiceImpl{
   }
 
   // -----------------------------
-  async updateEntityData(
+  async updateEntity(
     entityType: string,
     id: number | string,
     entityData: Record<string, any>,
@@ -707,7 +710,7 @@ export class EntityDynamicService extends EntityServiceImpl{
     }));
   }
 
-  async deleteEntity(
+  private async deleteEntity(
     entityType: string,
     id: number | string,
     loggedInUser: any,
@@ -782,7 +785,7 @@ export class EntityDynamicService extends EntityServiceImpl{
     entity: string,
     loggedInUser: UserData,
   ): Promise<any> {
-    const leadData = await this.getEntityData(entity, id, loggedInUser);
+    const leadData = await this.getEntityWithRelation(entity, id, loggedInUser);
 
     const { mappedEntities, ...data } = leadData as any;
 

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

@@ -17,6 +17,7 @@ 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,14 +1,18 @@
-import { Injectable } from '@nestjs/common';
+import { Inject, Injectable, forwardRef } 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 extends EntityServiceImpl {
-  constructor(private entityMasterRepo: EntityMasterRepository,
-              private entityRelationRepository: EntityRelationRepository) {
-    super();
-  }
+export class EntityRelationService {
+  constructor(
+    @Inject(forwardRef(() => EntityMasterRepository))
+    private entityMasterRepo: EntityMasterRepository,
+    @Inject(forwardRef(() => ReflectionHelper))
+    private readonly reflectionHelper: ReflectionHelper,
+       private entityRelationRepository: EntityRelationRepository
+  ) {}
 
   async getEntityRelations(
     entityType: string,

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

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