tango-app-api-analysis-traffic 3.8.0-alpha.2 → 3.8.1-alpha.1

package/README.md

@@ -1,29 +1,29 @@
-# README #
-
-This README would normally document whatever steps are necessary to get your application up and running.
-
-### What is this repository for? ###
-
-* Quick summary
-* Version
-* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
-
-### How do I get set up? ###
-
-* Summary of set up
-* Configuration
-* Dependencies
-* Database configuration
-* How to run tests
-* Deployment instructions
-
-### Contribution guidelines ###
-
-* Writing tests
-* Code review
-* Other guidelines
-
-### Who do I talk to? ###
-
-* Repo owner or admin
+# README #
+
+This README would normally document whatever steps are necessary to get your application up and running.
+
+### What is this repository for? ###
+
+* Quick summary
+* Version
+* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
+
+### How do I get set up? ###
+
+* Summary of set up
+* Configuration
+* Dependencies
+* Database configuration
+* How to run tests
+* Deployment instructions
+
+### Contribution guidelines ###
+
+* Writing tests
+* Code review
+* Other guidelines
+
+### Who do I talk to? ###
+
+* Repo owner or admin
 * Other community or team contact

package/index.js

@@ -4,7 +4,8 @@ import { analysisTrafficRouter } from './src/routes/traffic.routes.js';
 import { revopRouter } from './src/routes/revop.routes.js';
 import { mobileTrafficAnalysisRouter } from './src/routes/mobileTraffic.routes.js';
 import { nobDocs } from './src/docs/nob.docs.js';
+import { revopDocs } from './src/docs/revop.docs.js';
 import nobRouter from './src/routes/nob.routes.js';
 
-export { analysisTrafficRouter, mobileTrafficAnalysisRouter, nobDocs, nobRouter, revopRouter };
+export { analysisTrafficRouter, mobileTrafficAnalysisRouter, nobDocs, nobRouter, revopRouter, revopDocs };
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.8.0-alpha.2",
+    "version": "3.8.1-alpha.1",
     "description": "Traffic Analysis",
     "main": "index.js",
     "type": "module",
@@ -23,8 +23,8 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.2.192",
-        "tango-app-api-middleware": "^3.1.86",
+        "tango-api-schema": "^2.2.201",
+        "tango-app-api-middleware": "^3.1.88",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/revop.controller.js

@@ -1,7 +1,8 @@
 import { logger, insertOpenSearchData, getOpenSearchData, updateOpenSearchData } from 'tango-app-api-middleware';
 import { findOnerevopConfig } from '../services/revopConfig.service.js';
 import * as clientService from '../services/clients.services.js';
-
+import { upsertWithScript } from 'tango-app-api-middleware/src/utils/openSearch.js';
+import dayjs from 'dayjs';
 // Lamda Service Call //
 async function LamdaServiceCall( url, data ) {
   try {
@@ -204,3 +205,136 @@ export async function revoptaggingcount( req, res ) {
     return res.sendError( { error: error }, 500 );
   }
 }
+
+export async function storeProcessedData( req, res ) {
+  try {
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
+    const inputData = req.query;
+    const previousDate = dayjs( inputData.dateString ).subtract( 1, 'day' ).format( 'YYYY-MM-DD' );
+    const dateString = `${inputData.storeId}_${inputData.dateString}`;
+    const dateStringPrevious = `${inputData.storeId}_${previousDate}`;
+    const getQuery = {
+      query: {
+        terms: {
+          _id: [ dateString, dateStringPrevious ],
+        },
+      },
+      _source: [ 'footfall', 'date_string', 'store_id', 'down_time', 'footfall_count' ],
+      sort: [
+        {
+          date_iso: {
+            order: 'desc',
+          },
+        },
+      ],
+    };
+
+
+    const getData = await getOpenSearchData( openSearch.footfall, getQuery );
+    const processedData = getData?.body?.hits?.hits?.[0]?._source;
+    const previousData = getData?.body?.hits?.hits?.[1]?._source;
+    const result=( ( processedData?.footfall_count - previousData?.footfall_count )/previousData?.footfall_count )*100;
+    return res.sendSuccess( { footfallCount: processedData?.footfall_count, footfallCountTrend: Math.round( result ), downtime: processedData?.down_time } );
+  } catch ( error ) {
+    logger.error( { message: error, data: req.query, function: 'storeProcessedData' } );
+    const err = error.message || 'Internal Server Error';
+    return res.sendError( err, 500 );
+  }
+}
+
+export async function footFallImages( req, res ) {
+  try {
+    const inputData = req.query;
+    inputData.clientId = inputData.storeId.split( '-' )[0];
+    inputData.storeId=[ inputData.storeId ];
+
+    const LamdaURL = 'https://cncmzszloku7y3bewxbpiy6nkm0yunqe.lambda-url.ap-south-1.on.aws/';
+    let resultData = await LamdaServiceCall( LamdaURL, inputData );
+    if ( resultData ) {
+      if ( resultData.status_code == '200' ) {
+        return res.sendSuccess( { ...resultData, ticketStatus: '' } );
+      } else {
+        return res.sendError( 'No Content', 204 );
+      }
+    } else {
+      return res.sendError( 'No Content', 204 );
+    }
+  } catch ( error ) {
+    logger.error( { message: error, data: req.query, function: 'storeProcessedData' } );
+    const err = error.message || 'Internal Server Error';
+    return res.sendError( err, 500 );
+  }
+}
+
+export async function tagTempId( req, res ) {
+  try {
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
+    const inputData = req.body;
+    const upsertRecord = {
+      clientId: inputData.storeId.split( '-' )[0],
+      storeId: inputData.storeId,
+      tempId: inputData.tempId,
+      dateString: inputData.dateString,
+      timeRange: inputData.timeRange,
+      processType: inputData.processType,
+      revopsType: inputData.revopsType,
+      entryTime: inputData.entryTime,
+      exitTime: inputData.exitTime,
+      filePath: inputData.filePath,
+      status: 'submitted',
+      description: '',
+      dublicateImage: inputData?.dublicateImage?.length>0? inputData?.dublicateImage :[],
+      createdAt: new Date(),
+      updatedAt: new Date(),
+
+    };
+    const script = {
+      source: `
+   
+    ctx._source.revopsType = params.revopsType;
+    ctx._source.entryTime = params.entryTime;
+    ctx._source.exitTime = params.exitTime;
+    ctx._source.filePath = params.filePath;
+    ctx._source.status = params.status;
+    ctx._source.description = params.description;
+    ctx._source.dublicateImage = params.dublicateImage;
+    ctx._source.updatedAt = params.updatedAt;
+    if (ctx._source.createdAt == null) {
+      ctx._source.createdAt = params.createdAt;
+       ctx._source.clientId = params.clientId;
+    ctx._source.storeId = params.storeId;
+    ctx._source.tempId = params.tempId;
+    ctx._source.dateString = params.dateString;
+    ctx._source.timeRange = params.timeRange;
+    ctx._source.processType = params.processType;
+    }
+  `,
+      params: upsertRecord,
+    };
+    const id = `${inputData.storeId}_${inputData.dateString}_${inputData.timeRange}_${inputData.tempId}`;
+    await upsertWithScript( openSearch.revop, id, { script, upsert: upsertRecord } );
+    return res.sendSuccess( `tempId ${inputData.tempId} has been tagged successfully` );
+  } catch ( error ) {
+    logger.error( { message: error, data: req.query, function: 'tagTempId' } );
+    const err = error.message || 'Internal Server Error';
+    return res.sendError( err, 500 );
+  }
+}
+
+export async function getCategorizedImages( req, res ) {
+  try {
+    const inputQury = req.query;
+    logger.info( { inputQury: inputQury } );
+    const result={
+      nonTagged: [],
+      duplicates: [],
+      Employee: [],
+      HouseKepping: [],
+    };
+    return res.sendSuccess( { result: result } );
+  } catch ( error ) {
+    logger.error( { message: error, data: req.query, function: 'getCategorizedImages' } );
+    const err = error.message || 'Internal Server Error';
+    return res.sendError( err, 500 );
+  }
+}

package/src/controllers/tangoTrafficV3.controllers.js

@@ -3069,50 +3069,6 @@ export const getStoreMapDataV3 = async ( req, res ) => {
   }
 };
 
-export const managerTrafficDensityExport = async ( req, res ) => {
-  try {
-    let reqestData = req.body;
-    let getClientData = await getClientConfig( reqestData.clientId );
-    if ( !getClientData ) {
-      return res.sendError( 'Invalid Client Id', 400 );
-    }
-    reqestData.featureConfigs = getClientData.featureConfigs;
-    let LamdaURL = 'https://bkmqop3brhzloib2bik3hn7xey0uadas.lambda-url.ap-south-1.on.aws/';
-    let resultData = await LamdaServiceCall( LamdaURL, reqestData );
-    let resultDataValue = resultData.data;
-    if ( resultData ) {
-      if ( resultData.status_code == '200' ) {
-        if ( reqestData.export ) {
-          if ( resultDataValue && resultDataValue.length > 0 ) {
-            let exportdata = [];
-            resultDataValue.forEach( ( element ) => {
-              let row = {};
-              row['Date'] = element.date || '--';
-              row['Time'] = element.time ?? '--';
-              row['Day'] = element.day ?? '--';
-              row['Count'] = element.count || '--';
-              exportdata.push( row );
-            } );
-
-            return await download( exportdata, res );
-          } else {
-            return res.sendError( 'No Content', 204 );
-          }
-        } else {
-          return res.sendSuccess( resultData );
-        }
-      } else {
-        return res.sendError( 'No Content', 204 );
-      }
-    } else {
-      return res.sendError( 'No Content', 204 );
-    }
-  } catch ( error ) {
-    logger.error( { error: error, message: req.query, function: 'managerTrafficDensityExport' } );
-    return res.sendError( { error: error }, 500 );
-  }
-};
-
 // async function getGeocodedAddress( lat, lng ) {
 //   try {
 //     const apiKey = 'AIzaSyDlOezgwQO0JviD0aizrCuN1FY9tcWfR3o'; // Use this if you're using dotenv

package/src/docs/revop.docs.js

@@ -0,0 +1,104 @@
+import j2s from 'joi-to-swagger';
+import { footfallImagesSchema, storeProcessedDataSchema, tagTempIdSchema } from '../dtos/revop.dtos.js';
+
+
+export const revopDocs = {
+  '/v3/revop/store-processed-data': {
+    get: {
+      tags: [ 'Revop' ],
+      description: 'To get a Store Processed data',
+      operationId: 'store-list',
+      parameters: [
+        {
+          in: 'query',
+          name: 'storeId',
+          scema: j2s( storeProcessedDataSchema ).swagger,
+          required: true,
+        },
+        {
+          in: 'query',
+          name: 'dateString',
+          scema: j2s( storeProcessedDataSchema ).swagger,
+          required: true,
+        },
+      ],
+      responses: {
+        200: { description: 'Successfully' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+
+  '/v3/revop/footfall-images': {
+    get: {
+      tags: [ 'Revop' ],
+      description: 'To get list of image directory by the selection',
+      operationId: 'footfall-images',
+      parameters: [
+        {
+          in: 'query',
+          name: 'storeId',
+          scema: j2s( footfallImagesSchema ).swagger,
+          required: true,
+        },
+        {
+          in: 'query',
+          name: 'dateString',
+          scema: j2s( footfallImagesSchema ).swagger,
+          required: true,
+        },
+        {
+          in: 'query',
+          name: 'groupByKey',
+          scema: j2s( footfallImagesSchema ).swagger,
+          required: true,
+        },
+        {
+          in: 'query',
+          name: 'type',
+          scema: j2s( footfallImagesSchema ).swagger,
+          required: false,
+        },
+        {
+          in: 'query',
+          name: 'processType',
+          scema: j2s( footfallImagesSchema ).swagger,
+          required: true,
+        },
+      ],
+      responses: {
+        200: { description: 'Successfully' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+
+  '/v3/revop/tag-tempId': {
+    post: {
+      tags: [ 'Revop' ],
+      description: 'To add/edit tag against a temp ID ',
+      operationId: 'tag-tempId',
+      parameters: [],
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( tagTempIdSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Temp ID has been tagged successfully' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+};

package/src/dtos/revop.dtos.js

@@ -0,0 +1,59 @@
+import joi from 'joi';
+
+export const storeProcessedDataSchema = joi.object( {
+
+  storeId: joi.string().required(),
+  dateString: joi.string().required(),
+
+} );
+
+export const storeProcessedDataValid = {
+  query: storeProcessedDataSchema,
+};
+
+export const footfallImagesSchema = joi.object( {
+
+  storeId: joi.string().required(),
+  dateString: joi.string().required(),
+  groupByKey: joi.string().required(),
+  processType: joi.string().required(),
+  type: joi.string().optional(),
+
+} );
+
+export const footfallImagesValid = {
+  query: footfallImagesSchema,
+};
+
+export const tagTempIdSchema = joi.object( {
+
+  storeId: joi.string().required(),
+  dateString: joi.string().required(), // yyyy-mm-dd
+  tempId: joi.number().required(),
+  revopsType: joi.string().required(),
+  timeRange: joi.string().required(),
+  dublicateImage: joi.array().optional(),
+  processType: joi.string().required(),
+  entryTime: joi.string().required(),
+  exitTime: joi.string().required(),
+  filePath: joi.string().required(),
+
+} );
+
+export const tagTempIdValid = {
+  body: tagTempIdSchema,
+};
+
+
+export const getCategorizedImagesSchema = joi.object( {
+
+  storeId: joi.string().required(),
+  fileDate: joi.string().required(),
+  type: joi.array().optional(),
+
+} );
+
+export const getCategorizedImagesValid = {
+  body: getCategorizedImagesSchema,
+};
+

package/src/routes/revop.routes.js

@@ -1,7 +1,8 @@
 
 import express from 'express';
-import { getconfig, revoptagging, getrevoptagging, revoptaggingcount } from '../controllers/revop.controller.js';
-import { isAllowedSessionHandler } from 'tango-app-api-middleware';
+import { storeProcessedData, getconfig, revoptagging, getrevoptagging, revoptaggingcount, footFallImages, tagTempId, getCategorizedImages } from '../controllers/revop.controller.js';
+import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
+import { footfallImagesValid, getCategorizedImagesValid, storeProcessedDataValid, tagTempIdValid } from '../dtos/revop.dtos.js';
 
 export const revopRouter = express.Router();
 
@@ -9,6 +10,15 @@ revopRouter
     .get( '/getconfig', isAllowedSessionHandler, getconfig )
     .post( '/tagging', isAllowedSessionHandler, revoptagging )
     .post( '/getrevoptagging', isAllowedSessionHandler, getrevoptagging )
-    .post( '/revoptaggingcount', isAllowedSessionHandler, revoptaggingcount );
+    .post( '/revoptaggingcount', isAllowedSessionHandler, revoptaggingcount )
+
+// new enhnacemnet (for footfall directory)
+    .get( '/store-processed-data', isAllowedSessionHandler, validate( storeProcessedDataValid ), storeProcessedData )
+    .get( '/footfall-images', isAllowedSessionHandler, validate( footfallImagesValid ), footFallImages )
+    .post( '/tag-tempId', isAllowedSessionHandler, validate( tagTempIdValid ), tagTempId )
+
+
+    .post( '/get-categorized-images', isAllowedSessionHandler, validate( getCategorizedImagesValid ), getCategorizedImages );
+
 
 export default revopRouter;

package/src/routes/traffic.routes.js

@@ -91,7 +91,7 @@ import {
   zoneDwellTimeSplitV3,
   funnelV3,
   getStoreMapDataV3,
-  managerTrafficDensityExport,
+
 } from '../controllers/tangoTrafficV3.controllers.js';
 analysisTrafficRouter
     .get( '/welcome', welcome )
@@ -174,6 +174,5 @@ analysisTrafficRouter
     .post( '/headerUserEmails_v2', isAllowedSessionHandler, getUserEmails )
     .post( '/headerCountry_v2', isAllowedSessionHandler, isAllowedClient, validate( validationDtos.validateCountryHeaderParamsv2 ), getAssinedStore, headerCountryV2 )
     .post( '/checkTodayReportStatus', isAllowedSessionHandler, checkTodayReportStatus )
-    .post( '/headerZoneV2', isAllowedSessionHandler, headerZoneV2 )
-    .post( '/trafficDensityExport_v2', managerTrafficDensityExport );
+    .post( '/headerZoneV2', isAllowedSessionHandler, headerZoneV2 );
 export default analysisTrafficRouter;