tango-app-api-store-zone 3.0.6-dev → 3.0.7-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-zone",
-    "version": "3.0.6-dev",
+    "version": "3.0.7-dev",
     "description": "zone",
     "main": "index.js",
     "type": "module",
@@ -22,7 +22,7 @@
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
         "tango-api-schema": "^2.0.99",
-        "tango-app-api-middleware": "^1.0.69-dev",
+        "tango-app-api-middleware": "^1.0.70-test",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/zoneTagging.controller.js

@@ -1,21 +1,34 @@
 import { logger } from 'tango-app-api-middleware';
 import * as cameraService from '../services/camera.service.js';
 import * as taggingService from '../services/tagging.service.js';
-import { appConfig, signedUrl, listFileByPath, fileUpload } from 'tango-app-api-middleware';
+import { appConfig, signedUrl, listFileByPath, fileUpload, insertOpenSearchData } from 'tango-app-api-middleware';
 import axios from 'axios';
 export const addCustomTag = async ( req, res ) => {
   try {
     let inputData = req.body;
-    let taggingDetails = await taggingService.findOne( { clientId: inputData.clientId, storeId: inputData.storeId, tagName: inputData.tagName } );
+    let taggingDetails = await taggingService.findOne( { clientId: inputData.clientId, storeId: inputData.storeId, tagName: inputData.tagName, isDeleted: false } );
     if ( !taggingDetails ) {
       let data = {
         clientId: inputData.clientId,
         storeId: inputData.storeId,
         tagName: inputData.tagName,
       };
+      await taggingService.deleteMany( { clientId: inputData.clientId, tagName: inputData.tagName, isDeleted: true } );
       await taggingService.create( data );
     }
     logger.info( 'Tag Created Successfully' );
+    const logObj = {
+      clientId: inputData.clientId,
+      storeId: inputData.storeId,
+      userName: req.user?.userName,
+      email: req.user?.email,
+      date: new Date(),
+      logType: 'add Zone',
+      logSubType: inputData.tagName,
+      changes: [ ],
+      eventType: 'add',
+    };
+    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
     return res.sendSuccess( 'Tag Created Successfully' );
   } catch ( e ) {
     logger.error( { error: 'e', function: 'addCustomTag' } );
@@ -29,6 +42,13 @@ export const customTagList = async ( req, res ) => {
     let defaultZone = [ 'Entry', 'Exit', 'Billing', 'Excluded Area' ];
     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 } );
+    deletedTag.forEach( ( item ) => {
+      let findTag = tagInfo.findIndex( ( tag ) => tag.tagName == 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 ) ) {
@@ -85,11 +105,35 @@ export const tagging = async ( req, res ) => {
     if ( !InputData?.coordinates?.length ) {
       return res.sendError( 'Tagging is Required', 400 );
     }
-    let taggingDetails = await taggingService.findOne( { clientId: InputData.clientId, storeId: InputData.storeId, cameraId: InputData.cameraId, tagName: InputData.tagName } );
+    let taggingDetails = await taggingService.findOne( { clientId: InputData.clientId, storeId: InputData.storeId, cameraId: InputData.cameraId, tagName: InputData.tagName, isDeleted: false } );
     if ( !taggingDetails ) {
+      const logObj = {
+        clientId: InputData.clientId,
+        storeId: InputData.storeId,
+        userName: req.user?.userName,
+        email: req.user?.email,
+        date: new Date(),
+        logType: 'add Zone Tagging',
+        logSubType: InputData.tagName,
+        changes: [ 'coordinates' ],
+        eventType: 'add Tagging',
+      };
+      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
       await taggingService.create( InputData );
       await taggingService.deleteOne( { clientId: InputData.clientId, storeId: InputData.storeId, cameraId: { $exists: false }, tagName: InputData.tagName } );
     } else {
+      const logObj = {
+        clientId: InputData.clientId,
+        storeId: InputData.storeId,
+        userName: req.user?.userName,
+        email: req.user?.email,
+        date: new Date(),
+        logType: 'add Zone Tagging',
+        logSubType: InputData.tagName,
+        changes: [ 'coordinates' ],
+        eventType: 'update Tagging',
+      };
+      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
       taggingDetails.cameraId = InputData.cameraId;
       taggingDetails.streamName = InputData.streamName;
       if ( req.body?.redoPoint ) {
@@ -207,15 +251,28 @@ export const getCameraList = async ( req, res ) => {
 
 export const updateTag = async ( req, res ) => {
   try {
-    let taggingDetails = await taggingService.findOne( { clientId: req.body.clientId } );
+    let taggingDetails = await taggingService.findOne( { clientId: req.body.clientId }, { storeId: 1 } );
     if ( !taggingDetails ) {
       return res.sendError( 'no data found', 204 );
     }
-    let tagUpdate = await taggingService.updateMany( { clientId: req.body.clientId, tagName: req.body.existTag }, { tagName: req.body.tagName } );
+    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 } );
     if ( tagUpdate.modifiedCount ) {
       logger.info( 'Custom Tag Updated Successfully' );
       return res.sendSuccess( 'Custom Tag Updated Successfully' );
     }
+    const logObj = {
+      clientId: req.body.clientId,
+      storeId: taggingDetails?.storeId,
+      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',
+    };
+    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
     logger.error( { error: 'something went wrong', function: 'updateTag' } );
     return res.sendError( 'something went wrong', 500 );
   } catch ( e ) {
@@ -226,16 +283,39 @@ 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 } );
+    let taggingDetails = await taggingService.find( { clientId: req.body.clientId, tagName: req.body.tagName, isDeleted: false }, { storeId: 1 } );
     if ( !taggingDetails.length ) {
       return res.sendError( 'no data found', 204 );
     }
-    // let cameraList = taggingDetails.map( ( item ) => item.cameraId );
-    // let tagList = taggingDetails.map( ( item ) => item._id );
-    // console.log( cameraList );
-    // console.log( tagList );
-    // await cameraService.updateMany( { _id: { $in: cameraList } }, { $pull: { tagging: { $in: tagList } } } );
-    await taggingService.deleteMany( { clientId: req.body.clientId, tagName: req.body.tagName } );
+    let enableDelete = false;
+    if ( req.user.permission ) {
+      let permissions = req.user.permission;
+      permissions.forEach( ( permission ) => {
+        if ( permission.featureName == 'analytics' ) {
+          let product = permission.product.find( ( item ) => item.name == 'tangoZone' );
+          if ( product ) {
+            enableDelete = product.isDelete;
+          }
+        }
+      } );
+    }
+    if ( req.user?.role == 'superadmin' || ( req.user?.role == 'admin' && enableDelete ) ) {
+      await taggingService.deleteMany( { clientId: req.body.clientId, tagName: req.body.tagName } );
+    } else {
+      await taggingService.updateOne( { clientId: req.body.clientId, storeId: req.body.storeId, tagName: req.body.tagName }, { isDeleted: true } );
+    }
+    const logObj = {
+      clientId: req.body?.clientId,
+      storeId: taggingDetails ? taggingDetails.map( ( item ) => item?.storeId ) : '',
+      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',
+    };
+    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
     await updatezoneTagging( req, res );
     // return res.sendSuccess( 'Tag Deleted Successfully' );
   } catch ( e ) {
@@ -382,23 +462,6 @@ export const updatezoneTagging = async ( req, res ) => {
   }
 };
 
-// export const updateCoordinates = async ( req, res ) => {
-//   try {
-//     let taggingDetails = await taggingService.findOne( { cameraId: req.body.cameraId, streamName: req.body.streamName, storeId: req.body.storeId, clientId: req.body.clientId, tagName: req.body.tagName } );
-//     if ( !taggingDetails ) {
-//       return res.sendError( 'no data found', 204 );
-//     }
-//     taggingDetails.coordinates = [];
-//     taggingDetails.save().then( () => {
-//       return res.sendSuccess( 'coordinates updated successfully' );
-//     } );
-//   } catch ( e ) {
-//     console.log( e, 'e' );
-//     logger.error( { error: e, function: 'updateCoordinates' } );
-//     return res.sendError( e, 500 );
-//   }
-// };
-
 export const updateOldData = async ( req, res ) => {
   try {
     let tagDetails = await taggingService.find( {}, { storeId: 1 } );
@@ -411,12 +474,23 @@ export const updateOldData = async ( req, res ) => {
         }
         const response = await axios.post( appConfig.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: appConfig.cloud.aws.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 == tagDetails.length-1 ) {
             return res.sendSuccess( 'Zone Updated Successfully' );
           }
         } else {
           logger.error( { message: 'no data', store: item.storeId } );
-          return res.sendError( 'something went wrong', 500 );
+          // return res.sendError( 'something went wrong', 500 );
         }
       }
     }

package/src/routes/zoneTagging.routes.js

@@ -1,22 +1,22 @@
 
 
 import express from 'express';
-import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
+import { isAllowedSessionHandler, validate, authorize } from 'tango-app-api-middleware';
 import * as validation from '../dtos/validation.dtos.js';
 import * as tagController from '../controllers/zoneTagging.controller.js';
 
 export const zoneTaggingRouter = express.Router();
 
-zoneTaggingRouter.post( '/addCustomTag', isAllowedSessionHandler, validate( validation.validateAddTagParams ), tagController.addCustomTag );
-zoneTaggingRouter.get( '/customTagList', isAllowedSessionHandler, validate( validation.validateTagParams ), tagController.customTagList );
-zoneTaggingRouter.post( '/tagging', isAllowedSessionHandler, validate( validation.validateTaggingParams ), tagController.tagging );
-zoneTaggingRouter.get( '/cameraList', isAllowedSessionHandler, validate( validation.validateTagParams ), tagController.getCameraList );
-zoneTaggingRouter.post( '/updateCustomTag', isAllowedSessionHandler, validate( validation.validateUpdateTagParams ), tagController.updateTag );
-zoneTaggingRouter.post( '/deleteCustomTag', isAllowedSessionHandler, validate( validation.validateDeleteTagParams ), tagController.deleteTag );
-zoneTaggingRouter.get( '/getCameraTagging', isAllowedSessionHandler, validate( validation.validateCameraTagParams ), tagController.getCameraTagging );
-zoneTaggingRouter.get( '/getZoneTagging', isAllowedSessionHandler, validate( validation.validateZonetagParams ), tagController.getZoneList );
-zoneTaggingRouter.post( '/updatezoneTagging', isAllowedSessionHandler, validate( validation.validateCamZonetagParams ), tagController.updatezoneTagging );
-// zoneTaggingRouter.post( '/updateCoordinates', isAllowedSessionHandler, validate( validation.updateCoordinatesParams ), tagController.updateCoordinates );
+zoneTaggingRouter.post( '/addCustomTag', isAllowedSessionHandler, authorize( { userType: [ 'tango', 'client' ], access: [ { featureName: 'analytics', name: 'tangoZone', permissions: [ 'isEdit' ] } ] } ), validate( validation.validateAddTagParams ), tagController.addCustomTag );
+zoneTaggingRouter.get( '/customTagList', isAllowedSessionHandler, authorize( { userType: [ 'tango', 'client' ], access: [ { featureName: 'analytics', name: 'tangoZone', permissions: [ 'isView' ] } ] } ), validate( validation.validateTagParams ), tagController.customTagList );
+zoneTaggingRouter.post( '/tagging', isAllowedSessionHandler, authorize( { userType: [ 'tango', 'client' ], access: [ { featureName: 'analytics', name: 'tangoZone', permissions: [ 'isEdit' ] } ] } ), validate( validation.validateTaggingParams ), tagController.tagging );
+zoneTaggingRouter.get( '/cameraList', isAllowedSessionHandler, authorize( { userType: [ 'tango', 'client' ], access: [ { featureName: 'analytics', name: 'tangoZone', permissions: [ 'isView' ] } ] } ), validate( validation.validateTagParams ), tagController.getCameraList );
+zoneTaggingRouter.post( '/updateCustomTag', isAllowedSessionHandler, authorize( { userType: [ 'tango', 'client' ], access: [ { featureName: 'analytics', name: 'tangoZone', permissions: [ 'isEdit' ] } ] } ), validate( validation.validateUpdateTagParams ), tagController.updateTag );
+zoneTaggingRouter.post( '/deleteCustomTag', isAllowedSessionHandler, authorize( { userType: [ 'tango', 'client' ], access: [ { featureName: 'analytics', name: 'tangoZone', permissions: [ 'isDelete' ] } ] } ), validate( validation.validateDeleteTagParams ), tagController.deleteTag );
+zoneTaggingRouter.get( '/getCameraTagging', isAllowedSessionHandler, authorize( { userType: [ 'tango', 'client' ], access: [ { featureName: 'analytics', name: 'tangoZone', permissions: [ 'isView' ] } ] } ), validate( validation.validateCameraTagParams ), tagController.getCameraTagging );
+zoneTaggingRouter.get( '/getZoneTagging', isAllowedSessionHandler, authorize( { userType: [ 'tango', 'client' ], access: [ { featureName: 'analytics', name: 'tangoZone', permissions: [ 'isView' ] } ] } ), validate( validation.validateZonetagParams ), tagController.getZoneList );
+zoneTaggingRouter.post( '/updatezoneTagging', isAllowedSessionHandler, authorize( { userType: [ 'tango', 'client' ], access: [ { featureName: 'analytics', name: 'tangoZone', permissions: [ 'isEdit' ] } ] } ), validate( validation.validateCamZonetagParams ), tagController.updatezoneTagging );
+
 zoneTaggingRouter.get( '/updateOldZone', tagController.updateOldData );