tango-app-api-store-zone 3.3.1-beta.11 → 3.3.1-beta.13

package/package.json

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

package/src/controllers/zoneTagging.controller.js

@@ -264,6 +264,7 @@ export const customTagListv2 = async ( req, res ) => {
       let Query = [ {
         $match: {
           client_id: req.query.clientId,
+          publish: true,
           checkListType: { $ne: 'custom' },
         },
       }, {
@@ -592,17 +593,17 @@ export const getCameraList = async ( req, res ) => {
 };
 export const getCameraListv2 = async ( req, res ) => {
   try {
-    let cameraDetails = await cameraService.find( { clientId: req.query.clientId, storeId: req.query.storeId, isActivated: true, isUp: true }, { cameraNumber: 1, streamName: 1, isActivated: 1, isUp: 1, cameraName: 1, taggedChecklist: 1 } );
+    let cameraDetails = await cameraService.find( { clientId: req.body.clientId, storeId: req.body.storeId, isActivated: true, isUp: true }, { cameraNumber: 1, streamName: 1, isActivated: 1, isUp: 1, cameraName: 1, taggedChecklist: 1 } );
     if ( !cameraDetails.length ) {
       return res.sendError( 'no data found', 204 );
     }
     const folderPath = {
-      file_path: `${req.query.storeId}/zone_base_images/`,
+      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.query.storeId}/zone_tagged_image/`,
+      file_path: `${req.body.storeId}/zone_tagged_image/`,
       Bucket: JSON.parse( process.env.BUCKET ).zoneTaggingImage, MaxKeys: 1000,
     };
     let tagFileList = await listFileByPath( TaggedfolderPath );
@@ -615,7 +616,7 @@ export const getCameraListv2 = async ( req, res ) => {
         baseImg: '',
         tagImg: '',
       };
-      let taggingDetails = await taggingService.find( { cameraId: camera._id, streamName: camera.streamName, clientId: req.query.clientId, isDeleted: false }, { tagName: 1, coordinates: 1 } );
+      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 ) {
@@ -630,7 +631,7 @@ export const getCameraListv2 = async ( req, res ) => {
             let splitStream = item.Key.split( '/' );
             let getStream = splitStream[splitStream.length - 1].split( '.' );
 
-            if ( getStream && getStream[0] == `${req.query.storeId}_${camera.streamName}` ) {
+            if ( getStream && getStream[0] == `${req.body.storeId}_${camera.streamName}` ) {
               tagPath = item.Key;
             }
           }
@@ -640,7 +641,7 @@ export const getCameraListv2 = async ( req, res ) => {
         fileList.data.forEach( ( ele ) => {
           let splitStream = ele.Key.split( '/' );
           let getStream = splitStream[splitStream.length - 1].split( '.' );
-          if ( getStream && getStream[0] == `${req.query.storeId}_${camera.streamName}` ) {
+          if ( getStream && getStream[0] == `${req.body.storeId}_${camera.streamName}` ) {
             imgPath = ele.Key;
           }
         } );
@@ -662,6 +663,7 @@ export const getCameraListv2 = async ( req, res ) => {
         camera.baseImg = cameraBaseImage;
       }
       camera.tagging = tagList;
+      camera.taggedCount = tagList.filter( ( ele ) => ele.tagName===req.body.tagName );
       cameraDetails[index] = camera;
     }
     cameraDetails.sort( ( a, b ) => a.tagging?.length > b.tagging?.length ? -1 : 1 );

package/src/dtos/validation.dtos.js

@@ -16,10 +16,11 @@ export const validateAddTagParams = {
 export const tagSchema = joi.object( {
   clientId: joi.string().required(),
   storeId: joi.string().required(),
+  tagName: joi.string().optional(),
 } );
 
 export const validateTagParams = {
-  query: tagSchema,
+  body: tagSchema,
 };
 
 export const validateUpdateTagSchema = joi.object( {

package/src/routes/zoneTagging.routes.js

@@ -12,7 +12,7 @@ zoneTaggingRouter.get( '/customTagList', isAllowedSessionHandler, accessVerifica
 zoneTaggingRouter.get( '/customTagListv2', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoEye', name: 'ZoneTag', permissions: [ ] } ] } ), tagController.customTagListv2 );
 zoneTaggingRouter.post( '/tagging', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoEye', name: 'ZoneTag', permissions: [ 'isEdit' ] } ] } ), validate( validation.validateTaggingParams ), tagController.tagging );
 zoneTaggingRouter.get( '/cameraList', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoEye', name: 'ZoneTag', permissions: [ ] } ] } ), validate( validation.validateTagParams ), tagController.getCameraList );
-zoneTaggingRouter.get( '/cameraListv2', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoEye', name: 'ZoneTag', permissions: [ ] } ] } ), validate( validation.validateTagParams ), tagController.getCameraListv2 );
+zoneTaggingRouter.post( '/cameraListv2', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoEye', name: 'ZoneTag', permissions: [ ] } ] } ), validate( validation.validateTagParams ), tagController.getCameraListv2 );
 zoneTaggingRouter.post( '/updateCustomTag', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoEye', name: 'ZoneTag', permissions: [ 'isEdit' ] } ] } ), validate( validation.validateUpdateTagParams ), tagController.updateTag );
 zoneTaggingRouter.post( '/deleteCustomTag', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoEye', name: 'ZoneTag', permissions: [ 'isEdit' ] } ] } ), validate( validation.validateDeleteTagParams ), tagController.deleteTag );
 zoneTaggingRouter.get( '/getCameraTagging', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoEye', name: 'ZoneTag', permissions: [ ] } ] } ), validate( validation.validateCameraTagParams ), tagController.getCameraTagging );