tango-app-api-store-zone 3.3.1-beta.22 → 3.3.1-beta.24

package/package.json

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

package/src/controllers/zoneTagging.controller.js

@@ -592,7 +592,6 @@ export const customTagListv3 = async ( req, res ) => {
       ] );
 
 
-      console.log( '🚀 ~ customTagListv3 ~ taggingDetails:', zonefinalTags );
       return res.sendSuccess( zonefinalTags );
     }
 
@@ -1302,37 +1301,40 @@ export const updatezoneTagging = async ( req, res ) => {
 
 export const updateOldData = async ( req, res ) => {
   try {
-    let tagDetails = await taggingService.find( {}, { storeId: 1 } );
+    let tagDetails = await taggingService.find( { clientId: req.body.clientId, tagName: req.body.tagName }, { storeId: 1 } );
+
     if ( tagDetails.length ) {
       for ( let [ index, item ] of tagDetails.entries() ) {
         req.body.storeId = item.storeId;
         let camDetails = await getCamTaggingDetails( req, res );
-        if ( !camDetails ) {
-          logger.error( { message: 'no data', store: item.storeId } );
-        }
-        const response = await axios.post( JSON.parse( process.env.URL ).zoneTaggingLamdaUrl, camDetails );
-        if ( response?.data?.status && response?.data?.status == 'success' ) {
-          let fileData = {
-            Key: `${req.body.storeId}/zonetagging/`,
-            fileName: `${req.body.storeId}_zonetagging.json`,
-            Bucket: JSON.parse( process.env.BUCKET ).zoneTaggingImage,
-            body: JSON.stringify( camDetails ),
-            ContentType: 'application/json',
-          };
-          let upload = await fileUpload( fileData );
-          if ( !upload.Key ) {
-            logger.error( { message: `JSON Upload Error`, store: item.storeId } );
-          }
-          if ( index == 0 ) {
-            res.sendSuccess( 'Zone Updated Successfully' );
+        if ( camDetails ) {
+          const response = await axios.post( JSON.parse( process.env.URL ).zoneTaggingLamdaUrl, camDetails );
+
+          if ( response?.data?.status && response?.data?.status == 'success' ) {
+            let fileData = {
+              Key: `${req.body.storeId}/zonetagging/`,
+              fileName: `${req.body.storeId}_zonetagging.json`,
+              Bucket: JSON.parse( process.env.BUCKET ).zoneTaggingImage,
+              body: JSON.stringify( camDetails ),
+              ContentType: 'application/json',
+            };
+
+            let upload = await fileUpload( fileData );
+            if ( !upload.Key ) {
+              logger.error( { message: `JSON Upload Error`, store: item.storeId } );
+            }
+            if ( index == 0 ) {
+              res.sendSuccess( 'Zone Updated Successfully' );
+            }
+          } else {
+            logger.error( { message: 'no data', store: item.storeId } );
+            return res.sendError( 'something went wrong', 500 );
           }
-        } else {
-          logger.error( { message: 'no data', store: item.storeId } );
-          // return res.sendError( 'something went wrong', 500 );
         }
       }
     }
   } catch ( e ) {
+    console.log( '🚀 ~ updateOldData ~ e:', e );
     logger.error( { error: e, function: 'updateOldData' } );
     return res.sendError( e, 500 );
   }
@@ -1501,7 +1503,11 @@ export const getZoneTaggingDetails = async ( req, res ) => {
     const matchStage = {
       clientId,
     };
-
+    let customTags = await customZoneTagService.findOne( { clientId: clientId } );
+    const alltotalGroupCount = await customzonegrouping.count( { clientId } );
+    if ( !customTags ) {
+      return res.sendSuccess( { result: [], totalGroupCount: alltotalGroupCount } );
+    }
     const searchStage = searchValue ?
       {
         $or: [
@@ -1573,6 +1579,9 @@ export const getZoneTaggingDetails = async ( req, res ) => {
     const [ result ] = await customZoneTagService.aggregate( pipeline );
 
     const totalCount = result.totalCount[0]?.count || 0;
+    if ( totalCount === 0 ) {
+      return res.sendError( 'No data', 204 );
+    }
     const zoneList = result.filteredData;
 
     // Get total count of groups for tabs (actual count, not filtered by search)
@@ -2106,8 +2115,14 @@ export const deleteZoneCustomTag = async ( req, res ) => {
     if ( !zoneTagDetails || zoneTagDetails?.length == 0 ) {
       return res.sendError( 'No data found', 400 );
     }
-
+    updateOldData( req, res );
     await customZoneTagService.deleteOne( { clientId, tagName } );
+    await taggingService.deleteMany(
+        {
+          clientId,
+          tagName: { $in: tagName },
+        },
+    );
     const logObj = {
       clientId: req.body?.clientId,
       userName: req.user?.userName,
@@ -2120,7 +2135,7 @@ export const deleteZoneCustomTag = async ( req, res ) => {
       showTo: [ 'client', 'tango' ],
     };
     insertOpenSearchData( JSON.parse( process.env.OPENSEARCH )?.activityLog, logObj );
-    return res.sendSuccess( 'ZoneName Deleted Successfully' );
+    // return res.sendSuccess( 'ZoneName Deleted Successfully' );
   } catch ( e ) {
     logger.error( { error: e, function: 'deleteZoneCustomTag' } );
     return res.sendError( e, 500 );
@@ -2145,6 +2160,12 @@ export const getZoneGroupDetails = async ( req, res ) => {
       return res.sendError( 'clientId is required', 400 );
     }
 
+
+    let groupData = await customzonegrouping.findOne( { clientId: clientId } );
+    if ( !groupData ) {
+      return res.sendSuccess( { result: [] } );
+    }
+
     const searchMatch = searchValue ?
       { groupName: { $regex: searchValue, $options: 'i' } } :
       null;
@@ -2232,7 +2253,9 @@ export const getZoneGroupDetails = async ( req, res ) => {
     const zoneGroupList = result.data || [];
 
     const totalCount = result.totalCount[0]?.count || 0;
-
+    if ( totalCount === 0 ) {
+      return res.sendError( 'No data', 204 );
+    }
     // Get total count of zones for tabs (actual count, not filtered by search)
     const totalZoneCount = await customZoneTagService.count( { clientId } );
 

package/src/validations/zone.validations.js

@@ -73,6 +73,39 @@ export async function bulkZoneExists( req, res, next ) {
     //   }
     // }
 
+    // Validate groupNames for case-insensitive duplicates
+    const groupNameList = zonesArray
+        .filter( ( zone ) => zone.groupName && zone.groupName !== '' && zone.groupName !== null )
+        .map( ( zone ) => zone.groupName );
+
+    if ( groupNameList.length > 0 ) {
+      // Group groupNames by their lowercase version
+      const groupNameMap = new Map();
+      groupNameList.forEach( ( name ) => {
+        const lowerName = name.toLowerCase();
+        if ( !groupNameMap.has( lowerName ) ) {
+          groupNameMap.set( lowerName, new Set() );
+        }
+        groupNameMap.get( lowerName ).add( name );
+      } );
+
+      // Check if any lowercase name has multiple different cases
+      const caseMismatches = [];
+      groupNameMap.forEach( ( originalNames, lowerName ) => {
+        if ( originalNames.size > 1 ) {
+          // Same lowercase name appears with different cases
+          caseMismatches.push( {
+            lowerName: lowerName,
+            cases: Array.from( originalNames ),
+          } );
+        }
+      } );
+
+      if ( caseMismatches.length > 0 ) {
+        return res.sendError( 'Duplicate group names with different cases are not allowed.', 400 );
+      }
+    }
+
     // Attach clientId to req for use in controller
     req.bulkZoneClientId = clientId;
     next();