rez_core 6.6.6 → 7.0.1

package/dist/module/listmaster/service/list-master-item.service.d.ts

@@ -1,7 +1,7 @@
 import { DataSource } from 'typeorm';
 import { ListMasterItemsRepository } from '../repository/list-master-items.repository';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
-import { UserData } from 'src/module/user/entity/user.entity';
+import { UserData } from 'src/module/auth/dto/user.dto';
 import { AttributeMasterService } from 'src/module/meta/service/attribute-master.service';
 import { ListMasterRepository } from '../repository/list-master.repository';
 export declare class ListMasterItemService extends EntityServiceImpl {

package/dist/module/listmaster/service/list-master-item.service.js

@@ -34,7 +34,7 @@ let ListMasterItemService = class ListMasterItemService extends entity_service_i
     }
     async createEntity(entityData, loggedInUser) {
         try {
-            const generatedCode = codeGenerator_service_1.CodeGeneratorService.generateCode(entityData.name);
+            const generatedCode = codeGenerator_service_1.CodeGeneratorService.generateCode(entityData.code);
             entityData.code = generatedCode;
             entityData.value = generatedCode;
             return await this.entityServiceImpl.createEntity(entityData, loggedInUser);
@@ -49,63 +49,143 @@ let ListMasterItemService = class ListMasterItemService extends entity_service_i
     async upsertListMasterItem(listType, items, loggedInUser) {
         const entId = loggedInUser.enterprise_id;
         const errors = [];
-        for (let i = 0; i < items.length; i++) {
-            const item = items[i];
-            const name = item.name?.trim();
-            const code = item.code?.trim();
-            try {
-                if (!name) {
-                    throw new common_1.BadRequestException(`name is missing at index ${i}`);
+        const processedItems = items.map((item, index) => ({
+            ...item,
+            index,
+            name: item.name?.trim(),
+            code: item.code?.trim(),
+            itemId: item.id,
+        }));
+        const existingItems = await this.listItemsRepo.findAllItemsByListType(listType, 'asc', entId);
+        const existingItemsById = new Map(existingItems.map(item => [item.id, item]));
+        const existingItemsByName = new Map(existingItems.map(item => [item.name?.toLowerCase(), item]));
+        const existingItemsByCode = new Map(existingItems.filter(item => item.code).map(item => [item.code?.toLowerCase(), item]));
+        const validItems = [];
+        for (const processedItem of processedItems) {
+            const { index, name, code, itemId } = processedItem;
+            const itemErrors = [];
+            if (!name) {
+                itemErrors.push({
+                    field: 'name',
+                    message: 'Name is required',
+                });
+            }
+            if (!code) {
+                itemErrors.push({
+                    field: 'code',
+                    message: 'Code is required',
+                });
+            }
+            let existingItem = null;
+            let effectiveItemId = itemId;
+            if (itemId) {
+                existingItem = existingItemsById.get(itemId) || null;
+                if (!existingItem) {
+                    itemErrors.push({
+                        field: 'id',
+                        message: `List item with id ${itemId} not found`,
+                    });
                 }
-                if (code) {
-                    const existingItem = await this.listItemsRepo.findOneByCondition({
-                        code,
-                        listtype: listType,
-                        enterprise_id: entId,
+                else if (existingItem.listtype !== listType) {
+                    itemErrors.push({
+                        field: 'id',
+                        message: `List item with id ${itemId} does not belong to list type ${listType}`,
+                    });
+                }
+            }
+            else {
+                const existingByName = name ? existingItemsByName.get(name.toLowerCase()) : null;
+                const existingByCode = code ? existingItemsByCode.get(code.toLowerCase()) : null;
+                if (existingByName && existingByCode && existingByName.id === existingByCode.id) {
+                    existingItem = existingByName;
+                    effectiveItemId = existingItem.id;
+                }
+                else if (existingByName && existingByCode && existingByName.id !== existingByCode.id) {
+                    itemErrors.push({
+                        field: 'name',
+                        message: `Name "${name}" belongs to item with code "${existingByName.code}"`,
+                    });
+                    itemErrors.push({
+                        field: 'code',
+                        message: `Code "${code}" belongs to item with name "${existingByCode.name}"`,
                     });
-                    if (existingItem) {
-                        if (existingItem.name.toLowerCase() !== name.toLowerCase()) {
-                            const nameExists = await this.listItemsRepo.findOneByCondition({
-                                name,
-                                listtype: listType,
-                                enterprise_id: entId,
-                            });
-                            if (nameExists && nameExists.id !== existingItem.id) {
-                                throw new common_1.BadRequestException(`${name} already used by another item`);
-                            }
-                        }
-                        await this.updateEntity({
-                            ...existingItem,
-                            ...item,
-                            name,
-                            listtype: listType,
-                        }, loggedInUser);
-                        continue;
-                    }
                 }
-                const nameExists = await this.listItemsRepo.findOneByCondition({
-                    name,
-                    listtype: listType,
-                    enterprise_id: entId,
+                else if (existingByName) {
+                    itemErrors.push({
+                        field: 'name',
+                        message: `List item with name "${name}" already exists with code "${existingByName.code}"`,
+                    });
+                }
+                else if (existingByCode) {
+                    itemErrors.push({
+                        field: 'code',
+                        message: `List item with code "${code}" already exists with name "${existingByCode.name}"`,
+                    });
+                }
+            }
+            if (name) {
+                const duplicateInBatch = processedItems.find((other, otherIndex) => otherIndex < index &&
+                    other.name?.toLowerCase() === name.toLowerCase() &&
+                    (!effectiveItemId || other.itemId !== effectiveItemId));
+                if (duplicateInBatch) {
+                    itemErrors.push({
+                        field: 'name',
+                        message: `Duplicate name "${name}" found in batch at row ${duplicateInBatch.index}`,
+                    });
+                }
+            }
+            if (code) {
+                const duplicateCodeInBatch = processedItems.find((other, otherIndex) => otherIndex < index &&
+                    other.code?.toLowerCase() === code.toLowerCase() &&
+                    (!effectiveItemId || other.itemId !== effectiveItemId));
+                if (duplicateCodeInBatch) {
+                    itemErrors.push({
+                        field: 'code',
+                        message: `Duplicate code "${code}" found in batch at row ${duplicateCodeInBatch.index}`,
+                    });
+                }
+            }
+            if (itemErrors.length > 0) {
+                errors.push({
+                    row: index,
+                    errors: itemErrors,
+                });
+            }
+            else {
+                validItems.push({
+                    ...processedItem,
+                    existingItem,
                 });
-                if (nameExists) {
-                    throw new common_1.BadRequestException(`list item with name ${name} already exists`);
+            }
+        }
+        for (const validItem of validItems) {
+            const { index, name, code, itemId, existingItem, ...restOfItem } = validItem;
+            try {
+                if (existingItem) {
+                    await this.updateEntity({
+                        ...restOfItem,
+                        id: existingItem.id,
+                        name,
+                        code,
+                        listtype: listType,
+                    }, loggedInUser);
+                }
+                else {
+                    await this.createEntity({
+                        ...restOfItem,
+                        name,
+                        code,
+                        listtype: listType,
+                        value: '',
+                    }, loggedInUser);
                 }
-                const finalCode = code || '';
-                await this.createEntity({
-                    ...item,
-                    name,
-                    code: finalCode,
-                    listtype: listType,
-                    value: '',
-                }, loggedInUser);
             }
             catch (error) {
                 errors.push({
-                    row: i,
+                    row: index,
                     errors: [
                         {
-                            field: 'name',
+                            field: 'general',
                             message: error.message || 'An error occurred while processing the item',
                         },
                     ],
@@ -139,6 +219,7 @@ exports.ListMasterItemService = ListMasterItemService;
 exports.ListMasterItemService = ListMasterItemService = __decorate([
     (0, common_1.Injectable)(),
     __param(2, (0, common_1.Inject)((0, common_1.forwardRef)(() => entity_service_impl_service_1.EntityServiceImpl))),
+    __param(3, (0, common_1.Inject)('AttributeMasterService')),
     __metadata("design:paramtypes", [list_master_items_repository_1.ListMasterItemsRepository,
         list_master_repository_1.ListMasterRepository,
         entity_service_impl_service_1.EntityServiceImpl,

package/dist/module/listmaster/service/list-master-item.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"list-master-item.service.js","sourceRoot":"","sources":["../../../../src/module/listmaster/service/list-master-item.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"list-master-item.service.js","sourceRoot":"","sources":["../../../../src/module/listmaster/service/list-master-item.service.ts"],"names":[],"mappings":"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"}

package/dist/module/listmaster/service/list-master.service.d.ts

@@ -1,27 +1,21 @@
 import { ListMasterItemsRepository } from '../repository/list-master-items.repository';
 import { ListMasterRepository } from '../repository/list-master.repository';
-import { ApiRegistryService } from '../../third-party-module/service/api-registry.service';
-import { HttpService } from '@nestjs/axios';
 import { EntityManager } from 'typeorm';
-import { EntityMasterService } from 'src/module/meta/service/entity-master.service';
-import { UserData } from 'src/module/user/entity/user.entity';
+import { UserData } from 'src/module/auth/dto/user.dto';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 import { Action } from '../../workflow-automation/interface/action.interface';
 import { ConfigService } from '@nestjs/config';
 import { AttributeMasterService } from '../../meta/service/attribute-master.service';
 import { IMicroserviceClients } from '../../microservice-client/service/microservice-clients';
-export declare class ListMasterService {
+export declare class ListMasterService extends EntityServiceImpl {
     private readonly entityManager;
     private readonly entityServiceImpl;
-    private readonly entityMasterService;
     private readonly listMasterRepo;
     private readonly listItemsRepo;
-    private readonly apiRegistryService;
-    private readonly httpService;
     private readonly configService;
     private readonly attributeMasterService;
     private readonly factory;
-    constructor(entityManager: EntityManager, entityServiceImpl: EntityServiceImpl, entityMasterService: EntityMasterService, listMasterRepo: ListMasterRepository, listItemsRepo: ListMasterItemsRepository, apiRegistryService: ApiRegistryService, httpService: HttpService, configService: ConfigService, attributeMasterService: AttributeMasterService, factory: IMicroserviceClients);
+    constructor(entityManager: EntityManager, entityServiceImpl: EntityServiceImpl, listMasterRepo: ListMasterRepository, listItemsRepo: ListMasterItemsRepository, configService: ConfigService, attributeMasterService: AttributeMasterService, factory: IMicroserviceClients);
     schema: any;
     private readonly skipLevelFilterEntities;
     private readonly actions;
@@ -29,12 +23,22 @@ export declare class ListMasterService {
     getResolvedListCode(code: string, enterprise_id: number): Promise<any>;
     getDropdownOptions(type: string, params: Record<string, string>, inactiveIdsArray?: number[], loggedInUser?: any, publicCall?: boolean): Promise<any>;
     private fetchFromEntity;
-    private fetchFromExternalSource;
-    private injectDynamicParams;
-    private extractByPath;
     createEntity(entityData: any, loggedInUser: UserData): Promise<any>;
     updateEntity(entityData: any, loggedInUser: UserData): Promise<any>;
     getEntityData(entity_type: string, id: number, loggedInUser: any): Promise<any>;
     getAllListMasterByOrganization(enterprise_id: number, search?: string): Promise<any[]>;
-    getDropDownData(entity_type: string, attribute_key: string, loggedInUser: UserData, body: Record<string, string>): Promise<any>;
+    getDropDownData(entity_type: string, attribute_key: string, loggedInUser: UserData, body: Record<string, any>, values?: any[]): Promise<any>;
+    private processLocalDropdown;
+    private fetchFromListMaster;
+    private fetchFromCustomInternalService;
+    private fetchFromCustomKey;
+    private fetchFromExternalAPI;
+    private applyFilterCode;
+    private formatDropdownResponse;
+    private processCrossAppDropdown;
+    private getUserRolesDropdown;
+    private getDepartmentsDropdown;
+    private getFinancialYearsDropdown;
+    private getOperatorsDropdown;
+    private parseFilterCode;
 }