rez_core 3.1.197 → 3.1.199

package/package.json

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

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

@@ -22,10 +22,8 @@ export class MapperService extends EntityServiceImpl {
     const mappers = await this.dataSource.query(
       `SELECT id, name, code, status
        FROM cr_mapper_master
-       WHERE mapped_entity_type = ? AND (-1 = ? OR name LIKE ? OR code LIKE ?) 
-       AND (-1 = ? OR status = ?)
-       `,
-      [mappedEntityType, filter || -1, `%${filter}%`, `%${filter}%`, status || -1, status],
+       WHERE mapped_entity_type = ? AND (-1 = ? OR name LIKE ? OR code LIKE ?)`,
+      [mappedEntityType, filter || -1, `%${filter}%`, `%${filter}%`],
     );
 
     const distinctStatuses = [
@@ -46,13 +44,20 @@ export class MapperService extends EntityServiceImpl {
 
     // map status names to mappers
 
-    return mappers.map((m) => ({
+    let mappersResolved =  mappers.map((m) => ({
       id: m.id,
       label: m.name,
       value: m.id,
       code: m.code,
       status: statusMap.get(m.status) || null,
     }));
+
+    if (status) {
+      mappersResolved = mappersResolved.filter(
+        (m) => m.status && m.status.toLowerCase() === status.toLowerCase(),
+      );
+    }
+    return mappersResolved;
   }
 
   async deleteEntity(entityType: string, entityId: number, loggedInUser) {

package/src/module/notification/service/otp.service.ts

@@ -70,12 +70,19 @@ export class OtpService {
     // Find OTP entity by ID
     const otpEntity = await this.findByOtpId(otp_id);
     if (!otpEntity) {
-      throw new BadRequestException('OTP not found!');
+      // throw new BadRequestException('OTP not found!');
+      return {
+        sucess: false,
+        message: 'OTP not found!',
+      };
     }
 
     // Validate the identifier against the OTP entity
     if (otpEntity.identifier !== identifier) {
-      throw new BadRequestException('Invalid OTP identifier!');
+      return {
+        sucess: false,
+        message: 'Invalid OTP identifier!',
+      };
     }
 
     // OTP validation logic