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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-zone",
-    "version": "3.0.12-dev",
+    "version": "3.0.14-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.104",
+        "tango-api-schema": "^2.0.110",
         "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

@@ -1,6 +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 * as storeService from '../services/store.service.js';
 import { appConfig, signedUrl, listFileByPath, fileUpload, insertOpenSearchData } from 'tango-app-api-middleware';
 import axios from 'axios';
 export const addCustomTag = async ( req, res ) => {
@@ -40,7 +41,13 @@ export const addCustomTag = async ( req, res ) => {
 export const customTagList = async ( req, res ) => {
   try {
     let customTagList = [];
-    let defaultZone = [ 'Entry', 'Exit', 'Billing', 'Excluded Area' ];
+    let storeDetails = await storeService.findOne( { storeId: req.query.storeId }, { product: 1 } );
+    let defaultZone;
+    if ( storeDetails && storeDetails?.product.includes( 'tangoZone' ) ) {
+      defaultZone = [ 'Excluded Area', 'Passer By', 'Entry/Exit', 'Billing' ];
+    } else {
+      defaultZone = [ 'Excluded Area', 'Passer By' ];
+    }
     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 } );
@@ -94,6 +101,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' } );
@@ -143,6 +151,9 @@ export const tagging = async ( req, res ) => {
       if ( req.body?.redoPoint ) {
         taggingDetails.coordinates = InputData.coordinates[0];
         taggingDetails.save();
+      } else if ( req.body?.redraw ) {
+        taggingDetails.coordinates = InputData.coordinates;
+        taggingDetails.save();
       } else {
         if ( InputData.coordinates[0].coor.length ) {
           taggingDetails.coordinates.push( InputData.coordinates[0] );
@@ -183,7 +194,7 @@ 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 );
     }
@@ -532,4 +543,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/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 );
+};