rez_core 1.1.0 → 1.1.2

package/package.json

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

package/src/module/filter/controller/filter.controller.ts

@@ -50,4 +50,6 @@ export class FilterController {
   async getFilterById(@Param('id') id: string) {
     return this.savedFilterService.getFilterById(Number(id));
   }
+
+  
 }

package/src/module/filter/service/filter.service.ts

@@ -100,11 +100,11 @@ export class FilterService {
     // Get and parse filters
     const savedFilters = await this.getSavedFilters(savedFilterCode);
     const baseFilters = [
-      ...(quickFilter || []).filter(f => f.filter_value !== ""),
-      ...savedFilters.filter(f => f.filter_value !== ""),
-      ...(attributeFilter || []).filter(f => f.filter_value !== ""),
+      ...(quickFilter || []).filter((f) => f.filter_value !== ''),
+      ...savedFilters.filter((f) => f.filter_value !== ''),
+      ...(attributeFilter || []).filter((f) => f.filter_value !== ''),
     ];
-    
+
     const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
 
     // Build query for tab counts (no tab.value filter here)
@@ -229,7 +229,7 @@ export class FilterService {
       case 'select':
         return this.buildSelectCondition(attr, op, val, key);
       case 'multiselect':
-        return this.buildMultiSelectCondition(attr, val, key);
+        return this.buildMultiSelectCondition(attr, op, val, key);
       default:
         return null;
     }
@@ -310,18 +310,56 @@ export class FilterService {
       case 'equal':
         return { query: `e.${attr} = :${key}`, params: { [key]: val } };
 
+      case 'not_equal':
+        return { query: `e.${attr} != :${key}`, params: { [key]: val } };
+
+      case 'empty':
+        return { query: `e.${attr} IS NULL`, params: {} };
+
+      case 'not_empty':
+        return { query: `e.${attr} IS NOT NULL`, params: {} };
+
       default:
         throw new BadRequestException(`Unsupported operator for select: ${op}`);
     }
   }
 
-  private buildMultiSelectCondition(attr: string, val: any[], key: string) {
-    if (!Array.isArray(val)) {
-      throw new BadRequestException(`Expected array for multiselect: ${attr}`);
+  private buildMultiSelectCondition(
+    attr: string,
+    op: string,
+    val: any,
+    key: string,
+  ) {
+    switch (op) {
+      case 'equal':
+        if (!Array.isArray(val)) {
+          throw new BadRequestException(
+            `Value for multi-select must be an array for operator: ${op}`,
+          );
+        }
+        return { query: `e.${attr} IN (:...${key})`, params: { [key]: val } };
+
+      case 'not_equal':
+        if (!Array.isArray(val)) {
+          throw new BadRequestException(
+            `Value for multi-select must be an array for operator: ${op}`,
+          );
+        }
+        return {
+          query: `e.${attr} NOT IN (:...${key})`,
+          params: { [key]: val },
+        };
+
+      case 'empty':
+        return { query: `e.${attr} IS NULL`, params: {} };
+
+      case 'not_empty':
+        return { query: `e.${attr} IS NOT NULL`, params: {} };
+
+      default:
+        throw new BadRequestException(
+          `Unsupported operator for multiselect: ${op}`,
+        );
     }
-    return {
-      query: `e.${attr} IN (:...${key})`,
-      params: { [key]: val },
-    };
   }
 }

package/src/module/filter/service/saved-filter.service.ts

@@ -15,8 +15,11 @@ export class SavedFilterService extends EntityServiceImpl {
 
   async createEntity(
     entityData: BaseEntity,
-    loggedInUser: UserData | null,
+    loggedInUser: UserData,
   ): Promise<BaseEntity> {
+    entityData.organization_id = loggedInUser?.organization_id;
+    entityData.enterprise_id = loggedInUser?.enterprise_id;
+    (entityData as any).user_id = loggedInUser?.id;
     const master = entityData as SavedFilterMaster;
 
     const exists = await this.savedFilterRepo.isFilterNameExists(
@@ -55,8 +58,11 @@ export class SavedFilterService extends EntityServiceImpl {
 
   async updateEntity(
     entityData: BaseEntity,
-    loggedInUser: UserData | null,
+    loggedInUser: UserData,
   ): Promise<BaseEntity> {
+    entityData.organization_id = loggedInUser?.organization_id;
+    entityData.enterprise_id = loggedInUser?.enterprise_id;
+    (entityData as any).user_id = loggedInUser?.id;
     const master = entityData as SavedFilterMaster;
 
     const existing = await this.getEntityData(

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

@@ -2,14 +2,16 @@ import {
   BadRequestException,
   Body,
   Controller,
-  Get, HttpCode,
+  Get,
+  HttpCode,
   HttpStatus,
   Param,
   Post,
   Query,
   Res,
   Req,
-  UseGuards, Inject,
+  UseGuards,
+  Inject,
 } from '@nestjs/common';
 import { EntityServiceImpl } from '../service/entity-service-impl.service';
 import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
@@ -62,10 +64,13 @@ export class EntityController {
     @Body() entityData: BaseEntity,
     @Query('entity_type') entityType: string,
     @Res() res: Response,
-    @Req() req: Request & {user: any}
+    @Req() req: Request & { user: any },
   ) {
     let requestedUser = req.user;
-    let loggedInUser = await this.entityService.getEntityData(ENTITYTYPE_USER,requestedUser.userId);
+    let loggedInUser = await this.entityService.getEntityData(
+      ENTITYTYPE_USER,
+      requestedUser.userId,
+    );
 
     if (!entityType) {
       throw new BadRequestException(
@@ -83,7 +88,12 @@ export class EntityController {
     if (entityService) {
       return res
         .status(HttpStatus.OK)
-        .json(await entityService.createEntity(entityData, loggedInUser as UserData));
+        .json(
+          await entityService.createEntity(
+            entityData,
+            loggedInUser as UserData,
+          ),
+        );
     }
   }
 
@@ -93,10 +103,13 @@ export class EntityController {
     @Body() entityData: BaseEntity,
     @Query('entity_type') entityType: string,
     @Res() response: Response,
-    @Req() req: Request & {user: any}
+    @Req() req: Request & { user: any },
   ) {
     let requestedUser = req.user;
-    let loggedInUser = await this.entityService.getEntityData(ENTITYTYPE_USER,requestedUser.userId);
+    let loggedInUser = await this.entityService.getEntityData(
+      ENTITYTYPE_USER,
+      requestedUser.userId,
+    );
     if (!entityType) {
       throw new BadRequestException(
         'Query parameter "entity_type" is required',
@@ -117,7 +130,10 @@ export class EntityController {
       }
       // let mergeEntity = JsonUtil.merge(existingEntity, entityData);
 
-      entityData = await entityService.updateEntity(entityData, loggedInUser as UserData);
+      entityData = await entityService.updateEntity(
+        entityData,
+        loggedInUser as UserData,
+      );
       return response.status(HttpStatus.OK).json(entityData);
     }
   }
@@ -147,7 +163,7 @@ export class EntityController {
           page,
           size,
           tabColumn,
-          tabValue
+          tabValue,
         ),
       );
   }
@@ -164,13 +180,12 @@ export class EntityController {
     @Res() res: Response, // Express Response for file handling
   ) {
     try {
-
       const filePath = await this.entityService.generateExcelReport(
         entityType,
         filterCriteria,
         listEntityType,
         displayType,
-        sampleExport
+        sampleExport,
       );
 
       if (!filePath || !fs.existsSync(filePath)) {
@@ -181,7 +196,10 @@ export class EntityController {
         'Content-Disposition',
         `attachment; filename=${path.basename(filePath)}`,
       );
-      res.setHeader('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+      res.setHeader(
+        'Content-Type',
+        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      );
 
       const fileStream = fs.createReadStream(filePath);
       fileStream.pipe(res);

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

@@ -73,6 +73,8 @@ protected readonly entityValidationService: EntityValidationService;
       entityData.code = entityData.entity_type + maxSeqNo;
     }
 
+    entityData.status = "ACTIVE";
+
     entityData.created_date = new Date();
     if (loggedInUser) {
       entityData.created_by = loggedInUser.id;