rez_core 3.1.97 → 3.1.98

package/package.json

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

package/src/module/mapper/controller/field-mapper.controller.ts

@@ -58,8 +58,8 @@ export class FieldMapperController {
   }
 
   @Get('getFields/:mapperId')
-  async getFieldsByMapper(@Param('mapperId') mapperId: number) {
-    return this.fieldMapperService.getMapperFields(mapperId);
+  async getFieldsByMapper(@Param('mapperId') mapperId: number, @Query("mapper_entity_type") mapper_entity_type: string) {
+    return this.fieldMapperService.getMapperFields(mapperId, mapper_entity_type);
   }
 
   @Get('getLovs/:mapperFieldId')

package/src/module/mapper/mapper.module.ts

@@ -11,6 +11,7 @@ import { FieldLovsRepository } from './repository/field-lovs.repository';
 import { MapperService } from './service/mapper.service';
 import { Mapper } from './entity/mapper.entity';
 import { MapperController } from './controller/mapper.controller';
+import { MapperRepository } from './repository/mapper.repository';
 
 @Module({
   imports: [
@@ -23,6 +24,7 @@ import { MapperController } from './controller/mapper.controller';
     { provide: 'MapperService', useClass: MapperService },
     FieldMapperRepository,
     FieldLovsRepository,
+    MapperRepository
   ],
   exports: [
     { provide: 'FieldMapperService', useClass: FieldMapperService },

package/src/module/mapper/repository/field-mapper.repository.ts

@@ -29,6 +29,14 @@ export class FieldMapperRepository {
     );
   }
 
+  async findByMapperIdAndMapperEntityType(mapper_id: number, mapper_entity_type: string) {
+    return await this.fieldMapperRepository.find({
+        where: {mapper_id, mapper_entity_type},
+        order: {seq : 'ASC'}
+      },
+    );
+  }
+
   async deleteByMapperId(mapper_id: number) {
     return await this.fieldMapperRepository.delete({ mapper_id });
   }

package/src/module/mapper/repository/mapper.repository.ts

@@ -0,0 +1,19 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Mapper } from '../entity/mapper.entity';
+
+@Injectable()
+export class MapperRepository {
+  constructor(
+    @InjectRepository(Mapper) private readonly mapperRepository: MapperRepository,
+  ) {
+  }
+
+  async findById(id: number) {
+    return await this.mapperRepository.findById(id);
+  }
+
+  async deleteById(id: number) {
+    return await this.mapperRepository.deleteById(id);
+  }
+}

package/src/module/mapper/service/field-mapper.service.ts

@@ -65,9 +65,9 @@ export class FieldMapperService extends EntityServiceImpl {
     return result;
   }
 
-  async getMapperFields(mapperId: number) {
+  async getMapperFields(mapperId: number, mapper_entity_type: string) {
     let fieldMappers =
-      await this.fieldMapperRepository.findByMapperId(mapperId);
+      await this.fieldMapperRepository.findByMapperIdAndMapperEntityType(mapperId,mapper_entity_type);
     const fieldMapperDtos = fieldMappers as unknown as FieldMapperDto[];
     for (const fieldMapper of fieldMapperDtos) {
       fieldMapper.field_lovs =

package/src/module/mapper/service/mapper.service.ts

@@ -1,31 +1,56 @@
-import { Injectable } from "@nestjs/common";
-import { EntityServiceImpl } from "src/module/meta/service/entity-service-impl.service";
-import { DataSource } from "typeorm";
+import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { DataSource } from 'typeorm';
+import { MapperRepository } from '../repository/mapper.repository';
+import { FieldMapperRepository } from '../repository/field-mapper.repository';
+import { FieldLovsRepository } from '../repository/field-lovs.repository';
 
 
 @Injectable()
-export class MapperService extends EntityServiceImpl{
+export class MapperService extends EntityServiceImpl {
 
-    constructor(private readonly dataSource: DataSource) {
-        super();
-    }
+  constructor(private readonly dataSource: DataSource,
+              private mapperRepository: MapperRepository,
+              private fieldMapperRepository: FieldMapperRepository,
+              private fieldLovsRepository: FieldLovsRepository,
+  ) {
+    super();
+  }
+
+  async getByMappedEntityType(mappedEntityType: string) {
+    if (!mappedEntityType) return [];
+
+    const mappers = await this.dataSource.query(
+      `SELECT id, name, code
+       FROM cr_mapper
+       WHERE mapped_entity_type = ?`,
+      [mappedEntityType],
+    );
+
+    return mappers.map((m) => ({
+      id: m.id,
+      label: m.name,
+      value: m.id,
+      code: m.code,
+      status: m.status,
+    }));
+  }
+
+  async deleteEntity(entityType: string, entityId: number, loggedInUser) {
 
-    async getByMappedEntityType(mappedEntityType: string) {
-        if (!mappedEntityType) return [];
-    
-        const mappers = await this.dataSource.query(
-          `SELECT id, name, code 
-           FROM cr_mapper
-           WHERE mapped_entity_type = ?`,
-          [mappedEntityType],
-        );
-    
-        return mappers.map((m) => ({
-          id: m.id,
-          label: m.name,
-          value: m.id,
-          code: m.code,
-        }));
+    let fieldMappers = await this.fieldMapperRepository.findByMapperId(entityId);
+
+    for (const fieldMapper of fieldMappers) {
+      await this.fieldLovsRepository.deleteByMapperFieldId(fieldMapper.id);
     }
-   
+
+    await this.fieldMapperRepository.deleteByMapperId(entityId);
+
+    await this.mapperRepository.deleteById(entityId);
+
+    return {
+      success: true,
+      message: `Mapper deleted successfully.`,
+    };
+  }
 }