tango-app-api-store-zone 3.3.1-beta.27 → 3.3.1-beta.29

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-zone",
-    "version": "3.3.1-beta.27",
+    "version": "3.3.1-beta.29",
     "description": "zone",
     "main": "index.js",
     "type": "module",

package/src/controllers/zoneTagging.controller.js

@@ -1174,7 +1174,6 @@ export const getCameraTagging = async ( req, res ) => {
       //   query = { clientId: req.query.clientId, cameraId: camDetails._id, streamName: camDetails.streamName, storeId: req.query.storeId };
       // }
       let taggingDetails = await taggingService.find( query );
-      console.log( '🚀 ~ getCameraTagging ~ taggingDetails:', taggingDetails );
       if ( taggingDetails.length ) {
         let coordinates = [];
         details = {
@@ -1326,15 +1325,14 @@ export const updateOldData = async ( req, res ) => {
             if ( !upload.Key ) {
               logger.error( { message: `JSON Upload Error`, store: item.storeId } );
             }
-            console.log( '🚀 ~ updateOldData ~ index:', index );
-            if ( index == tagDetails.entries().length ) {
-              res.sendSuccess( 'Zone Updated Successfully' );
-            }
           } else {
             logger.error( { message: 'no data', store: item.storeId } );
             return res.sendError( 'something went wrong', 500 );
           }
         }
+        if ( index == tagDetails.length-1 ) {
+          res.sendSuccess( 'Zone Updated Successfully' );
+        }
       }
     } else {
       res.sendSuccess( 'Zone Updated Successfully' );
@@ -1497,7 +1495,7 @@ export const getZoneTaggingDetails = async ( req, res ) => {
       searchValue,
       sortColumName,
       sortBy,
-      limit = 10,
+      limit,
       offset = 1,
       export: isExport,
     } = req.body;
@@ -1573,10 +1571,10 @@ export const getZoneTaggingDetails = async ( req, res ) => {
               [] ),
             ...( isExport ?
               [] :
-              [
+              limit ? [
                 { $skip: ( offset - 1 ) * limit },
                 { $limit: Number( limit ) },
-              ] ),
+              ] : [] ),
           ],
         },
       },
@@ -1719,9 +1717,12 @@ export const addZoneCustomTag = async ( req, res ) => {
       return res.sendError( 'clientId and zoneName are required', 400 );
     }
 
+    // Escape regex special characters in tagName to avoid invalid regex patterns
+    const escapedTagName = tagName.replace( /[.*+?^${}()|[\]\\]/g, '\\$&' );
+
     // Case-insensitive check for existing tag
     const existingTag = await customZoneTagService.findOne(
-        { clientId, tagName: { $regex: `^${tagName}$`, $options: 'i' }, _id: { $ne: _id } },
+        { clientId, tagName: { $regex: `^${escapedTagName}$`, $options: 'i' }, _id: { $ne: _id } },
     );
 
     if ( existingTag ) {
@@ -1730,8 +1731,10 @@ export const addZoneCustomTag = async ( req, res ) => {
 
     let groupDoc = null;
     if ( groupName ) {
+      // Escape regex special characters in groupName to avoid invalid regex patterns
+      const escapedGroupName = groupName.replace( /[.*+?^${}()|[\]\\]/g, '\\$&' );
       // Case-insensitive check for existing group
-      groupDoc = await customzonegrouping.findOne( { clientId, groupName: { $regex: `^${groupName}$`, $options: 'i' } } );
+      groupDoc = await customzonegrouping.findOne( { clientId, groupName: { $regex: `^${escapedGroupName}$`, $options: 'i' } } );
     }
 
     if ( !isExistingGroup && groupDoc ) {
@@ -1815,10 +1818,13 @@ export const uploadBulkZoneTag = async ( req, res ) => {
     const uniqueGroupNames = [ ...new Set( zonesArray.map( ( zone ) => zone.groupName ).filter( ( name ) => name && name !== '' && name !== null ) ) ];
 
     for ( const userGroupName of uniqueGroupNames ) {
+      // Escape regex special characters in group name to avoid invalid regex patterns
+      const escapedUserGroupName = userGroupName.replace( /[.*+?^${}()|[\]\\]/g, '\\$&' );
+
       // Case-insensitive check for existing group
       const existingGroupDoc = await customzonegrouping.findOne( {
         clientId,
-        groupName: { $regex: `^${userGroupName}$`, $options: 'i' },
+        groupName: { $regex: `^${escapedUserGroupName}$`, $options: 'i' },
       } );
 
       if ( existingGroupDoc ) {
@@ -1890,9 +1896,10 @@ export const uploadBulkZoneTag = async ( req, res ) => {
     if ( zoneGroupDataList.length > 0 ) {
       for ( const groupData of zoneGroupDataList ) {
         // Case-insensitive check for existing group (same as addZoneCustomTag)
+        const escapedGroupName = groupData.groupName.replace( /[.*+?^${}()|[\]\\]/g, '\\$&' );
         const groupDoc = await customzonegrouping.findOne( {
           clientId,
-          groupName: { $regex: `^${groupData.groupName}$`, $options: 'i' },
+          groupName: { $regex: `^${escapedGroupName}$`, $options: 'i' },
         } );
 
         if ( !groupDoc ) {
@@ -1944,6 +1951,7 @@ export const uploadBulkZoneTag = async ( req, res ) => {
       count: createdTagNames.length,
     } );
   } catch ( e ) {
+    console.log( 'uploadBulkZoneTags error :', e );
     logger.error( { error: e, function: 'addBulkZoneCustomTag' } );
     return res.sendError( 'Failed to upload zone-config file', 500 );
   }
@@ -1958,15 +1966,19 @@ export const updateZoneCustomTag = async ( req, res ) => {
     }
 
     let findQuery = {};
+
+    // Escape regex special characters in tag names to avoid invalid regex patterns
+    const escapedTagName = tagName.replace( /[.*+?^${}()|[\]\\]/g, '\\$&' );
+    const escapedOldTag = oldTag ? oldTag.replace( /[.*+?^${}()|[\]\\]/g, '\\$&' ) : null;
     if ( oldTag !== undefined && oldTag !== null && tagName !== oldTag ) {
       findQuery = {
         clientId,
-        tagName: { $regex: `^${oldTag}$`, $options: 'i' },
+        tagName: { $regex: `^${escapedOldTag}$`, $options: 'i' },
       };
     } else {
       findQuery = {
         clientId,
-        tagName: { $regex: `^${tagName}$`, $options: 'i' },
+        tagName: { $regex: `^${escapedTagName}$`, $options: 'i' },
       };
     }
     await externalService.updateMany( { zoneName: oldTag, clientId: req.body.clientId }, { zoneName: req.body.tagName } );
@@ -1989,7 +2001,7 @@ export const updateZoneCustomTag = async ( req, res ) => {
     if ( isTagNameChanging ) {
       const existingTagWithNewName = await customZoneTagService.findOne( {
         clientId,
-        tagName: { $regex: `^${tagName}$`, $options: 'i' },
+        tagName: { $regex: `^${escapedTagName}$`, $options: 'i' },
       } );
 
       // If a tag with the new name exists and it's not the same record we're updating, return error
@@ -2026,8 +2038,10 @@ export const updateZoneCustomTag = async ( req, res ) => {
     if ( oldGroupNameStr !== newGroupNameStr ) {
       // Remove tag from old group if oldGroupName exists
       if ( actualOldGroupName ) {
+        // Escape regex special characters in actualOldGroupName
+        const escapedActualOldGroupName = actualOldGroupName.replace( /[.*+?^${}()|[\]\\]/g, '\\$&' );
         const oldGroupDoc = await customzonegrouping.findOne(
-            { clientId, groupName: { $regex: `^${actualOldGroupName}$`, $options: 'i' } },
+            { clientId, groupName: { $regex: `^${escapedActualOldGroupName}$`, $options: 'i' } },
         );
         if ( oldGroupDoc ) {
           await customzonegrouping.updateOne(
@@ -2040,8 +2054,10 @@ export const updateZoneCustomTag = async ( req, res ) => {
 
       // Add tag to new group if groupName exists
       if ( groupName ) {
+        // Escape regex special characters in groupName
+        const escapedGroupName = groupName.replace( /[.*+?^${}()|[\]\\]/g, '\\$&' );
         let newGroupDoc = await customzonegrouping.findOne(
-            { clientId, groupName: { $regex: `^${groupName}$`, $options: 'i' } },
+            { clientId, groupName: { $regex: `^${escapedGroupName}$`, $options: 'i' } },
         );
 
         if ( !newGroupDoc && !isExistingGroup ) {
@@ -2064,7 +2080,9 @@ export const updateZoneCustomTag = async ( req, res ) => {
     } else if ( groupName && oldGroupNameStr === newGroupNameStr && oldTag && tagName !== oldTag ) {
       // If groupName is same (and not null) but tagName changed, update the tagName in the group's zonesTagged
       console.log( 'Group name same but tagName changed, updating group zonesTagged' );
-      const groupDoc = await customzonegrouping.findOne( { clientId, groupName: { $regex: `^${groupName}$`, $options: 'i' } } );
+      // Escape regex special characters in groupName
+      const escapedGroupName = groupName.replace( /[.*+?^${}()|[\]\\]/g, '\\$&' );
+      const groupDoc = await customzonegrouping.findOne( { clientId, groupName: { $regex: `^${escapedGroupName}$`, $options: 'i' } } );
       if ( groupDoc ) {
         await customzonegrouping.updateOne(
             { _id: groupDoc._id },
@@ -2188,7 +2206,7 @@ export const getZoneGroupDetails = async ( req, res ) => {
       searchValue,
       sortColumName,
       sortBy,
-      limit = 10,
+      limit,
       offset = 1,
       export: isExport,
     } = req.body;
@@ -2276,10 +2294,10 @@ export const getZoneGroupDetails = async ( req, res ) => {
 
             ...( isExport ?
               [] :
-              [
+              limit ? [
                 { $skip: ( offset - 1 ) * limit },
                 { $limit: Number( limit ) },
-              ] ),
+              ] : [] ),
           ],
         },
       },
@@ -2297,6 +2315,7 @@ export const getZoneGroupDetails = async ( req, res ) => {
     const totalZoneCount = await customZoneTagService.count( { clientId } );
 
     if ( isExport && zoneGroupList.length ) {
+      console.log( 'Exporting Zone Group Data:', JSON.stringify( zoneGroupList ) );
       const exportdata = zoneGroupList.map( ( element ) => ( {
         'Zone Group Name': element.groupName || '--',
         'Zones tagged': Array.isArray( element.zonesTagged ) ?
@@ -2456,10 +2475,13 @@ export const addZoneGroup = async ( req, res ) => {
       return res.sendError( 'clientId and groupName are required', 400 );
     }
 
+    // Escape regex special characters in groupName to avoid invalid regex patterns
+    const escapedGroupName = groupName.replace( /[.*+?^${}()|[\]\\]/g, '\\$&' );
+
     // Case-insensitive check for existing group
     const existingGroup = await customzonegrouping.findOne( {
       clientId,
-      groupName: { $regex: `^${groupName}$`, $options: 'i' },
+      groupName: { $regex: `^${escapedGroupName}$`, $options: 'i' },
     } );
 
     if ( existingGroup ) {
@@ -2530,10 +2552,14 @@ export const updateZoneGroup = async ( req, res ) => {
     }
 
     let findGroup = await customzonegrouping.findOne( { _id: _id } );
+
+    // Escape regex special characters in groupName to avoid invalid regex patterns
+    const escapedGroupName = groupName.replace( /[.*+?^${}()|[\]\\]/g, '\\$&' );
+
     // Case-insensitive check for existing group (excluding current group)
     const existingGroup = await customzonegrouping.findOne( {
       clientId: clientId,
-      groupName: { $regex: `^${groupName}$`, $options: 'i' },
+      groupName: { $regex: `^${escapedGroupName}$`, $options: 'i' },
       _id: { $ne: _id },
     } );
     if ( existingGroup && existingGroup.groupName ) {
@@ -2702,7 +2728,7 @@ export const deleteZoneGroup = async ( req, res ) => {
 };
 
 export async function oldTagsMigration() {
-  let uniqueTags = await taggingService.find( { productName: 'tangoZone' } );
+  let uniqueTags = await taggingService.find( { productName: 'tangoZone', clientId: '440' } );
   const result = _.uniqBy( uniqueTags, 'tagName' );