tango-app-api-store-zone 3.1.6 → 3.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-zone",
-    "version": "3.1.6",
+    "version": "3.1.7",
     "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.104",
-        "tango-app-api-middleware": "^3.1.11",
+        "tango-api-schema": "^2.0.115",
+        "tango-app-api-middleware": "^3.1.19",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/zoneTagging.controller.js

@@ -1,7 +1,9 @@
 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, insertOpenSearchData } from 'tango-app-api-middleware';
+import * as storeService from '../services/store.service.js';
+import * as clientService from '../services/client.service.js';
+import { signedUrl, listFileByPath, fileUpload, insertOpenSearchData } from 'tango-app-api-middleware';
 import axios from 'axios';
 export const addCustomTag = async ( req, res ) => {
   try {
@@ -29,7 +31,7 @@ export const addCustomTag = async ( req, res ) => {
       eventType: '',
       showTo: [ 'client', 'tango' ],
     };
-    insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    insertOpenSearchData( JSON.parse( process.env.OPENSEARCH )?.activityLog, logObj );
     return res.sendSuccess( 'Tag Created Successfully' );
   } catch ( e ) {
     logger.error( { error: 'e', function: 'addCustomTag' } );
@@ -39,9 +41,18 @@ export const addCustomTag = async ( req, res ) => {
 
 export const customTagList = async ( req, res ) => {
   try {
-    let customTagList = [];
-    let defaultZone = [ 'Entry', 'Exit', 'Billing', 'Excluded Area' ];
-    customTagList.push( ...defaultZone );
+    let customTagList = [ 'Front', 'Back' ];
+    let storeDetails = await storeService.findOne( { storeId: req.query.storeId }, { product: 1 } );
+    let clientDetails = await clientService.findOne( { clientId: req.query.clientId }, { featureConfigs: 1 } );
+    if ( clientDetails && clientDetails?.featureConfigs?.isExcludedArea ) {
+      customTagList.push( 'Excluded Area' );
+    }
+    if ( clientDetails && clientDetails?.featureConfigs?.isPasserByData ) {
+      customTagList.push( 'Passer By' );
+    }
+    if ( storeDetails && storeDetails?.product.includes( 'tangoZone' ) ) {
+      customTagList = customTagList.concat( [ 'Entry/Exit', 'Billing' ] );
+    }
     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 ) ) ];
@@ -53,7 +64,7 @@ export const customTagList = async ( req, res ) => {
     } );
     if ( tagInfo.length ) {
       tagInfo.forEach( ( item ) => {
-        if ( !customTagList.includes( item ) ) {
+        if ( !customTagList.includes( item ) && ![ 'Excluded Area', 'Passer By', 'Entry/Exit', 'Billing' ].includes( item ) ) {
           customTagList.push( item );
         }
       } );
@@ -94,6 +105,7 @@ export const customTagList = async ( req, res ) => {
       }
       return { tagName: item, count: count };
     } );
+    customTagList.sort( ( a, b ) => a.count > b.count ? -1 : 1 );
     return res.sendSuccess( customTagList );
   } catch ( e ) {
     logger.error( { error: e, function: 'customTagList' } );
@@ -121,10 +133,10 @@ export const tagging = async ( req, res ) => {
         eventType: '',
         showTo: [ 'client', 'tango' ],
       };
-      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+      insertOpenSearchData( JSON.parse( process.env.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 } ) );
+      await axios.post( `${JSON.parse( process.env.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 } ) );
     } else {
       const logObj = {
         clientId: InputData.clientId,
@@ -137,17 +149,21 @@ export const tagging = async ( req, res ) => {
         changes: [ `${InputData.tagName} zone Updated tagging` ],
         eventType: '',
       };
-      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+      insertOpenSearchData( JSON.parse( process.env.OPENSEARCH )?.activityLog, logObj );
       taggingDetails.cameraId = InputData.cameraId;
       taggingDetails.streamName = InputData.streamName;
-      if ( req.body?.redoPoint ) {
-        taggingDetails.coordinates = InputData.coordinates[0];
+      // if ( req.body?.redoPoint ) {
+      //   taggingDetails.coordinates = InputData.coordinates[0];
+      //   taggingDetails.save();
+      // }
+      if ( req.body?.redraw || req.body?.redoPoint ) {
+        taggingDetails.coordinates = InputData.coordinates;
         taggingDetails.save();
       } else {
         if ( InputData.coordinates[0].coor.length ) {
           taggingDetails.coordinates.push( InputData.coordinates[0] );
           taggingDetails.save();
-          await axios.post( `${appConfig.url.oldapidomain}/tagging/oldTaggingUpdate/${taggingDetails._id}`, taggingDetails, { headers: { Authorization: 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66' } } ).then( ( res ) => {
+          await axios.post( `${JSON.parse( process.env.URL ).oldapidomain}/tagging/oldTaggingUpdate/${taggingDetails._id}`, taggingDetails, { headers: { Authorization: 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66' } } ).then( ( res ) => {
             logger.info( res?.data );
           } ).catch( ( error ) => {
             logger.error( { error: error } );
@@ -158,23 +174,6 @@ export const tagging = async ( req, res ) => {
       }
     }
     await updatezoneTagging( req, res );
-    // if ( data?._id ) {
-    //   let camDetails = await cameraService.findOne( { _id: InputData.cameraId } );
-    //   if ( camDetails ) {
-    //     if ( camDetails?.tagging ) {
-    //       if ( !camDetails.tagging.includes( data._id ) ) {
-    //         camDetails.tagging.push( data._id );
-    //       }
-    //     } else {
-    //       camDetails = {
-    //         ...camDetails,
-    //         tagging: [ data._id ],
-    //       };
-    //     }
-    //     camDetails.save();
-    //   }
-    // }
-    // return res.sendSuccess( 'Tagging Created Successfully' );
   } catch ( e ) {
     logger.error( { error: e, function: 'tagging' } );
     return res.sendError( e, 500 );
@@ -183,16 +182,16 @@ export const tagging = async ( req, res ) => {
 
 export const getCameraList = 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 } );
+    let cameraDetails = await cameraService.find( { clientId: req.query.clientId, storeId: req.query.storeId }, { cameraNumber: 1, streamName: 1, isActivated: 1, isUp: 1 } );
     if ( !cameraDetails.length ) {
       return res.sendError( 'no data found', 204 );
     }
     const folderPath = { file_path: `${req.query.storeId}/zone_base_images/`,
-      Bucket: appConfig.cloud.aws.bucket.zoneBaseImage, MaxKeys: 1000,
+      Bucket: JSON.parse( process.env.BUCKET ).zoneBaseImage, MaxKeys: 1000,
     };
     let fileList = await listFileByPath( folderPath );
     const TaggedfolderPath = { file_path: `${req.query.storeId}/zone_tagged_image/`,
-      Bucket: appConfig.cloud.aws.bucket.zoneTaggingImage, MaxKeys: 1000,
+      Bucket: JSON.parse( process.env.BUCKET ).zoneTaggingImage, MaxKeys: 1000,
     };
     let tagFileList = await listFileByPath( TaggedfolderPath );
     for ( let [ index, camera ] of cameraDetails.entries() ) {
@@ -236,14 +235,14 @@ export const getCameraList = async ( req, res ) => {
       }
       if ( tagPath ) {
         const params = { file_path: tagPath,
-          Bucket: appConfig.cloud.aws.bucket.zoneTaggingImage,
+          Bucket: JSON.parse( process.env.BUCKET ).zoneTaggingImage,
         };
         const cameraTagImage = await signedUrl( params );
         camera.tagImg = cameraTagImage;
       }
       if ( imgPath ) {
         const baseParams = { file_path: imgPath,
-          Bucket: appConfig.cloud.aws.bucket.zoneBaseImage,
+          Bucket: JSON.parse( process.env.BUCKET ).zoneBaseImage,
         };
         const cameraBaseImage = await signedUrl( baseParams );
         camera.baseImg = cameraBaseImage;
@@ -265,13 +264,22 @@ export const updateTag = async ( req, res ) => {
       return res.sendError( 'no data found', 204 );
     }
     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' );
+    let taggingCoordinates = await taggingService.find( { clientId: req.body.clientId, tagName: req.body.tagName } );
+    if ( taggingCoordinates.length ) {
+      for ( let [ index, item ] of taggingCoordinates.entries() ) {
+        for ( let [ coIndex ] of item.coordinates.entries() ) {
+          taggingCoordinates[index].coordinates[coIndex].zoneName = req.body.tagName;
+        }
+        await taggingService.updateOne( { _id: item._id }, { $set: taggingCoordinates[index] } );
+      }
+      taggingCoordinates.forEach( ( item ) => {
+        item.coordinates.forEach( ( coor ) => {
+          coor.zoneName = req.body.tagName;
+        } );
+      } );
     }
-    taggingDetails.forEach( async ( item ) => {
-      await axios.post( `${appConfig.url.oldapidomain}/tagging/oldTaggingUpdate/${item._id}`, item, { headers: { Authorization: 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66' } } ).then( ( res ) => {
+    taggingCoordinates.forEach( async ( item ) => {
+      await axios.post( `${JSON.parse( process.env.URL ).oldapidomain}/tagging/oldTaggingUpdate/${item._id}`, item, { headers: { Authorization: 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66' } } ).then( ( res ) => {
         logger.info( res?.data );
       } ).catch( ( error ) => {
         logger.error( { error: error } );
@@ -289,7 +297,11 @@ export const updateTag = async ( req, res ) => {
       eventType: '',
       showTo: [ 'client', 'tango' ],
     };
-    insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    insertOpenSearchData( JSON.parse( process.env.OPENSEARCH )?.activityLog, logObj );
+    if ( tagUpdate.modifiedCount || tagUpdate.matchedCount ) {
+      logger.info( 'Custom Tag Updated Successfully' );
+      return res.sendSuccess( 'Custom Tag Updated Successfully' );
+    }
     logger.error( { error: 'something went wrong', function: 'updateTag' } );
     return res.sendError( 'something went wrong', 500 );
   } catch ( e ) {
@@ -331,7 +343,7 @@ export const deleteTag = async ( req, res ) => {
       }
     }
     taggingDetails.forEach( async ( item ) => {
-      await axios.post( `${appConfig.url.oldapidomain}/tagging/oldTaggingDelete/${item._id}`, '', { headers: { Authorization: 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66' } } ).then( ( res ) => {
+      await axios.post( `${JSON.parse( process.env.URL ).oldapidomain}/tagging/oldTaggingDelete/${item._id}`, '', { headers: { Authorization: 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66' } } ).then( ( res ) => {
         logger.info( res?.data );
       } ).catch( ( error ) => {
         logger.error( { error: error } );
@@ -349,7 +361,7 @@ export const deleteTag = async ( req, res ) => {
       eventType: '',
       showTo: [ 'client', 'tango' ],
     };
-    insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    insertOpenSearchData( JSON.parse( process.env.OPENSEARCH )?.activityLog, logObj );
     await updatezoneTagging( req, res );
     // return res.sendSuccess( 'Tag Deleted Successfully' );
   } catch ( e ) {
@@ -455,7 +467,7 @@ async function getCamTaggingDetails( req, res ) {
         zones: zoneList,
         // totalZone: zoneList.length,
         storeId: req.body.storeId,
-        bucketName: appConfig.cloud.aws.bucket.zoneTaggingImage,
+        bucketName: JSON.parse( process.env.BUCKET ).zoneTaggingImage,
       } );
     }
 
@@ -469,15 +481,15 @@ async function getCamTaggingDetails( req, res ) {
 export const updatezoneTagging = async ( req, res ) => {
   try {
     let camDetails = await getCamTaggingDetails( req, res );
-    if ( !camDetails ) {
+    if ( !camDetails.length ) {
       return res.sendError( 'Something Went Wrong', 500 );
     }
-    const response = await axios.post( appConfig.url.zoneTaggingLamdaUrl, camDetails );
+    const response = await axios.post( JSON.parse( process.env.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,
+        Bucket: JSON.parse( process.env.BUCKET ).zoneTaggingImage,
         body: JSON.stringify( camDetails ),
         ContentType: 'application/json',
       };
@@ -506,12 +518,12 @@ export const updateOldData = async ( req, res ) => {
         if ( !camDetails ) {
           logger.error( { message: 'no data', store: item.storeId } );
         }
-        const response = await axios.post( appConfig.url.zoneTaggingLamdaUrl, camDetails );
+        const response = await axios.post( JSON.parse( process.env.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,
+            Bucket: JSON.parse( process.env.BUCKET ).zoneTaggingImage,
             body: JSON.stringify( camDetails ),
             ContentType: 'application/json',
           };
@@ -532,4 +544,4 @@ export const updateOldData = async ( req, res ) => {
     logger.error( { error: e, function: 'updateOldData' } );
     return res.sendError( e, 500 );
   }
-};
+};

package/src/dtos/validation.dtos.js

@@ -49,6 +49,7 @@ export const validateTaggingSchema = joi.object( {
   coordinates: joi.array().required(),
   streamName: joi.string().required(),
   redoPoint: joi.boolean().optional(),
+  redraw: joi.boolean().optional(),
 } );
 
 export const validateTaggingParams = {

package/src/services/client.service.js

@@ -0,0 +1,5 @@
+import model from 'tango-api-schema';
+
+export const findOne = async ( query = {}, record = {} ) => {
+  return await model.clientModel.findOne( query, record );
+};

package/src/services/store.service.js

@@ -0,0 +1,5 @@
+import model from 'tango-api-schema';
+
+export const findOne = async ( query = {}, record = {} ) => {
+  return await model.storeModel.findOne( query, record );
+};