tango-app-api-store-zone 3.0.14-dev → 3.0.15-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-zone",
-    "version": "3.0.14-dev",
+    "version": "3.0.15-dev",
     "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.110",
+        "tango-api-schema": "^2.0.115",
         "tango-app-api-middleware": "^1.0.73-test",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/zoneTagging.controller.js

@@ -2,6 +2,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 * as storeService from '../services/store.service.js';
+import * as clientService from '../services/client.service.js';
 import { appConfig, signedUrl, listFileByPath, fileUpload, insertOpenSearchData } from 'tango-app-api-middleware';
 import axios from 'axios';
 export const addCustomTag = async ( req, res ) => {
@@ -42,13 +43,16 @@ export const customTagList = async ( req, res ) => {
   try {
     let customTagList = [];
     let storeDetails = await storeService.findOne( { storeId: req.query.storeId }, { product: 1 } );
-    let defaultZone;
+    let clientDetails = await clientService.findOne( { clientId: req.query.clientId } );
+    if ( clientDetails && clientDetails?.featureConfigs?.isExcludedArea ) {
+      customTagList.push( 'Excluded Area' );
+    }
+    if ( clientDetails && clientDetails?.featureConfigs?.isPasserByData ) {
+      customTagList.push( 'Passer By' );
+    }
     if ( storeDetails && storeDetails?.product.includes( 'tangoZone' ) ) {
-      defaultZone = [ 'Excluded Area', 'Passer By', 'Entry/Exit', 'Billing' ];
-    } else {
-      defaultZone = [ 'Excluded Area', 'Passer By' ];
+      customTagList = customTagList.concat( [ 'Entry/Exit', 'Billing' ] );
     }
-    customTagList.push( ...defaultZone );
     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 ) ) ];
@@ -169,23 +173,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 );
@@ -276,12 +263,21 @@ 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 ) => {
+    taggingCoordinates.forEach( async ( item ) => {
       await axios.post( `${appConfig.url.oldapidomain}/tagging/oldTaggingUpdate/${item._id}`, item, { headers: { Authorization: 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66' } } ).then( ( res ) => {
         logger.info( res?.data );
       } ).catch( ( error ) => {
@@ -301,6 +297,10 @@ export const updateTag = async ( req, res ) => {
       showTo: [ 'client', 'tango' ],
     };
     insertOpenSearchData( appConfig.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 ) {
@@ -543,4 +543,4 @@ export const updateOldData = async ( req, res ) => {
     logger.error( { error: e, function: 'updateOldData' } );
     return res.sendError( e, 500 );
   }
-};
+};

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 );
+};