tango-app-api-store-zone 3.0.10-dev → 3.0.11-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-zone",
-    "version": "3.0.10-dev",
+    "version": "3.0.11-dev",
     "description": "zone",
     "main": "index.js",
     "type": "module",

package/src/controllers/zoneTagging.controller.js

@@ -13,7 +13,7 @@ export const addCustomTag = async ( req, res ) => {
         storeId: inputData.storeId,
         tagName: inputData.tagName,
       };
-      await taggingService.deleteMany( { clientId: inputData.clientId, tagName: inputData.tagName, isDeleted: true } );
+      await taggingService.deleteMany( { clientId: inputData.clientId, storeId: inputData.storeId, tagName: inputData.tagName, isDeleted: true } );
       await taggingService.create( data );
     }
     logger.info( 'Tag Created Successfully' );
@@ -43,16 +43,17 @@ export const customTagList = async ( req, res ) => {
     customTagList.push( ...defaultZone );
     let tagInfo = await taggingService.find( { clientId: req.query.clientId }, { tagName: 1 } );
     let deletedTag = await taggingService.find( { clientId: req.query.clientId, isDeleted: true }, { storeId: 1, tagName: 1 } );
+    tagInfo = [ ...new Set( tagInfo.map( ( item ) => item.tagName ) ) ];
     deletedTag.forEach( ( item ) => {
-      let findTag = tagInfo.findIndex( ( tag ) => tag.tagName == item.tagName && item.storeId == req.query.storeId );
+      let findTag = tagInfo.findIndex( ( tag ) => tag == item.tagName && item.storeId == req.query.storeId );
       if ( findTag != -1 ) {
         tagInfo.splice( findTag, 1 );
       }
     } );
     if ( tagInfo.length ) {
       tagInfo.forEach( ( item ) => {
-        if ( !customTagList.includes( item.tagName ) ) {
-          customTagList.push( item.tagName );
+        if ( !customTagList.includes( item ) ) {
+          customTagList.push( item );
         }
       } );
     }
@@ -201,7 +202,7 @@ export const getCameraList = async ( req, res ) => {
         baseImg: '',
         tagImg: '',
       };
-      let taggingDetails = await taggingService.find( { cameraId: camera._id, streamName: camera.streamName, clientId: req.query.clientId }, { tagName: 1, coordinates: 1 } );
+      let taggingDetails = await taggingService.find( { cameraId: camera._id, streamName: camera.streamName, clientId: req.query.clientId, isDeleted: false }, { tagName: 1, coordinates: 1 } );
       if ( taggingDetails.length ) {
         tagList = taggingDetails.map( ( item ) => {
           if ( item.coordinates.length ) {
@@ -261,8 +262,8 @@ export const updateTag = async ( req, res ) => {
     if ( !taggingDetails ) {
       return res.sendError( 'no data found', 204 );
     }
-    let tagUpdate = await taggingService.updateMany( { clientId: req.body.clientId, tagName: req.body.existTag, isDeleted: false }, { tagName: req.body.tagName } );
-    await taggingService.deleteMany( { clientId: req.body.clientId, tagName: req.body.tagName, isDeleted: true } );
+    let tagUpdate = await taggingService.updateMany( { clientId: req.body.clientId, tagName: req.body.existTag }, { tagName: req.body.tagName } );
+    // await taggingService.deleteMany( { clientId: req.body.clientId, tagName: req.body.existTag, isDeleted: true } );
     if ( tagUpdate.modifiedCount ) {
       logger.info( 'Custom Tag Updated Successfully' );
       return res.sendSuccess( 'Custom Tag Updated Successfully' );
@@ -296,7 +297,7 @@ export const updateTag = async ( req, res ) => {
 
 export const deleteTag = async ( req, res ) => {
   try {
-    let taggingDetails = await taggingService.find( { clientId: req.body.clientId, tagName: req.body.tagName, isDeleted: false }, { storeId: 1 } );
+    let taggingDetails = await taggingService.find( { clientId: req.body.clientId, tagName: req.body.tagName }, { storeId: 1 } );
     if ( !taggingDetails.length ) {
       return res.sendError( 'no data found', 204 );
     }
@@ -362,7 +363,7 @@ export const getCameraTagging = async ( req, res ) => {
       return res.sendError( 'no data found', 204 );
     }
     if ( camDetails ) {
-      query = { clientId: req.query.clientId, cameraId: camDetails._id, streamName: camDetails.streamName, storeId: req.query.storeId };
+      query = { clientId: req.query.clientId, cameraId: camDetails._id, streamName: camDetails.streamName, storeId: req.query.storeId, isDeleted: false };
       if ( req.query?.tagName != 'undefined' && req.query?.tagName != '' ) {
         query.tagName = req.query.tagName;
       }
@@ -425,7 +426,7 @@ async function getCamTaggingDetails( req, res ) {
     }
     let result = [];
     for ( let camera of camDetails ) {
-      let taggingDetails = await taggingService.find( { cameraId: camera._id, streamName: camera.streamName, storeId: req.body.storeId, clientId: camera.clientId } );
+      let taggingDetails = await taggingService.find( { cameraId: camera._id, streamName: camera.streamName, storeId: req.body.storeId, clientId: camera.clientId, isDeleted: false } );
       let zoneList = [];
       if ( taggingDetails.length ) {
         taggingDetails.forEach( ( zone ) => {