tango-app-api-store-zone 3.3.1-beta.14 → 3.3.1-beta.16

package/package.json

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

package/src/controllers/zoneTagging.controller.js

@@ -418,12 +418,12 @@ export const tagging = async ( req, res ) => {
           ...taggingDetails.toObject(),
         },
         oldData: {
-          tagName: taggingDetails.tagName,
-          streamName: taggingDetails.streamName,
+          TagName: taggingDetails.tagName,
+          StreamName: taggingDetails.streamName,
         },
         newData: {
-          tagName: taggingDetails.tagName,
-          streamName: taggingDetails.streamName,
+          TagName: taggingDetails.tagName,
+          StreamName: taggingDetails.streamName,
         },
         showTo: [ 'tango', 'client' ],
       };
@@ -639,7 +639,6 @@ export const getCameraListv2 = async ( req, res ) => {
           }
         } );
       }
-
       if ( tagFileList.data.length ) {
         tagFileList.data.forEach( ( item ) => {
           if ( item.Key.length > 1 ) {
@@ -734,10 +733,10 @@ export const updateTag = async ( req, res ) => {
         tagName: req.body.tagName,
       },
       oldData: {
-        tagName: req.body.existTag,
+        TagName: req.body.existTag,
       },
       newData: {
-        tagName: req.body.tagName,
+        TagName: req.body.tagName,
       },
       showTo: [ 'tango', 'client' ],
     };
@@ -764,18 +763,18 @@ export const deleteTag = async ( req, res ) => {
       return res.sendError( 'no data found', 204 );
     }
     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 ) ) {
+    // 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' ) ) {
       await taggingService.deleteMany( { clientId: req.body.clientId, tagName: req.body.tagName } );
       await externalService.deleteMany( { zoneName: req.body.tagName, clientId: req.body.clientId } );
     } else {
@@ -1058,3 +1057,81 @@ async function updateJsonFile( req, res ) {
     }
   }
 };
+
+export const getCameraStreamList = async ( req, res ) => {
+  try {
+    let cameraDetails = await cameraService.find( { clientId: req.body.clientId, storeId: req.body.storeId, streamName: req.body.streamName }, { cameraNumber: 1, streamName: 1, isActivated: 1, isUp: 1, cameraName: 1 } );
+    if ( !cameraDetails.length ) {
+      return res.sendError( 'no data found', 204 );
+    }
+    const folderPath = { file_path: `${req.body.storeId}/zone_base_images/`,
+      Bucket: JSON.parse( process.env.BUCKET ).zoneBaseImage, MaxKeys: 1000,
+    };
+    let fileList = await listFileByPath( folderPath );
+    const TaggedfolderPath = { file_path: `${req.body.storeId}/zone_tagged_image/`,
+      Bucket: JSON.parse( process.env.BUCKET ).zoneTaggingImage, MaxKeys: 1000,
+    };
+    let tagFileList = await listFileByPath( TaggedfolderPath );
+    for ( let [ index, camera ] of cameraDetails.entries() ) {
+      let tagList = [];
+      let tagPath;
+      let imgPath;
+      camera = {
+        ...camera._doc,
+        baseImg: '',
+        tagImg: '',
+      };
+      let taggingDetails = await taggingService.find( { cameraId: camera._id, streamName: camera.streamName, clientId: req.body.clientId, isDeleted: false }, { tagName: 1, coordinates: 1 } );
+      if ( taggingDetails.length ) {
+        tagList = taggingDetails.filter( ( item ) => item.coordinates.length ).map( ( item ) => {
+          if ( item.coordinates.length ) {
+            return { tagName: item.tagName, color: item.coordinates[0].color };
+          }
+        } );
+      }
+
+      if ( tagFileList.data.length ) {
+        tagFileList.data.forEach( ( item ) => {
+          if ( item.Key.length > 1 ) {
+            let splitStream = item.Key.split( '/' );
+            let getStream = splitStream[splitStream.length -1].split( '.' );
+
+            if ( getStream && getStream[0] == `${req.body.storeId}_${camera.streamName}` ) {
+              tagPath = item.Key;
+            }
+          }
+        } );
+      }
+      if ( fileList?.data.length ) {
+        fileList.data.forEach( ( ele ) => {
+          let splitStream = ele.Key.split( '/' );
+          let getStream = splitStream[splitStream.length -1].split( '.' );
+          if ( getStream && getStream[0] == `${req.body.storeId}_${camera.streamName}` ) {
+            imgPath = ele.Key;
+          }
+        } );
+      }
+      if ( tagPath ) {
+        const params = { file_path: tagPath,
+          Bucket: JSON.parse( process.env.BUCKET ).zoneTaggingImage,
+        };
+        const cameraTagImage = await signedUrl( params );
+        camera.tagImg = cameraTagImage;
+      }
+      if ( imgPath ) {
+        const baseParams = { file_path: imgPath,
+          Bucket: JSON.parse( process.env.BUCKET ).zoneBaseImage,
+        };
+        const cameraBaseImage = await signedUrl( baseParams );
+        camera.baseImg = cameraBaseImage;
+      }
+      camera.tagging = tagList;
+      cameraDetails[index] = camera;
+    }
+    cameraDetails.sort( ( a, b ) => a.tagging?.length > b.tagging?.length ? -1 : 1 );
+    return res.sendSuccess( cameraDetails );
+  } catch ( e ) {
+    logger.error( { error: e, function: 'getCameraList' } );
+    return res.sendError( e, 500 );
+  }
+};

package/src/dtos/validation.dtos.js

@@ -101,3 +101,13 @@ export const updateCoordinatesSchema= joi.object( {
 export const updateCoordinatesParams = {
   body: updateCoordinatesSchema,
 };
+
+export const getStreamSchema= joi.object( {
+  storeId: joi.string().required(),
+  clientId: joi.string().required(),
+  streamName: joi.string().required(),
+} );
+
+export const getStreamParams = {
+  body: getStreamSchema,
+};

package/src/routes/zoneTagging.routes.js

@@ -19,6 +19,7 @@ zoneTaggingRouter.get( '/getCameraTagging', isAllowedSessionHandler, accessVerif
 zoneTaggingRouter.get( '/getZoneTagging', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoEye', name: 'ZoneTag', permissions: [ ] } ] } ), validate( validation.validateZonetagParams ), tagController.getZoneList );
 zoneTaggingRouter.post( '/updatezoneTagging', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoEye', name: 'ZoneTag', permissions: [ 'isEdit' ] } ] } ), validate( validation.validateCamZonetagParams ), tagController.updatezoneTagging );
 zoneTaggingRouter.post( '/deleteZoneTag', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoEye', name: 'ZoneTag', permissions: [ 'isEdit' ] } ] } ), validate( validation.updateCoordinatesParams ), tagController.deletezoneTagging );
+zoneTaggingRouter.post( '/getStreamDetails', isAllowedSessionHandler, validate( validation.getStreamParams ), tagController.getCameraStreamList );
 zoneTaggingRouter.post( '/updateCamera', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoEye', name: 'ZoneTag', permissions: [ 'isEdit' ] } ] } ), tagController.updateCamera );
 
 zoneTaggingRouter.get( '/updateOldZone', tagController.updateOldData );