tango-app-api-store-zone 3.3.1-beta.13 → 3.3.1-beta.15

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-zone",
-    "version": "3.3.1-beta.13",
+    "version": "3.3.1-beta.15",
     "description": "zone",
     "main": "index.js",
     "type": "module",

package/src/controllers/zoneTagging.controller.js

@@ -5,7 +5,7 @@ import * as storeService from '../services/store.service.js';
 import * as clientService from '../services/client.service.js';
 import * as externalService from '../services/external.service.js';
 import { signedUrl, listFileByPath, fileUpload, insertOpenSearchData } from 'tango-app-api-middleware';
-import * as processedchecklistconfigService from '../services/processedchecklistconfig.services.js';
+import * as checklistconfigService from '../services/checklistconfig.services.js';
 
 import axios from 'axios';
 export const addCustomTag = async ( req, res ) => {
@@ -269,8 +269,8 @@ export const customTagListv2 = async ( req, res ) => {
         },
       }, {
         $group: {
-          _id: '$sourceCheckList_id',
-          sourceCheckList_id: { $last: '$sourceCheckList_id' },
+          _id: '$_id',
+          sourceCheckList_id: { $last: '$_id' },
           tagName: { $last: '$checkListName' },
         },
       },
@@ -300,11 +300,25 @@ export const customTagListv2 = async ( req, res ) => {
           ], as: 'cameraList',
         },
       },
-
       {
         $project: {
           tagName: 1,
           type: 'checklist',
+          cameraList: {
+            $filter: {
+              input: '$cameraList',
+              as: 'item',
+              cond: {
+                $eq: [ '$$item.storeId', req.query.storeId ],
+              },
+            },
+          },
+        },
+      },
+      {
+        $project: {
+          tagName: 1,
+          type: 1,
           count: { $size: '$cameraList' },
         },
       },
@@ -315,8 +329,9 @@ export const customTagListv2 = async ( req, res ) => {
       },
 
       ];
-      let getChecklistData = await processedchecklistconfigService.aggregate( Query );
-      if ( finalTags&&finalTags.length>0 ) {
+      let getChecklistData = await checklistconfigService.aggregate( Query );
+      console.log( getChecklistData, finalTags );
+      if ( finalTags && finalTags.length > 0 ) {
         let merged = getChecklistData.map( ( item ) => {
           let match = finalTags.find( ( a ) => a.tagName === item.tagName );
           if ( match ) {
@@ -324,7 +339,7 @@ export const customTagListv2 = async ( req, res ) => {
           }
           return item;
         } );
-
+        console.log( merged );
         // also include any arr1 items not in arr2
         finalTags.forEach( ( a ) => {
           if ( !merged.find( ( m ) => m.tagName === a.tagName ) ) {
@@ -403,12 +418,12 @@ export const tagging = async ( req, res ) => {
           ...taggingDetails.toObject(),
         },
         oldData: {
-          tagName: taggingDetails.tagName,
-          streamName: taggingDetails.streamName,
+          TagName: taggingDetails.tagName,
+          StreamName: taggingDetails.streamName,
         },
         newData: {
-          tagName: taggingDetails.tagName,
-          streamName: taggingDetails.streamName,
+          TagName: taggingDetails.tagName,
+          StreamName: taggingDetails.streamName,
         },
         showTo: [ 'tango', 'client' ],
       };
@@ -663,7 +678,7 @@ export const getCameraListv2 = async ( req, res ) => {
         camera.baseImg = cameraBaseImage;
       }
       camera.tagging = tagList;
-      camera.taggedCount = tagList.filter( ( ele ) => ele.tagName===req.body.tagName );
+      camera.taggedCount = tagList.filter( ( ele ) => ele.tagName === req.body.tagName );
       cameraDetails[index] = camera;
     }
     cameraDetails.sort( ( a, b ) => a.tagging?.length > b.tagging?.length ? -1 : 1 );
@@ -719,10 +734,10 @@ export const updateTag = async ( req, res ) => {
         tagName: req.body.tagName,
       },
       oldData: {
-        tagName: req.body.existTag,
+        TagName: req.body.existTag,
       },
       newData: {
-        tagName: req.body.tagName,
+        TagName: req.body.tagName,
       },
       showTo: [ 'tango', 'client' ],
     };
@@ -985,7 +1000,7 @@ export const updateOldData = async ( req, res ) => {
 };
 export async function updateCamera( req, res ) {
   try {
-    let findoneCheckList = await processedchecklistconfigService.findOne( {
+    let findoneCheckList = await checklistconfigService.findOne( {
       client_id: req.body.clientId, checkListName: req.body.selectedZone,
     } );
 
@@ -1043,3 +1058,81 @@ async function updateJsonFile( req, res ) {
     }
   }
 };
+
+export const getCameraStreamList = async ( req, res ) => {
+  try {
+    let cameraDetails = await cameraService.find( { clientId: req.body.clientId, storeId: req.body.storeId, streamName: req.body.streamName }, { cameraNumber: 1, streamName: 1, isActivated: 1, isUp: 1, cameraName: 1 } );
+    if ( !cameraDetails.length ) {
+      return res.sendError( 'no data found', 204 );
+    }
+    const folderPath = { file_path: `${req.body.storeId}/zone_base_images/`,
+      Bucket: JSON.parse( process.env.BUCKET ).zoneBaseImage, MaxKeys: 1000,
+    };
+    let fileList = await listFileByPath( folderPath );
+    const TaggedfolderPath = { file_path: `${req.body.storeId}/zone_tagged_image/`,
+      Bucket: JSON.parse( process.env.BUCKET ).zoneTaggingImage, MaxKeys: 1000,
+    };
+    let tagFileList = await listFileByPath( TaggedfolderPath );
+    for ( let [ index, camera ] of cameraDetails.entries() ) {
+      let tagList = [];
+      let tagPath;
+      let imgPath;
+      camera = {
+        ...camera._doc,
+        baseImg: '',
+        tagImg: '',
+      };
+      let taggingDetails = await taggingService.find( { cameraId: camera._id, streamName: camera.streamName, clientId: req.body.clientId, isDeleted: false }, { tagName: 1, coordinates: 1 } );
+      if ( taggingDetails.length ) {
+        tagList = taggingDetails.filter( ( item ) => item.coordinates.length ).map( ( item ) => {
+          if ( item.coordinates.length ) {
+            return { tagName: item.tagName, color: item.coordinates[0].color };
+          }
+        } );
+      }
+
+      if ( tagFileList.data.length ) {
+        tagFileList.data.forEach( ( item ) => {
+          if ( item.Key.length > 1 ) {
+            let splitStream = item.Key.split( '/' );
+            let getStream = splitStream[splitStream.length -1].split( '.' );
+
+            if ( getStream && getStream[0] == `${req.body.storeId}_${camera.streamName}` ) {
+              tagPath = item.Key;
+            }
+          }
+        } );
+      }
+      if ( fileList?.data.length ) {
+        fileList.data.forEach( ( ele ) => {
+          let splitStream = ele.Key.split( '/' );
+          let getStream = splitStream[splitStream.length -1].split( '.' );
+          if ( getStream && getStream[0] == `${req.body.storeId}_${camera.streamName}` ) {
+            imgPath = ele.Key;
+          }
+        } );
+      }
+      if ( tagPath ) {
+        const params = { file_path: tagPath,
+          Bucket: JSON.parse( process.env.BUCKET ).zoneTaggingImage,
+        };
+        const cameraTagImage = await signedUrl( params );
+        camera.tagImg = cameraTagImage;
+      }
+      if ( imgPath ) {
+        const baseParams = { file_path: imgPath,
+          Bucket: JSON.parse( process.env.BUCKET ).zoneBaseImage,
+        };
+        const cameraBaseImage = await signedUrl( baseParams );
+        camera.baseImg = cameraBaseImage;
+      }
+      camera.tagging = tagList;
+      cameraDetails[index] = camera;
+    }
+    cameraDetails.sort( ( a, b ) => a.tagging?.length > b.tagging?.length ? -1 : 1 );
+    return res.sendSuccess( cameraDetails );
+  } catch ( e ) {
+    logger.error( { error: e, function: 'getCameraList' } );
+    return res.sendError( e, 500 );
+  }
+};

package/src/dtos/validation.dtos.js

@@ -101,3 +101,13 @@ export const updateCoordinatesSchema= joi.object( {
 export const updateCoordinatesParams = {
   body: updateCoordinatesSchema,
 };
+
+export const getStreamSchema= joi.object( {
+  storeId: joi.string().required(),
+  clientId: joi.string().required(),
+  streamName: joi.string().required(),
+} );
+
+export const getStreamParams = {
+  body: getStreamSchema,
+};

package/src/routes/zoneTagging.routes.js

@@ -19,6 +19,7 @@ zoneTaggingRouter.get( '/getCameraTagging', isAllowedSessionHandler, accessVerif
 zoneTaggingRouter.get( '/getZoneTagging', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoEye', name: 'ZoneTag', permissions: [ ] } ] } ), validate( validation.validateZonetagParams ), tagController.getZoneList );
 zoneTaggingRouter.post( '/updatezoneTagging', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoEye', name: 'ZoneTag', permissions: [ 'isEdit' ] } ] } ), validate( validation.validateCamZonetagParams ), tagController.updatezoneTagging );
 zoneTaggingRouter.post( '/deleteZoneTag', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoEye', name: 'ZoneTag', permissions: [ 'isEdit' ] } ] } ), validate( validation.updateCoordinatesParams ), tagController.deletezoneTagging );
+zoneTaggingRouter.post( '/getStreamDetails', isAllowedSessionHandler, validate( validation.getStreamParams ), tagController.getCameraStreamList );
 zoneTaggingRouter.post( '/updateCamera', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoEye', name: 'ZoneTag', permissions: [ 'isEdit' ] } ] } ), tagController.updateCamera );
 
 zoneTaggingRouter.get( '/updateOldZone', tagController.updateOldData );

package/src/services/checklistconfig.services.js

@@ -0,0 +1,31 @@
+import model from 'tango-api-schema';
+
+export const findOne = async ( query={}, field={} ) => {
+  return model.checklistconfigModel.findOne( query, field );
+};
+
+export const find = async ( query={}, field={} ) => {
+  return model.checklistconfigModel.find( query, field );
+};
+
+export const create = async ( document = {} ) => {
+  return model.checklistconfigModel.create( document );
+};
+
+export const deleteOne = async ( query = {} ) => {
+  return model.checklistconfigModel.deleteOne( query );
+};
+
+export const updateOne = async ( query = {}, record={} ) => {
+  return model.checklistconfigModel.updateOne( query, { $set: record }, { upsert: true } );
+};
+
+export const updateMany = async ( query = {}, record={} ) => {
+  return model.checklistconfigModel.updateMany( query, { $set: record } );
+};
+
+export const aggregate = async ( query = {} ) => {
+  return model.checklistconfigModel.aggregate( query );
+};
+
+

package/src/services/processedchecklistconfig.services.js

@@ -1,35 +0,0 @@
-import model from 'tango-api-schema';
-
-export const find = ( query = {}, record = {} ) => {
-  return model.processedchecklistconfigModel.find( query, record );
-};
-
-export const findOne = ( query = {}, record = {} ) => {
-  return model.processedchecklistconfigModel.findOne( query, record ).sort( { updatedAt: -1 } );
-};
-
-export const updateOne = ( query = {}, record = {} ) => {
-  return model.processedchecklistconfigModel.updateOne( query, { $set: record }, { upsert: true } );
-};
-
-export const updateMany = ( query = {}, record = {} ) => {
-  return model.processedchecklistconfigModel.updateMany( query, { $set: record } );
-};
-
-export const deleteMany = ( query = {} ) => {
-  return model.processedchecklistconfigModel.deleteMany( query );
-};
-
-export const aggregate = ( query = [] ) => {
-  return model.processedchecklistconfigModel.aggregate( query );
-};
-
-export const getClientCount = ( query = {} ) => {
-  return model.processedchecklistconfigModel.count( query );
-};
-
-export const insert = ( document={} ) => {
-  return model.processedchecklistconfigModel.create( document );
-};
-
-