tango-app-api-analysis-traffic 3.3.1-alpha.1 → 3.3.1-alpha.10

package/index.js

@@ -1,9 +1,10 @@
 
 
 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 nobRouter from './src/routes/nob.routes.js';
 
-export { analysisTrafficRouter, mobileTrafficAnalysisRouter, nobDocs, nobRouter };
+export { analysisTrafficRouter, mobileTrafficAnalysisRouter, nobDocs, nobRouter, revopRouter };
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.3.1-alpha.1",
+    "version": "3.3.1-alpha.10",
     "description": "Traffic Analysis",
     "main": "index.js",
     "type": "module",
@@ -23,7 +23,7 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.2.7",
+        "tango-api-schema": "^2.2.109",
         "tango-app-api-middleware": "^3.1.55",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/revop.controller.js

@@ -0,0 +1,30 @@
+import { logger, insertOpenSearchData } from 'tango-app-api-middleware';
+import { findOnerevopConfig } from '../services/revopConfig.service.js';
+
+export async function getconfig( req, res ) {
+  try {
+    console.log( req.query );
+    let result = await findOnerevopConfig( { clientId: req.query.clientId } );
+    console.log( result );
+    if ( result===null ) {
+      return res.sendError( 'no data found', 204 );
+    }
+    return res.sendSuccess( result );
+  } catch ( error ) {
+    logger.error( { error: error, message: req.query, function: 'getconfig' } );
+    return res.sendError( { error: error }, 500 );
+  }
+}
+
+export async function revoptagging( req, res ) {
+  try {
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
+    console.log( openSearch.revops );
+    let respo= await insertOpenSearchData( openSearch.revops, req.body );
+    console.log( respo );
+    return res.sendSuccess( 'Data has been inserted successfully' );
+  } catch ( error ) {
+    logger.error( { error: error, message: req.query, function: 'revoptagging' } );
+    return res.sendError( { error: error }, 500 );
+  }
+}

package/src/controllers/tangoTrafficV1.controllers.js

@@ -1070,6 +1070,8 @@ export const headerStoresV2 = async ( req, res ) => {
                 { storeId: { $in: totalStores } },
                 { storeId: { $in: unqueCityStores } },
                 { storeId: { $in: unqueGroupStores } },
+                { 'edge.firstFile': true },
+                { status: { $eq: 'active' } },
               ],
             },
           },
@@ -1089,6 +1091,8 @@ export const headerStoresV2 = async ( req, res ) => {
               $and: [
                 { storeId: { $in: totalStores } },
                 { storeId: { $in: uniqueCityStores } },
+                { 'edge.firstFile': true },
+                { status: { $eq: 'active' } },
               ],
             },
           },
@@ -1108,6 +1112,8 @@ export const headerStoresV2 = async ( req, res ) => {
               $and: [
                 { storeId: { $in: totalStores } },
                 { storeId: { $in: uniqueclusterStores } },
+                { 'edge.firstFile': true },
+                { status: { $eq: 'active' } },
               ],
             },
           },
@@ -1126,6 +1132,8 @@ export const headerStoresV2 = async ( req, res ) => {
             $match: {
               $and: [
                 { storeId: { $in: totalStores } },
+                { 'edge.firstFile': true },
+                { status: { $eq: 'active' } },
               ],
             },
           },
@@ -1360,6 +1368,7 @@ async function getAssignedAllStores( userClientId ) {
             $and: [
               { clientId: { $eq: userClientId } },
               { status: { $eq: 'active' } },
+              { 'edge.firstFile': true },
             ],
           },
         },
@@ -1489,6 +1498,7 @@ async function getLocationStores( userClientId, cityList, req ) {
       if ( req.body.assignedStores&&req.body.assignedStores.length>0 ) {
         filter.push( { storeId: { $in: req.body.assignedStores } } );
       }
+      filter.push( { 'edge.firstFile': true }, { status: { $eq: 'active' } } );
 
       let storeQuery = [
         {

package/src/controllers/tangoTrafficV3.controllers.js

@@ -619,7 +619,7 @@ export const summaryTableV3 = async ( req, res ) => {
     if ( resultData ) {
       if ( resultData.status_code == '200' ) {
         if ( reqestData.export ) {
-          if ( resultData.summaryData.length>0 ) {
+          if ( resultData.summaryData.length > 0 ) {
             const exportdata = [];
             resultData.summaryData.forEach( ( element ) => {
               if ( reqestData.clientId === '193' ) {
@@ -636,6 +636,7 @@ export const summaryTableV3 = async ( req, res ) => {
                   'NOB Count': element.NOBCount,
                   'Avg.Dwell Time': element.avgDwellTime,
                   'Avg.Infra DownTime': element.avgInfraDowntime,
+                  ...( element.passerBy_count !== undefined ? { 'Passer By': element.passerBy_count } : {} ),
                   'Below12': element.below12,
                   '13-19': element['13-19'],
                   '20-30': element['20-30'],
@@ -660,6 +661,7 @@ export const summaryTableV3 = async ( req, res ) => {
                   'NOB Count': element.NOBCount,
                   'Avg.Dwell Time': element.avgDwellTime,
                   'Avg.Infra DownTime': element.avgInfraDowntime,
+                  ...( element.passerBy_count !== undefined ? { 'Passer By': element.passerBy_count } : {} ),
                   'Below12': element.below12,
                   '13-19': element['13-19'],
                   '20-30': element['20-30'],

package/src/dtos/nob.dtos.js

@@ -8,10 +8,15 @@ export const addBillsSchema = joi.object( {
           'string.empty': 'Please enter a valid Store ID',
           'any.required': 'Store ID is required',
         } ).allow( null ),
-        nobDate: joi.string().required().messages( {
-          'string.empty': 'Please enter a valid NOB Date',
-          'any.required': 'NOB Date is required',
-        } ).allow( null ),
+        nobDate: joi.string()
+            .pattern( /^\d{4}-\d{2}-\d{2}$/ ) // Ensures format YYYY-MM-DD
+            .required()
+            .messages( {
+              'string.pattern.base': 'NOB Date must be in YYYY-MM-DD format',
+              'string.empty': 'Please enter a valid NOB Date',
+              'any.required': 'NOB Date is required',
+            } )
+            .allow( null ),
         nobCount: joi.number().required().messages( {
           'string.empty': 'Please enter a valid NOB Count',
           'any.required': 'NOB Count is required',

package/src/dtos/validation.dtos.js

@@ -10,6 +10,7 @@ const baseSchema = {
   nob: joi.boolean().optional().allow( '' ),
   dateType: joi.string().optional().allow( '' ),
   normalize: joi.boolean().optional().allow( '' ),
+  conversiontype: joi.string().optional().allow( '' ),
 };
 
 // Schema for Card Funnel
@@ -37,6 +38,7 @@ export const validateRecapVideoSchema = joi.object( {
   recapVideoDate: joi.string().required(),
   valueType: joi.string().optional().allow( '' ),
   nob: joi.boolean().optional().allow( '' ),
+  conversiontype: joi.string().optional().allow( '' ),
 } );
 
 export const validateRecapVideoParams = {

package/src/routes/revop.routes.js

@@ -0,0 +1,13 @@
+
+import express from 'express';
+import { getconfig, revoptagging } from '../controllers/revop.controller.js';
+import { isAllowedSessionHandler, isAllowedClient } from 'tango-app-api-middleware';
+
+export const revopRouter = express.Router();
+
+revopRouter
+    .get( '/getconfig', isAllowedSessionHandler, isAllowedClient, getconfig )
+    .post( '/tagging', isAllowedSessionHandler, isAllowedClient, revoptagging ); ;
+
+
+export default revopRouter;

package/src/services/revopConfig.service.js

@@ -0,0 +1,16 @@
+import revopConfigModel from 'tango-api-schema/schema/revopConfig.model.js';
+
+
+export async function createrevopConfig( field = {} ) {
+  return await revopConfigModel.create( field );
+};
+export async function findOnerevopConfig( query = {} ) {
+  return await revopConfigModel.findOne( query );
+};
+
+export async function updaterevopConfig( data={}, field = {} ) {
+  return await revopConfigModel.updateOne( data, { $set: field } );
+};
+export async function aggregaterevopconfig( data ) {
+  return await revopConfigModel.aggregate( data );
+};