tango-app-api-store-zone 3.0.11-dev → 3.0.13-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-zone",
-    "version": "3.0.11-dev",
+    "version": "3.0.13-dev",
     "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.102",
-        "tango-app-api-middleware": "^1.0.71-test",
+        "tango-api-schema": "^2.0.110",
+        "tango-app-api-middleware": "^3.1.12",
         "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 ) => {
@@ -23,12 +24,13 @@ export const addCustomTag = async ( req, res ) => {
       userName: req.user?.userName,
       email: req.user?.email,
       date: new Date(),
-      logType: 'add Zone',
-      logSubType: inputData.tagName,
-      changes: [ ],
-      eventType: 'add',
+      logType: 'zone',
+      logSubType: 'addCustomTag',
+      changes: [ `${inputData.tagName} customtag Created.` ],
+      eventType: '',
+      showTo: [ 'client', 'tango' ],
     };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
     return res.sendSuccess( 'Tag Created Successfully' );
   } catch ( e ) {
     logger.error( { error: 'e', function: 'addCustomTag' } );
@@ -39,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 } );
@@ -93,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' } );
@@ -114,12 +123,13 @@ export const tagging = async ( req, res ) => {
         userName: req.user?.userName,
         email: req.user?.email,
         date: new Date(),
-        logType: 'add Zone Tagging',
-        logSubType: InputData.tagName,
-        changes: [ 'coordinates' ],
-        eventType: 'add Tagging',
+        logType: 'zone',
+        logSubType: 'addZoneTagging',
+        changes: [ `${InputData.tagName} zone added tagging` ],
+        eventType: '',
+        showTo: [ 'client', 'tango' ],
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.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 } ) );
@@ -130,17 +140,20 @@ export const tagging = async ( req, res ) => {
         userName: req.user?.userName,
         email: req.user?.email,
         date: new Date(),
-        logType: 'add Zone Tagging',
-        logSubType: InputData.tagName,
-        changes: [ 'coordinates' ],
-        eventType: 'update Tagging',
+        logType: 'zone',
+        logSubType: 'updateZoneTagging',
+        changes: [ `${InputData.tagName} zone Updated tagging` ],
+        eventType: '',
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       taggingDetails.cameraId = InputData.cameraId;
       taggingDetails.streamName = InputData.streamName;
       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] );
@@ -181,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 );
     }
@@ -281,12 +294,13 @@ export const updateTag = async ( req, res ) => {
       userName: req.user?.userName,
       email: req.user?.email,
       date: new Date(),
-      logType: 'add Zone Tagging',
-      logSubType: req.body.existTag,
-      changes: [ 'tagName' ],
-      eventType: 'update Custom Tag Name',
+      logType: 'zone',
+      logSubType: 'updateCustomTag',
+      changes: [ `${req.body.tagName} tagName Updated` ],
+      eventType: '',
+      showTo: [ 'client', 'tango' ],
     };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
     logger.error( { error: 'something went wrong', function: 'updateTag' } );
     return res.sendError( 'something went wrong', 500 );
   } catch ( e ) {
@@ -340,12 +354,13 @@ export const deleteTag = async ( req, res ) => {
       userName: req.user?.userName,
       email: req.user?.email,
       date: new Date(),
-      logType: 'add Zone Tagging',
-      logSubType: req.body?.tagName,
-      changes: [ 'tagName' ],
-      eventType: 'Delete Tagging Name',
+      logType: 'zone',
+      logSubType: 'deleteTag',
+      changes: [ `${req.body.tagName} tag Deleted` ],
+      eventType: '',
+      showTo: [ 'client', 'tango' ],
     };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
     await updatezoneTagging( req, res );
     // return res.sendSuccess( 'Tag Deleted Successfully' );
   } catch ( e ) {
@@ -422,7 +437,7 @@ async function getCamTaggingDetails( req, res ) {
   try {
     let camDetails = await cameraService.find( { storeId: req.body.storeId, isActivated: true, isUp: true } );
     if ( !camDetails.length ) {
-      return res.sendError( 'no data found', 204 );
+      return false;
     }
     let result = [];
     for ( let camera of camDetails ) {
@@ -515,8 +530,8 @@ export const updateOldData = async ( req, res ) => {
           if ( !upload.Key ) {
             logger.error( { message: `JSON Upload Error`, store: item.storeId } );
           }
-          if ( index == tagDetails.length-1 ) {
-            return res.sendSuccess( 'Zone Updated Successfully' );
+          if ( index == 0 ) {
+            res.sendSuccess( 'Zone Updated Successfully' );
           }
         } else {
           logger.error( { message: 'no data', store: item.storeId } );
@@ -528,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 );
+};