rez_core 6.5.58 → 6.5.59

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-service-impl.service.ts

@@ -39,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`);

package/src/module/workflow/service/task.service.ts

@@ -81,7 +81,6 @@ export class TaskService extends EntityServiceImpl {
       entityData,
       loggedInUser,
       manager,
-      appcode,
     );
 
     try {