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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-zone",
-    "version": "3.0.10-dev",
+    "version": "3.0.12-dev",
     "description": "zone",
     "main": "index.js",
     "type": "module",
@@ -21,8 +21,8 @@
         "mongodb": "^6.5.0",
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.0.102",
-        "tango-app-api-middleware": "^1.0.71-test",
+        "tango-api-schema": "^2.0.104",
+        "tango-app-api-middleware": "^1.0.73-test",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

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' );
@@ -23,12 +23,13 @@ export const addCustomTag = async ( req, res ) => {
       userName: req.user?.userName,
       email: req.user?.email,
       date: new Date(),
-      logType: 'add Zone',
-      logSubType: inputData.tagName,
-      changes: [ ],
-      eventType: 'add',
+      logType: 'zone',
+      logSubType: 'addCustomTag',
+      changes: [ `${inputData.tagName} customtag Created.` ],
+      eventType: '',
+      showTo: [ 'client', 'tango' ],
     };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
     return res.sendSuccess( 'Tag Created Successfully' );
   } catch ( e ) {
     logger.error( { error: 'e', function: 'addCustomTag' } );
@@ -43,16 +44,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 );
         }
       } );
     }
@@ -113,12 +115,13 @@ export const tagging = async ( req, res ) => {
         userName: req.user?.userName,
         email: req.user?.email,
         date: new Date(),
-        logType: 'add Zone Tagging',
-        logSubType: InputData.tagName,
-        changes: [ 'coordinates' ],
-        eventType: 'add Tagging',
+        logType: 'zone',
+        logSubType: 'addZoneTagging',
+        changes: [ `${InputData.tagName} zone added tagging` ],
+        eventType: '',
+        showTo: [ 'client', 'tango' ],
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       let response = await taggingService.create( InputData );
       await taggingService.deleteOne( { clientId: InputData.clientId, storeId: InputData.storeId, cameraId: { $exists: false }, tagName: InputData.tagName } );
       await axios.post( `${appConfig.url.oldapidomain}/tagging/oldTaggingAdd`, [ response ], { headers: { Authorization: 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66' } } ).then( ( res ) => logger.info( res?.data ) ).catch( ( error ) => logger.error( { error: error } ) );
@@ -129,12 +132,12 @@ export const tagging = async ( req, res ) => {
         userName: req.user?.userName,
         email: req.user?.email,
         date: new Date(),
-        logType: 'add Zone Tagging',
-        logSubType: InputData.tagName,
-        changes: [ 'coordinates' ],
-        eventType: 'update Tagging',
+        logType: 'zone',
+        logSubType: 'updateZoneTagging',
+        changes: [ `${InputData.tagName} zone Updated tagging` ],
+        eventType: '',
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       taggingDetails.cameraId = InputData.cameraId;
       taggingDetails.streamName = InputData.streamName;
       if ( req.body?.redoPoint ) {
@@ -201,7 +204,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 +264,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' );
@@ -280,12 +283,13 @@ export const updateTag = async ( req, res ) => {
       userName: req.user?.userName,
       email: req.user?.email,
       date: new Date(),
-      logType: 'add Zone Tagging',
-      logSubType: req.body.existTag,
-      changes: [ 'tagName' ],
-      eventType: 'update Custom Tag Name',
+      logType: 'zone',
+      logSubType: 'updateCustomTag',
+      changes: [ `${req.body.tagName} tagName Updated` ],
+      eventType: '',
+      showTo: [ 'client', 'tango' ],
     };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
     logger.error( { error: 'something went wrong', function: 'updateTag' } );
     return res.sendError( 'something went wrong', 500 );
   } catch ( e ) {
@@ -296,7 +300,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 );
     }
@@ -339,12 +343,13 @@ export const deleteTag = async ( req, res ) => {
       userName: req.user?.userName,
       email: req.user?.email,
       date: new Date(),
-      logType: 'add Zone Tagging',
-      logSubType: req.body?.tagName,
-      changes: [ 'tagName' ],
-      eventType: 'Delete Tagging Name',
+      logType: 'zone',
+      logSubType: 'deleteTag',
+      changes: [ `${req.body.tagName} tag Deleted` ],
+      eventType: '',
+      showTo: [ 'client', 'tango' ],
     };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
     await updatezoneTagging( req, res );
     // return res.sendSuccess( 'Tag Deleted Successfully' );
   } catch ( e ) {
@@ -362,7 +367,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;
       }
@@ -421,11 +426,11 @@ async function getCamTaggingDetails( req, res ) {
   try {
     let camDetails = await cameraService.find( { storeId: req.body.storeId, isActivated: true, isUp: true } );
     if ( !camDetails.length ) {
-      return res.sendError( 'no data found', 204 );
+      return false;
     }
     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 ) => {
@@ -514,8 +519,8 @@ export const updateOldData = async ( req, res ) => {
           if ( !upload.Key ) {
             logger.error( { message: `JSON Upload Error`, store: item.storeId } );
           }
-          if ( index == tagDetails.length-1 ) {
-            return res.sendSuccess( 'Zone Updated Successfully' );
+          if ( index == 0 ) {
+            res.sendSuccess( 'Zone Updated Successfully' );
           }
         } else {
           logger.error( { message: 'no data', store: item.storeId } );