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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-zone",
-    "version": "3.0.4-dev",
+    "version": "3.0.6-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.64-dev",
+        "tango-app-api-middleware": "^1.0.69-dev",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/zoneTagging.controller.js

@@ -1,7 +1,7 @@
 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 } from 'tango-app-api-middleware';
+import { appConfig, signedUrl, listFileByPath, fileUpload } from 'tango-app-api-middleware';
 import axios from 'axios';
 export const addCustomTag = async ( req, res ) => {
   try {
@@ -92,9 +92,19 @@ export const tagging = async ( req, res ) => {
     } else {
       taggingDetails.cameraId = InputData.cameraId;
       taggingDetails.streamName = InputData.streamName;
-      taggingDetails.coordinates.push( InputData.coordinates[0] );
-      taggingDetails.save();
+      if ( req.body?.redoPoint ) {
+        taggingDetails.coordinates = InputData.coordinates[0];
+        taggingDetails.save();
+      } else {
+        if ( InputData.coordinates[0].coor.length ) {
+          taggingDetails.coordinates.push( InputData.coordinates[0] );
+          taggingDetails.save();
+        } else {
+          return res.sendError( 'coordinate is required', 500 );
+        }
+      }
     }
+    await updatezoneTagging( req, res );
     // if ( data?._id ) {
     //   let camDetails = await cameraService.findOne( { _id: InputData.cameraId } );
     //   if ( camDetails ) {
@@ -111,7 +121,7 @@ export const tagging = async ( req, res ) => {
     //     camDetails.save();
     //   }
     // }
-    return res.sendSuccess( 'Tagging Created Successfully' );
+    // return res.sendSuccess( 'Tagging Created Successfully' );
   } catch ( e ) {
     logger.error( { error: e, function: 'tagging' } );
     return res.sendError( e, 500 );
@@ -129,7 +139,7 @@ export const getCameraList = async ( req, res ) => {
     };
     let fileList = await listFileByPath( folderPath );
     const TaggedfolderPath = { file_path: `${req.query.storeId}/zone_tagged_image/`,
-      Bucket: appConfig.cloud.aws.bucket.zoneBaseImage, MaxKeys: 1000,
+      Bucket: appConfig.cloud.aws.bucket.zoneTaggingImage, MaxKeys: 1000,
     };
     let tagFileList = await listFileByPath( TaggedfolderPath );
     for ( let [ index, camera ] of cameraDetails.entries() ) {
@@ -141,10 +151,12 @@ export const getCameraList = async ( req, res ) => {
         baseImg: '',
         tagImg: '',
       };
-      let taggingDetails = await taggingService.find( { cameraId: camera._id, streamName: camera.streamName }, { tagName: 1, coordinates: 1 } );
+      let taggingDetails = await taggingService.find( { cameraId: camera._id, streamName: camera.streamName, clientId: req.query.clientId }, { tagName: 1, coordinates: 1 } );
       if ( taggingDetails.length ) {
         tagList = taggingDetails.map( ( item ) => {
-          return { tagName: item.tagName, color: item.coordinates[0].color };
+          if ( item.coordinates.length ) {
+            return { tagName: item.tagName, color: item.coordinates[0].color };
+          }
         } );
       }
 
@@ -171,7 +183,7 @@ export const getCameraList = async ( req, res ) => {
       }
       if ( tagPath ) {
         const params = { file_path: tagPath,
-          Bucket: appConfig.cloud.aws.bucket.zoneBaseImage,
+          Bucket: appConfig.cloud.aws.bucket.zoneTaggingImage,
         };
         const cameraTagImage = await signedUrl( params );
         camera.tagImg = cameraTagImage;
@@ -224,7 +236,8 @@ export const deleteTag = async ( req, res ) => {
     // console.log( tagList );
     // await cameraService.updateMany( { _id: { $in: cameraList } }, { $pull: { tagging: { $in: tagList } } } );
     await taggingService.deleteMany( { clientId: req.body.clientId, tagName: req.body.tagName } );
-    return res.sendSuccess( 'Tag Deleted Successfully' );
+    await updatezoneTagging( req, res );
+    // return res.sendSuccess( 'Tag Deleted Successfully' );
   } catch ( e ) {
     logger.error( { error: e, function: 'deleteTag' } );
     return res.sendError( e, 500 );
@@ -240,11 +253,13 @@ export const getCameraTagging = async ( req, res ) => {
       return res.sendError( 'no data found', 204 );
     }
     if ( camDetails ) {
-      if ( req.query?.tagName != 'undefined' ) {
-        query = { tagName: req.query.tagName, storeId: req.query.storeId, cameraId: camDetails._id, streamName: camDetails.streamName };
-      } else {
-        query = { 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 };
+      if ( req.query?.tagName != 'undefined' && req.query?.tagName != '' ) {
+        query.tagName = req.query.tagName;
       }
+      // else {
+      //   query = { clientId: req.query.clientId, cameraId: camDetails._id, streamName: camDetails.streamName, storeId: req.query.storeId };
+      // }
       let taggingDetails = await taggingService.find( query );
       if ( taggingDetails.length ) {
         let coordinates = [];
@@ -301,7 +316,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 } );
+      let taggingDetails = await taggingService.find( { cameraId: camera._id, streamName: camera.streamName, storeId: req.body.storeId, clientId: camera.clientId } );
       let zoneList = [];
       if ( taggingDetails.length ) {
         taggingDetails.forEach( ( zone ) => {
@@ -318,13 +333,16 @@ async function getCamTaggingDetails( req, res ) {
             coordinates: zone.coordinates,
           } );
         } );
-        result.push( {
-          stream_id: camera.streamName,
-          zones: zoneList,
-          totalZone: zoneList.length,
-          storeId: req.body.storeId,
-        } );
+      } else {
+        zoneList = [];
       }
+      result.push( {
+        stream_id: camera.streamName,
+        zones: zoneList,
+        // totalZone: zoneList.length,
+        storeId: req.body.storeId,
+        bucketName: appConfig.cloud.aws.bucket.zoneTaggingImage,
+      } );
     }
 
     return result;
@@ -342,7 +360,19 @@ export const updatezoneTagging = async ( req, res ) => {
     }
     const response = await axios.post( appConfig.url.zoneTaggingLamdaUrl, camDetails );
     if ( response?.data?.status && response?.data?.status == 'success' ) {
-      return res.sendSuccess( 'Zone Updated Successfully' );
+      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 ) {
+        return res.sendSuccess( 'Zone Updated Successfully' );
+      } else {
+        return res.sendError( 'something went wrong', 500 );
+      }
     } else {
       return res.sendError( 'Something went wrong', 500 );
     }
@@ -351,3 +381,47 @@ export const updatezoneTagging = async ( req, res ) => {
     return res.sendError( e, 500 );
   }
 };
+
+// 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 } );
+    if ( tagDetails.length ) {
+      for ( let [ index, item ] of tagDetails.entries() ) {
+        req.body.storeId = item.storeId;
+        let camDetails = await getCamTaggingDetails( req, res );
+        if ( !camDetails ) {
+          logger.error( { message: 'no data', store: item.storeId } );
+        }
+        const response = await axios.post( appConfig.url.zoneTaggingLamdaUrl, camDetails );
+        if ( response?.data?.status && response?.data?.status == 'success' ) {
+          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 );
+        }
+      }
+    }
+  } catch ( e ) {
+    logger.error( { error: e, function: 'updateOldData' } );
+    return res.sendError( e, 500 );
+  }
+};

package/src/dtos/validation.dtos.js

@@ -48,6 +48,7 @@ export const validateTaggingSchema = joi.object( {
   tagName: joi.string().required(),
   coordinates: joi.array().required(),
   streamName: joi.string().required(),
+  redoPoint: joi.boolean().optional(),
 } );
 
 export const validateTaggingParams = {
@@ -55,8 +56,9 @@ export const validateTaggingParams = {
 };
 
 export const validateCameraTagSchema = joi.object( {
+  clientId: joi.string().required(),
   cameraId: joi.string().required(),
-  tagName: joi.string().optional().empty(),
+  tagName: joi.string().optional().allow( '' ),
   storeId: joi.string().required(),
 } );
 
@@ -66,7 +68,7 @@ export const validateCameraTagParams = {
 
 export const validateZonetagSchema = joi.object( {
   tagName: joi.string().required(),
-  storeId: joi.string().optional().empty(),
+  storeId: joi.string().optional().allow( '' ),
 } );
 
 export const validateZonetagParams = {
@@ -80,3 +82,15 @@ export const validateCamZonetagSchema= joi.object( {
 export const validateCamZonetagParams = {
   body: validateCamZonetagSchema,
 };
+
+export const updateCoordinatesSchema= joi.object( {
+  storeId: joi.string().required(),
+  cameraId: joi.string().required(),
+  clientId: joi.string().required(),
+  streamName: joi.string().required(),
+  tagName: joi.string().required(),
+} );
+
+export const updateCoordinatesParams = {
+  body: updateCoordinatesSchema,
+};

package/src/routes/zoneTagging.routes.js

@@ -16,5 +16,7 @@ zoneTaggingRouter.post( '/deleteCustomTag', isAllowedSessionHandler, validate( v
 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.get( '/updateOldZone', tagController.updateOldData );