tango-app-api-trax 1.0.0-alpha.76 → 1.0.0-alpha.78

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "1.0.0-alpha.76",
+    "version": "1.0.0-alpha.78",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/internalTrax.controller.js

@@ -11,8 +11,8 @@ import utc from 'dayjs/plugin/utc.js';
 import { logger } from 'tango-app-api-middleware';
 import mongoose from 'mongoose';
 const ObjectId = mongoose.Types.ObjectId;
-dayjs.extend( utc );
 dayjs.extend( customParseFormat );
+dayjs.extend( utc );
 
 export async function PCLchecklistCreationValidator( req, res, next ) {
   try {
@@ -111,6 +111,7 @@ async function insertData( requestData ) {
           type: 'checklist',
           isdeleted: false,
           publish: true,
+          checkListType: 'custom',
           // $and:[{createdAt: { $gte: start }}, {createdAt:{ $lte: end }}]
         },
       } );
@@ -253,8 +254,8 @@ async function insertData( requestData ) {
             let getCLconfig = await CLconfig.findOne( { _id: element2 } );
             if ( getCLconfig ) {
               let startTimeIso; let endTimeIso;
-              startTimeIso = dayjs.utc( `${date} ${getCLconfig.scheduleStartTime}`, 'YYYY-MM-DD hh:mm A' );
-              endTimeIso = dayjs.utc( `${date} ${getCLconfig.scheduleEndTime}`, 'YYYY-MM-DD hh:mm A' );
+              startTimeIso = dayjs.utc( `${currentdate} ${getCLconfig.scheduleStartTime}`, 'YYYY-MM-DD hh:mm A' );
+              endTimeIso = dayjs.utc( `${currentdate} ${getCLconfig.scheduleEndTime}`, 'YYYY-MM-DD hh:mm A' );
               let insertdata = {};
               insertdata.date_iso = new Date( currentdate );
               insertdata.date_string = currentdate;
@@ -395,15 +396,6 @@ async function insertData( requestData ) {
                                   $lte: new Date( dayjs( getCLconfig.configEndDate ).format( 'YYYY-MM-DD' ) ) },
                               } ],
                             };
-                            // if(getCLconfig.configStartDate != '' && getCLconfig.configStartDate != null) {
-                            //     query.$and = [
-                            //         {
-                            //             date_iso:{
-                            //                 $gte:new Date(dayjs(getCLconfig.configStartDate).format('YYYY-MM-DD')),
-                            //                 ...(getCLconfig.configEndDate != '' && getCLconfig.configEndDate != null) ? {$lte:new Date(dayjs(getCLconfig.configEndDate).format('YYYY-MM-DD'))} : {}}
-                            //         }
-                            //     ]
-                            // }
                           }
                           let getsubmitDetails = await processedchecklist.find( query );
                           if ( getsubmitDetails.length ) {
@@ -499,7 +491,7 @@ export async function insertTimeDelayFlags( req, res ) {
     } ];
     let currentTime = dayjs().format( 'HH:mm:ss' );
     console.log( currentTime );
-    console.log( dayjs.utc().format( 'HH:mm:ss' ) );
+    console.log( dayjs.utc( new Date() ).format( 'HH:mm:ss' ) );
 
     if ( req.body.time ) {
       query.push( {

package/src/controllers/mobileTrax.controller.js

@@ -13,6 +13,7 @@ const ObjectId = mongoose.Types.ObjectId;
 import customParseFormat from 'dayjs/plugin/customParseFormat.js';
 import timeZone from 'dayjs/plugin/timezone.js';
 import { findOTP, updateOneOTP } from '../services/otp.service.js';
+import * as clientService from '../services/clients.services.js';
 import { create } from '../services/authentication.service.js';
 import { readFileSync } from 'fs';
 import { join } from 'path';
@@ -1264,3 +1265,84 @@ export const sendSignInOtpEmail = async ( emailVars ) => {
     return error;
   }
 };
+
+
+export async function location( req, res ) {
+  try {
+    let input = req.body;
+    if ( input.latitude && input.longitude ) {
+      let storeLatitude = req.sop_assigned_store.latitude;
+      let storeLongitude = req.sop_assigned_store.longitude;
+
+      function degreesToRadians( degrees ) {
+        let radians = ( degrees * Math.PI ) / 180;
+        return radians;
+      }
+
+      function calcDistance( startingCoords, destinationCoords ) {
+        let startingLat = degreesToRadians( startingCoords.latitude );
+        let startingLong = degreesToRadians( startingCoords.longitude );
+        let destinationLat = degreesToRadians( destinationCoords.latitude );
+        let destinationLong = degreesToRadians( destinationCoords.longitude );
+
+        // Radius of the Earth in kilometers
+        let radius = 6571;
+
+        // Haversine equation
+        let distanceInKilometers =
+                        Math.acos( Math.sin( startingLat ) * Math.sin( destinationLat ) +
+                        Math.cos( startingLat ) * Math.cos( destinationLat ) *
+                        Math.cos( startingLong - destinationLong ) ) * radius;
+        return distanceInKilometers*1000; // to metres
+      }
+
+      let sCoords = {
+        latitude: storeLatitude,
+        longitude: storeLongitude,
+      };
+
+      let dCoords = {
+        latitude: input.latitude,
+        longitude: input.longitude,
+      };
+
+      let distance = calcDistance( sCoords, dCoords );
+
+      let brand = await clientService.findOne( { clientId: req.user.clientId } );
+
+      let radiusConfigured = brand ? ( brand.storeRadiusConfig ? brand.storeRadiusConfig : 500 ) : 500;
+
+      if ( distance<=radiusConfigured ) {
+        return res.sendSuccess( { locationRadiusCheck: true, distance: distance, unit: 'metre' } );
+      } else {
+        return res.sendSuccess( { locationRadiusCheck: false, distance: distance, unit: 'metre' } );
+      }
+    } else {
+      return res.sendError( 'Please include latitude and longitude!', 400 );
+    }
+  } catch ( e ) {
+    logger.error( { error: error, function: 'location' } );
+    return sendError( error, 500 );
+  }
+}
+
+export async function getStoreLocation( req, res, next ) {
+  try {
+    let input = req.body;
+    if ( input.store_id ) {
+      let storeDetails = await storeService.findOne( { storeId: input.store_id }, { storeProfile: 1 } );
+      if ( storeDetails ) {
+        req.sop_assigned_store = storeDetails.storeProfile;
+        next();
+      } else {
+        return res.sendError( 'Invalid store_id provided!', 400 );
+      }
+    } else {
+      return res.sendError( 'No store/Checklist assigned to the user!', 400 );
+    }
+  } catch ( error ) {
+    console.log( 'SOP Mobile store check middleware error=>', error );
+    let msg = error.error ? error.error : error;
+    return res.sendError( msg, 500 );
+  }
+};

package/src/controllers/teaxFlag.controller.js

@@ -585,7 +585,21 @@ export const flagCardsV1 = async ( req, res ) => {
     const getOverallChecklistData = await processedchecklistService.aggregate( findQuery );
 
     if ( !getOverallChecklistData.length ) {
-      return res.sendError( { error: 'No Data Found' }, 204 );
+      const resVal = {
+        'flagCards': {
+          'totalFlag': 0,
+          'questionFlag': {
+            'count': 0,
+          },
+          'delayInSubmission': {
+            'count': 0,
+          },
+          'detectionFlag': {
+            'count': 0,
+          },
+        },
+      };
+      return res.sendSuccess( resVal );
     }
 
     const [ data ] = getOverallChecklistData;
@@ -2060,8 +2074,6 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
         },
       ];
 
-      const rangeOneData = await processedchecklistService.aggregate( range1pipeline );
-
       const range2pipeline = [
         {
           $match: {
@@ -2142,7 +2154,8 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
         },
       ];
 
-      const rangeTwoData = await processedchecklistService.aggregate( range2pipeline );
+      const [ rangeOneData, rangeTwoData ] = await Promise.all( [ processedchecklistService.aggregate( range1pipeline ), processedchecklistService.aggregate( range2pipeline ) ] );
+
 
       if ( rangeOneData.length >0 && rangeTwoData.length >0 ) {
         flagComparisonCards.totalAssignedStores.comparisonData = ( ( ( rangeOneData[0].totalAssignedStores - rangeTwoData[0].totalAssignedStores )/rangeOneData[0].totalAssignedStores )*100 ).toFixed( 2 );
@@ -2151,7 +2164,7 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
         } else {
           flagComparisonCards.totalAssignedStores.ComparisonFlag = false;
         }
-        flagComparisonCards.flagIncidents.comparisonData = ( ( ( rangeOneData[0].totalAssignedStores - rangeTwoData[0].totalAssignedStores )/rangeOneData[0].totalAssignedStores )*100 ).toFixed( 2 );
+        flagComparisonCards.flagIncidents.comparisonData = ( ( ( rangeOneData[0].flagIncidents - rangeTwoData[0].flagIncidents )/rangeOneData[0].flagIncidents )*100 ).toFixed( 2 );
         if ( flagComparisonCards.flagIncidents.comparisonData > 0 ) {
           flagComparisonCards.flagIncidents.ComparisonFlag = true;
         } else {
@@ -2265,24 +2278,31 @@ export const flagChecklistTableV1 = async ( req, res ) => {
   try {
     let reqestData = req.body;
     if ( reqestData.ChecklistType == 'custom' ) {
-      const pipeline = [
-        {
-          $match: {
-            $and: [
-              { client_id: reqestData?.clientId },
-              { store_id: { $in: reqestData?.storeId } },
-              { date_iso: { $gte: new Date( reqestData?.fromDate ) } },
-              { date_iso: { $lte: dayjs.utc( reqestData.toDate ).endOf( 'day' ).toDate() } },
-              { sourceCheckList_id: new mongoose.Types.ObjectId( reqestData.sourceCheckList_id ) },
-              // {
-              //   $or: [
-              //     { timeFlag: { $gt: 0 } },
-              //     { questionFlag: { $gt: 0 } },
-              //   ],
-              // },
-            ],
-          },
+      const match = {
+        $match: {
+          $and: [
+            { client_id: reqestData?.clientId },
+            { store_id: { $in: reqestData?.storeId } },
+            { date_iso: { $gte: new Date( reqestData?.fromDate ) } },
+            { date_iso: { $lte: dayjs.utc( reqestData.toDate ).endOf( 'day' ).toDate() } },
+            { sourceCheckList_id: new mongoose.Types.ObjectId( reqestData.sourceCheckList_id ) },
+            // {
+            //   $or: [
+            //     { timeFlag: { $gt: 0 } },
+            //     { questionFlag: { $gt: 0 } },
+            //   ],
+            // },
+          ],
         },
+      };
+
+      if ( reqestData?.filter === 'question' ) {
+        match.$match.$and.push( { questionFlag: { $gte: 1 } } );
+      } else if ( reqestData?.filter === 'time' ) {
+        match.$match.$and.push( { timeFlag: { $gte: 1 } } );
+      }
+      const pipeline = [
+        match,
         {
           $project: {
             storeSpocEmail: '$userEmail',

package/src/controllers/trax.controller.js

@@ -910,23 +910,18 @@ export const updateConfigure =async ( req, res ) => {
     if ( inputBody?.checkListDetails?.scheduleDate ) {
       inputBody.checkListDetails.scheduleDate = new Date( inputBody?.checkListDetails?.scheduleDate );
     }
-    let scheduleStartTime; let scheduleEndTime;
-    if ( inputBody?.checkListDetails?.scheduleRepeatedType == 'range' ) {
-      scheduleStartTime = inputBody?.checkListDetails?.scheduleStartTime ? dayjs.utc( inputBody?.checkListDetails?.scheduleStartTime, 'YYYY-MM-DD hh:mm A' ) : dayjs();
-      scheduleEndTime = inputBody?.checkListDetails?.scheduleEndTime ? dayjs.utc( inputBody?.checkListDetails?.scheduleEndTime, 'YYYY-MM-DD hh:mm A' ) : dayjs();
-    }
     let configDetails = {
       publish: inputBody?.checkListDetails?.publish,
       publishDate: inputBody.checkListDetails.publish ? new Date() : '',
       schedule: inputBody?.checkListDetails?.schedule,
-      scheduleRepeatedType: inputBody?.checkListDetails?.scheduleRepeatedType,
+      scheduleRepeatedType: inputBody?.checkListDetails?.schedule,
       scheduleRepeatedMonthSetup: inputBody?.checkListDetails?.scheduleRepeatedMonthSetup,
       scheduleRepeatedMonthWeek: inputBody?.checkListDetails?.scheduleRepeatedMonthWeek,
       scheduleRepeatedDay: inputBody?.checkListDetails?.scheduleRepeatedDay,
       scheduleStartTime: inputBody?.checkListDetails?.scheduleStartTime,
-      scheduleStartTimeISO: inputBody?.checkListDetails?.scheduleRepeatedType == 'range' ? scheduleStartTime : inputBody?.checkListDetails?.scheduleStartTime ? dayjs.utc( inputBody?.checkListDetails?.scheduleStartTime, 'hh:mm A' ).format() : dayjs.utc().format(),
+      scheduleStartTimeISO: dayjs.utc().format(),
       scheduleEndTime: inputBody?.checkListDetails?.scheduleEndTime,
-      scheduleEndTimeISO: inputBody?.checkListDetails?.scheduleRepeatedType == 'range' ? scheduleEndTime : inputBody?.checkListDetails?.scheduleEndTime ? dayjs.utc( inputBody?.checkListDetails?.scheduleEndTime, 'hh:mm A' ).format() : dayjs.utc().format(),
+      scheduleEndTimeISO: dayjs.utc().format(),
       scheduleDate: inputBody?.checkListDetails?.scheduleDate ? dayjs( inputBody.checkListDetails.scheduleDate ).format() : '',
       allowedOverTime: inputBody?.checkListDetails?.allowedOverTime,
       allowedStoreLocation: inputBody?.checkListDetails?.allowedStoreLocation,

package/src/dtos/dashboardValidation.dtos.js

@@ -74,6 +74,7 @@ export const validateChecklistInfoSchema = joi.object( {
   groupByType: joi.string().required(),
   groupByValue: joi.string().required(),
   checklistStatus: joi.string().required(),
+
 } );
 
 export const validateChecklistInfoParams = {
@@ -93,6 +94,7 @@ export const validateInfoComparisonCardsSchema = joi.object( {
   ...baseSchema,
   groupByType: joi.string().required(),
   groupByValue: joi.string().required(),
+  dateType: joi.string().required(),
 } );
 
 export const validateInfoComparisonCardsParams = {

package/src/routes/mobileTrax.routes.js

@@ -15,4 +15,5 @@ mobileRouter
     .post( '/uploadAnswerImage', isAllowedSessionHandler, mobileController.uploadAnswerImage )
     .get( '/appVersion', mobileController.appVersion )
     .post( '/appVersion', mobileController.updateappVersion )
+    .post( '/verifylocation', isAllowedSessionHandler, mobileController.getStoreLocation, mobileController.location )
     .post( '/login', mobileController.login );

package/src/routes/trax.routes.js

@@ -1,24 +1,24 @@
 import express from 'express';
-import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
+import { isAllowedSessionHandler, validate, accessVerification } from 'tango-app-api-middleware';
 import { checklistValidation, checklistDetailsValidation, runaiValidation, checklistPageSchema, duplicateValidation, updateChecklistValidation, uploadUserValidation, aichecklistValidation, publishValidation } from '../dtos/validation.dtos.js';
 import * as traxController from '../controllers/trax.controller.js';
 
 export const traxRouter = express.Router();
 
 traxRouter
-    .get( '/checklist', isAllowedSessionHandler, validate( checklistPageSchema ), traxController.checklist )
-    .post( '/checklist/create', isAllowedSessionHandler, validate( checklistValidation ), traxController.create )
-    .get( '/getConfigDetails', isAllowedSessionHandler, validate( checklistDetailsValidation ), traxController.getConfigDetails )
-    .post( '/upload', isAllowedSessionHandler, traxController.uploadImage )
-    .post( '/runAIInsert', isAllowedSessionHandler, validate( runaiValidation ), traxController.runAIInsert )
-    .get( '/duplicateChecklist/:checklistId', isAllowedSessionHandler, validate( duplicateValidation ), traxController.duplicateChecklist )
-    .put( '/checklist/update/:checklistId', isAllowedSessionHandler, validate( updateChecklistValidation ), traxController.update )
-    .post( '/validateUser', isAllowedSessionHandler, validate( uploadUserValidation ), traxController.validateUser )
-    .get( '/userDetails/:checklistId', isAllowedSessionHandler, validate( duplicateValidation ), traxController.assignedUserDetails )
-    .post( '/checklistConfigure', isAllowedSessionHandler, traxController.updateConfigure )
-    .delete( '/deleteChecklist/:checklistId', isAllowedSessionHandler, validate( duplicateValidation ), traxController.deleteChecklist )
-    .put( '/publish', isAllowedSessionHandler, validate( publishValidation ), traxController.updatePublish )
-    .get( '/userList', isAllowedSessionHandler, traxController.userlist )
-    .get( '/zoneList', isAllowedSessionHandler, traxController.zoneList )
-    .get( '/aichecklist', isAllowedSessionHandler, validate( aichecklistValidation ), traxController.aiChecklist )
-    .get( '/predefinedChecklist', isAllowedSessionHandler, validate( aichecklistValidation ), traxController.preDefinedChecklist );
+    .get( '/checklist', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), validate( checklistPageSchema ), traxController.checklist )
+    .post( '/checklist/create', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isAdd' ] } ] } ), validate( checklistValidation ), traxController.create )
+    .get( '/getConfigDetails', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), validate( checklistDetailsValidation ), traxController.getConfigDetails )
+    .post( '/upload', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), traxController.uploadImage )
+    .post( '/runAIInsert', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), validate( runaiValidation ), traxController.runAIInsert )
+    .get( '/duplicateChecklist/:checklistId', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), validate( duplicateValidation ), traxController.duplicateChecklist )
+    .put( '/checklist/update/:checklistId', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), validate( updateChecklistValidation ), traxController.update )
+    .post( '/validateUser', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), validate( uploadUserValidation ), traxController.validateUser )
+    .get( '/userDetails/:checklistId', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), validate( duplicateValidation ), traxController.assignedUserDetails )
+    .post( '/checklistConfigure', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), traxController.updateConfigure )
+    .delete( '/deleteChecklist/:checklistId', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), validate( duplicateValidation ), traxController.deleteChecklist )
+    .put( '/publish', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), validate( publishValidation ), traxController.updatePublish )
+    .get( '/userList', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), traxController.userlist )
+    .get( '/zoneList', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), traxController.zoneList )
+    .get( '/aichecklist', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), validate( aichecklistValidation ), traxController.aiChecklist )
+    .get( '/predefinedChecklist', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), validate( aichecklistValidation ), traxController.preDefinedChecklist );