tango-app-api-store-zone 3.3.1-beta.0 → 3.3.1-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-zone",
-    "version": "3.3.1-beta.0",
+    "version": "3.3.1-beta.2",
     "description": "zone",
     "main": "index.js",
     "type": "module",
@@ -21,7 +21,7 @@
         "mongodb": "^6.5.0",
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.0.115",
+        "tango-api-schema": "^2.1.1",
         "tango-app-api-middleware": "^3.1.19",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/zoneTagging.controller.js

@@ -15,6 +15,8 @@ export const addCustomTag = async ( req, res ) => {
         clientId: inputData.clientId,
         storeId: inputData.storeId,
         tagName: inputData.tagName,
+        rgbColor: inputData.rgbColor,
+        rgbBorderColor: inputData.rgbBorderColor,
       };
       await taggingService.deleteMany( { clientId: inputData.clientId, storeId: inputData.storeId, tagName: inputData.tagName, isDeleted: true } );
       await taggingService.create( data );
@@ -54,7 +56,10 @@ export const customTagList = async ( req, res ) => {
     if ( storeDetails && storeDetails?.product.includes( 'tangoZone' ) ) {
       customTagList = customTagList.concat( [ 'Entry/Exit', 'Billing' ] );
     }
-    let tagInfo = await taggingService.find( { clientId: req.query.clientId }, { tagName: 1 } );
+    let tagInfo = await taggingService.find( { clientId: req.query.clientId }, { tagName: 1, rgbColor: 1, rgbBorderColor: 1 } );
+
+    const allTags = tagInfo;
+
     let deletedTag = await taggingService.find( { clientId: req.query.clientId, isDeleted: true }, { storeId: 1, tagName: 1 } );
     tagInfo = [ ...new Set( tagInfo.map( ( item ) => item.tagName ) ) ];
     deletedTag.forEach( ( item ) => {
@@ -90,10 +95,13 @@ export const customTagList = async ( req, res ) => {
           tagName: '$_id',
           count: 1,
 
+
         },
       },
     ];
     let taggingDetails = await taggingService.aggregate( query );
+
+
     customTagList = customTagList.map( ( item ) => {
       let count = '';
       if ( taggingDetails.length ) {
@@ -107,6 +115,42 @@ export const customTagList = async ( req, res ) => {
       return { tagName: item, count: count };
     } );
     customTagList.sort( ( a, b ) => a.count > b.count ? -1 : 1 );
+
+    const allTagsMap = new Map( allTags.map( ( tag ) => [ tag.tagName, tag ] ) );
+
+    customTagList.forEach( ( i ) => {
+      const matchingTag = allTagsMap.get( i.tagName );
+      if ( matchingTag ) {
+        i.rgbColor = matchingTag.rgbColor;
+        i.rgbBorderColor = matchingTag.rgbBorderColor;
+      }
+
+      if ( i.tagName === 'Front' ) {
+        i.rgbColor = 'rgba(89, 80, 5, 0.5)';
+        i.rgbBorderColor = 'rgb(99, 90, 15)';
+      }
+      if ( i.tagName === 'Back' ) {
+        i.rgbColor = 'rgba(94, 60, 107, 0.5)';
+        i.rgbBorderColor = 'rgb(104, 70, 117)';
+      }
+      if ( i.tagName === 'Excluded Area' ) {
+        i.rgbColor = 'rgba(186, 60, 214, 0.5)';
+        i.rgbBorderColor = 'rgb(196, 70, 224)';
+      }
+      if ( i.tagName === 'Passer By' ) {
+        i.rgbColor = 'rgba(81, 153, 247, 0.5)';
+        i.rgbBorderColor = 'rgb(91, 163, 257)';
+      }
+      if ( i.tagName === 'Entry/Exit' ) {
+        i.rgbColor = 'rgba(224, 43, 170, 0.5)';
+        i.rgbBorderColor = 'rgb(234, 53, 180)';
+      }
+      if ( i.tagName === 'Billing' ) {
+        i.rgbColor = 'rgba(193, 214, 114, 0.5)';
+        i.rgbBorderColor = 'rgb(203, 224, 124)';
+      }
+    } );
+
     return res.sendSuccess( customTagList );
   } catch ( e ) {
     logger.error( { error: e, function: 'customTagList' } );
@@ -128,6 +172,7 @@ export const tagging = async ( req, res ) => {
       }
     } );
     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,
@@ -142,6 +187,13 @@ export const tagging = async ( req, res ) => {
         showTo: [ 'client', 'tango' ],
       };
       insertOpenSearchData( JSON.parse( process.env.OPENSEARCH )?.activityLog, logObj );
+      if ( InputData.coordinates[0].color ) {
+        InputData = { ...InputData, rgbColor: InputData.coordinates[0].color };
+      }
+
+      if ( InputData.coordinates[0].rgbBorderColor ) {
+        InputData = { ...InputData, rgbBorderColor: InputData.coordinates[0].rgbBorderColor };
+      }
       let response = await taggingService.create( InputData );
       await taggingService.deleteOne( { clientId: InputData.clientId, storeId: InputData.storeId, cameraId: { $exists: false }, tagName: InputData.tagName } );
       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 } ) );
@@ -370,11 +422,14 @@ export const updateTag = async ( req, res ) => {
     };
     insertOpenSearchData( JSON.parse( process.env.OPENSEARCH )?.activityLog, logObj );
     if ( tagUpdate.modifiedCount || tagUpdate.matchedCount ) {
+      await externalService.updateMany( { zoneName: req.body.existTag, clientId: req.body.clientId }, { zoneName: req.body.tagName } );
       logger.info( 'Custom Tag Updated Successfully' );
-      return res.sendSuccess( 'Custom Tag Updated Successfully' );
+      updateJsonFile( req, res );
+      res.sendSuccess( 'Custom Tag Updated Successfully' );
+    } else {
+      logger.error( { error: 'something went wrong', function: 'updateTag' } );
+      return res.sendError( 'something went wrong', 500 );
     }
-    logger.error( { error: 'something went wrong', function: 'updateTag' } );
-    return res.sendError( 'something went wrong', 500 );
   } catch ( e ) {
     logger.error( { error: e, function: 'updateTag' } );
     return res.sendError( e, 500 );
@@ -634,3 +689,29 @@ export const deletezoneTagging = async ( req, res ) => {
     await updatezoneTagging( req, res );
   } );
 };
+
+async function updateJsonFile( req, res ) {
+  if ( req.body.clientId ) {
+    let tagDetails = await taggingService.find( { clientId: req.body.clientId, tagName: req.body.tagName }, { storeId: 1 } );
+    if ( tagDetails.length ) {
+      for ( let item of tagDetails ) {
+        req.body.storeId = item.storeId;
+        let camDetails = await getCamTaggingDetails( req, res );
+        if ( !camDetails ) {
+          logger.error( { message: 'no data', store: item.storeId } );
+        }
+        let fileData = {
+          Key: `${req.body.storeId}/zonetagging/`,
+          fileName: `${req.body.storeId}_zonetagging.json`,
+          Bucket: JSON.parse( process.env.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 } );
+        }
+      }
+    }
+  }
+};

package/src/dtos/validation.dtos.js

@@ -4,6 +4,8 @@ export const addTagSchema = joi.object( {
   clientId: joi.string().required(),
   tagName: joi.string().required(),
   storeId: joi.string().required(),
+  rgbColor: joi.string().required(),
+  rgbBorderColor: joi.string().required(),
 } );
 
 export const validateAddTagParams = {

package/src/services/external.service.js

@@ -17,4 +17,8 @@ export const deleteMany = async ( query = {} ) => {
   return await model.externalParameterModel.deleteMany( query );
 };
 
+export const updateMany = async ( query = {}, record={} ) => {
+  return await model.externalParameterModel.updateMany( query, { $set: record } );
+};
+