rez_core 5.0.280 → 5.0.283

package/package.json

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

package/src/module/enterprise/service/organization.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { Inject, Injectable,BadRequestException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { ClockIDGenService } from 'src/utils/service/clockIDGenUtil.service';
 import { EntityManager, IsNull, Repository } from 'typeorm';
@@ -111,19 +111,53 @@ export class OrganizationService {
     return await this.organizationRepository.find({ where: { id } });
   }
 
-  async update(
-    id: number,
-    organizationDto: Partial<OrganizationData>,
-    manager?: EntityManager,
-  ): Promise<OrganizationData | null> {
-    const repo = manager
-      ? manager.getRepository(OrganizationData)
-      : this.organizationRepository;
+  // async update(
+  //   id: number,
+  //   organizationDto: Partial<OrganizationData>,
+  //   // manager?: EntityManager,
+  // ): Promise<OrganizationData | null> {
+  //   // const repo = manager
+  //   //   ? manager.getRepository(OrganizationData)
+  //   //   : this.organizationRepository;
+
+  //   const repo = this.organizationRepository;
+
+  //   await repo.update(id, organizationDto);
+  //   return await repo.findOne({ where: { id } });
+  // }
+
+async update(
+  organizationDto: Partial<OrganizationData>,
+  userData: any,
+): Promise<OrganizationData | null> {
+
+  const orgId =
+    typeof organizationDto.id === 'number'
+      ? organizationDto.id
+      : parseInt(String(organizationDto.id).trim(), 10);
+
+  if (!Number.isInteger(orgId)) {
+    throw new BadRequestException('Invalid organization id');
+  }
 
-    await repo.update(id, organizationDto);
-    return await repo.findOne({ where: { id } });
+  const {
+    id: _ignoreId,            
+    sessionToken,
+    appcode,
+    email_id,
+    level_id,
+    level_type,
+    ...dbData
+  } = organizationDto as any;
+
+  if (!dbData || Object.keys(dbData).length === 0) {
+    throw new BadRequestException('No valid fields to update');
   }
 
+  await this.organizationRepository.update(orgId, dbData);
+  return this.organizationRepository.findOne({ where: { id: orgId } });
+}
+
   async remove(id: number, manager?: EntityManager): Promise<void> {
     const repo = manager
       ? manager.getRepository(OrganizationData)

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

@@ -87,9 +87,14 @@ export class FilterService {
           if (Array.isArray(val)) {
             // Create ($1,$2,$3)
             const placeholders = val.map(() => `$${paramIndex++}`).join(', ');
+            // parsedQuery = parsedQuery
+            //   .replace(new RegExp(`:...${key}`, 'g'), `${placeholders}`)
+            //   .replace(new RegExp(`:${key}`, 'g'), `${placeholders}`);
+
             parsedQuery = parsedQuery
-              .replace(new RegExp(`:...${key}`, 'g'), `${placeholders}`)
-              .replace(new RegExp(`:${key}`, 'g'), `${placeholders}`);
+              .replace(new RegExp(`:...${key}`, 'g'), placeholders)
+              .replace(new RegExp(`:${key}`, 'g'), placeholders);
+
             values.push(...val.map((v) => String(v)));
           } else {
             // Create $1