tango-app-api-store-zone 3.3.1-beta.16 → 3.3.1-beta.18

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "tango-app-api-store-zone",
-    "version": "3.3.1-beta.16",
+    "version": "3.3.1-beta.18",
     "description": "zone",
     "main": "index.js",
     "type": "module",
     "scripts": {
-        "start": "nodemon --exec \"eslint --fix . && node index.js\""
+        "start": "nodemon --exec \"eslint --fix . && node app.js\""
     },
     "engines": {
         "node": ">=18.10.0"

package/src/controllers/zoneTagging.controller.js

@@ -179,7 +179,7 @@ export const customTagListv2 = async ( req, res ) => {
     ];
 
     // Step 2: Fetch store & client details in parallel
-    const [ storeDetails, clientDetails ] = await Promise.all( [
+    const [ storeDetails, clientDetails, camList ] = await Promise.all( [
       storeService.findOne(
           { storeId: req.query.storeId },
           { product: 1 },
@@ -188,7 +188,12 @@ export const customTagListv2 = async ( req, res ) => {
           { clientId: req.query.clientId },
           { featureConfigs: 1 },
       ),
+      cameraService.find(
+          { storeId: req.query.storeId, isActivated: true, isUp: true },
+          { streamName: 1 },
+      ),
     ] );
+    console.log( req.query.clientId, camList.length );
 
     // Step 3: Add conditional tags
     if ( clientDetails?.featureConfigs?.isExcludedArea ) {
@@ -220,7 +225,8 @@ export const customTagListv2 = async ( req, res ) => {
 
     // Step 6: Query counts per tag
     const tagNames = uniqueTags.map( ( t ) => t.tagName );
-
+    let activeCam = camList.map( ( data ) => data.streamName );
+    console.log( '🚀 ~ customTagListv2 ~ activeCam:', activeCam );
     const taggingDetails = await taggingService.aggregate( [
       {
         $match: {
@@ -229,6 +235,7 @@ export const customTagListv2 = async ( req, res ) => {
           storeId: req.query.storeId,
           coordinates: { $exists: true, $ne: [] },
           tagName: { $in: tagNames },
+          streamName: { $in: activeCam },
         },
       },
       { $group: { _id: '$tagName', count: { $sum: 1 } } },
@@ -762,7 +769,12 @@ export const deleteTag = async ( req, res ) => {
     if ( !taggingDetails.length ) {
       return res.sendError( 'no data found', 204 );
     }
-    let enableDelete = false;
+
+    let tagNameDetails = await taggingService.findOne( { clientId: req.body.clientId, tagName: req.body.tagName, $expr: { $ne: [ { $size: '$coordinates' }, 0 ] } } );
+    if ( tagNameDetails ) {
+      return res.sendError( 'This zone tag is already mapped to other stores.', 400 );
+    }
+    // let enableDelete = false;
     // if ( req.user.permission ) {
     //   let permissions = req.user.permission;
     //   permissions.forEach( ( permission ) => {