tango-app-api-infra 3.9.5-vms.90 → 3.9.5-vms.91

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.9.5-vms.90",
+    "version": "3.9.5-vms.91",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/footfallDirectory.controllers.js

@@ -3033,6 +3033,7 @@ export async function ticketList( req, res ) {
         if ( inputData?.isExport ) {
           const exportData = [];
           for ( let item of ticketListData ) {
+            console.log( item );
             exportData.push( {
 
               'Ticket ID': item?.ticketId,
@@ -3054,25 +3055,26 @@ export async function ticketList( req, res ) {
               'Reviewer (%)': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.revicedPerc || '--',
               'Approver (%)': item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.revicedPerc || '--',
               'Tango (%)': item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.revicedPerc || '--',
-              'Ticket Status': item?.status,
-              'Tango Status': item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.status || '--',
+              'Ticket Status': item?.type === 'store'? item?.status : '',
+              'Tango Status': item?.type === 'store'? item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.status || '--' : item.status,
 
             } );
           }
           return await download( exportData, res );
         } else {
           for ( let item of ticketListData ) {
+            console.log( '🚀 ~ ticketList ~ item:', item );
             temp.push( {
 
               ticketId: item?.ticketId,
               storeId: item?.storeId,
               storeName: item?.storeName,
-              ticketRaised: item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.createdAt,
+              ticketRaised: item?.mappingInfo?.find( ( f ) => f?.type === 'tagging' )?.createdAt,
               issueDate: item?.dateString,
               footfall: item?.footfallCount,
               dueDate: ( () => {
                 if ( Array.isArray( item?.mappingInfo ) ) {
-                  const filtered = item.mappingInfo.filter( ( f ) => f.dueDate && f.type !== 'finalRevisoon' );
+                  const filtered = item.mappingInfo.filter( ( f ) => f?.dueDate && f?.type !== 'finalRevisoon' );
                   return filtered.length > 0 ? filtered[filtered.length - 1].dueDate : '';
                 }
                 return '';
@@ -3287,7 +3289,7 @@ export async function getTickets( req, res ) {
     const inputData = req.query;
 
 
-    let source = [ 'storeId', 'type', 'dateString', 'ticketName', 'revicedFootfall', 'revicedPerc', 'mappingInfo', 'footfallCount', 'employeeCount', 'houseKeepingCount', 'duplicateCount', 'junkCount', 'junkACCount', 'comments', 'employee', 'houseKeeping', 'junk', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'email', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'junkStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'approverRole', 'approverUserName', 'approverEmail', 'type' ];
+    let source = [ 'storeId', 'createdByEmail', 'type', 'dateString', 'ticketName', 'revicedFootfall', 'revicedPerc', 'mappingInfo', 'footfallCount', 'employeeCount', 'houseKeepingCount', 'duplicateCount', 'junkCount', 'junkACCount', 'comments', 'employee', 'houseKeeping', 'junk', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'email', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'junkStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'approverRole', 'approverUserName', 'approverEmail', 'type' ];
     let filter = [
 
       {
@@ -3334,6 +3336,7 @@ export async function getTickets( req, res ) {
       response.map( ( hit ) => {
         const defaultData = {
           storeId: hit._source.storeId,
+          createdByEmail: hit?._source?.createdByEmail,
           dateString: hit?._source?.dateString,
           ticketName: hit?._source?.ticketName,
           status: hit?._source?.status?.revicedFootfall,
@@ -4457,6 +4460,14 @@ async function extractTempIds( document ) {
 export async function reviewerList( req, res ) {
   try {
     const inputData = req.query;
+
+    console.log( '🚀 ~ reviewerList ~ inputData.tangotype:', inputData.tangotype );
+    if ( inputData.tangotype!=''&&inputData.tangotype==='internal' ) {
+      const getUserlist = await findUser( { userType: 'tango' }, { userName: 1, email: 1, role: 1 } );
+      return res.sendSuccess( getUserlist || [] );
+    }
+
+
     // Build the query for users who have rolespermission with featureName "FootfallDirectory",
     // and a module "Reviewer" where isAdd or isEdit is true.
     const reviewerRoleQuery = {

package/src/dtos/footfallDirectory.dtos.js

@@ -515,6 +515,7 @@ export const downloadTicketsValid = {
 
 export const reviewerListSchema = Joi.object().keys( {
   clientId: Joi.string().required(),
+  tangotype: Joi.string().optional(),
   type: Joi.string().required().allow( 'approve', 'review' ),
 } );
 

package/src/validations/footfallDirectory.validation.js

@@ -1,4 +1,4 @@
-import { bulkUpdate, getOpenSearchCount, getOpenSearchData, insertWithId, logger, sendMessageToFIFOQueue, updateOpenSearchData } from 'tango-app-api-middleware';
+import { bulkUpdate, getOpenSearchCount, getOpenSearchData, insertWithId, logger, sendMessageToFIFOQueue, updateOpenSearchData, getOpenSearchById } from 'tango-app-api-middleware';
 import { aggregateCluster } from '../services/cluster.service.js';
 import { findOneRevopDownload } from '../services/revopDownload.service.js';
 import { findOneStore } from '../services/store.service.js';
@@ -957,13 +957,14 @@ export async function ticketReview( req, res, next ) {
     // check the createtion permission from the user permission
     const userInfo = req?.user;
     const ticketsFeature = userInfo?.rolespermission?.some( ( f ) => f.featureName === 'FootfallDirectory' && ( f.modules.find( ( m ) => m.name == 'reviewer' && ( m.isAdd == true || m.isEdit == true ) ) ) );
+    logger.info( { ticketsFeature, userInfo } );
     if ( !ticketsFeature ) {
       return res.sendError( 'Forbidden to Reiew this Ticket', 403 );
     }
 
     // get store info by the storeId into mongo db
     const getstoreName = await findOneStore( { storeId: inputData.storeId, status: 'active' }, { storeId: 1, storeName: 1, clientId: 1 } );
-
+    logger.info( { getstoreName } );
     if ( !getstoreName || getstoreName == null ) {
       return res.sendError( 'The store ID is either inActive or not found', 400 );
     }
@@ -1074,6 +1075,8 @@ export async function ticketReview( req, res, next ) {
       return res.sendError( 'The Client ID is either not configured or not found', 400 );
     }
 
+    logger.info( { config } );
+
     // Get taggingLimitation from config (check both possible paths)
     const taggingLimitation = getConfig?.effectiveLimitation?.values;
     // Initialize count object from taggingLimitation
@@ -1148,7 +1151,7 @@ export async function ticketReview( req, res, next ) {
 
       const revopData = await getOpenSearchData( openSearch.revop, revopQuery );
       const buckets = revopData?.body?.aggregations?.type_counts?.buckets || [];
-
+      logger.info( { revopData } );
       // Map OpenSearch revopsType values to count object keys
       buckets.forEach( ( bucket ) => {
         const revopsType = bucket.key;
@@ -1181,6 +1184,7 @@ export async function ticketReview( req, res, next ) {
     if ( footfallCount - revisedFootfall == 0 ) {
       return res.sendError( 'Cannot review a ticket because footfall hasn’t changed', 400 );
     }
+    logger.info( { footfallCount, revisedFootfall } );
     const taggingData = {
       size: 10000,
       query: {
@@ -1213,6 +1217,16 @@ export async function ticketReview( req, res, next ) {
       query: {
         bool: {
           must: [
+            {
+              term: {
+                'type.keyword': 'store',
+              },
+            },
+            {
+              term: {
+                'type.keyword': 'store',
+              },
+            },
             {
               term: {
                 'storeId.keyword': inputData.storeId,
@@ -1233,6 +1247,7 @@ export async function ticketReview( req, res, next ) {
     if ( !ticketData || ticketData?.length == 0 ) {
       return res.sendError( 'You don’t have any tagged images right now', 400 );
     }
+    logger.info( { ticketData, mappingInfo: ticketData?.[0]?._source?.mappingInfo } );
     const record = {
 
       status: 'Reviewer-Closed',
@@ -1245,7 +1260,7 @@ export async function ticketReview( req, res, next ) {
       // createdByRole: req?.user?.role,
 
     };
-
+    logger.info( { record } );
     if ( Array.isArray( record.mappingInfo ) ) {
       const temp = record.mappingInfo
           .filter( ( item ) => item.type === 'review' )
@@ -1287,7 +1302,7 @@ export async function ticketReview( req, res, next ) {
     // Retrieve client footfallDirectoryConfigs revision
     let isAutoCloseEnable = getConfig?.footfallDirectoryConfigs?.isAutoCloseEnable; ;
     let autoCloseAccuracy = getConfig?.footfallDirectoryConfigs?.autoCloseAccuracy;
-
+    logger.info( { isAutoCloseEnable, autoCloseAccuracy } );
 
     const getNumber = autoCloseAccuracy.split( '%' )[0];
     let autoCloseAccuracyValue = parseFloat( ( autoCloseAccuracy || getNumber ).replace( '%', '' ) );
@@ -1366,13 +1381,14 @@ export async function ticketReview( req, res, next ) {
             createdAt: new Date(),
           },
       );
+      logger.info( { revisedPercentage } );
     } else {
       // If ticket is closed, do not proceed with revision mapping
       let revisionArray = [];
 
 
       revisionArray = getConfig?.footfallDirectoryConfigs?.revision || [];
-
+      logger.info( { revisionArray } );
 
       // Default fallbacks
       let revisionMapping = null;
@@ -1405,7 +1421,7 @@ export async function ticketReview( req, res, next ) {
           }
         }
       }
-
+      logger.info( { record } );
       // Insert appropriate mappingInfo blocks
       if ( revisionMapping ) {
         // If reviewer and checked
@@ -1422,7 +1438,7 @@ export async function ticketReview( req, res, next ) {
     let checkreview = getConfig.footfallDirectoryConfigs.revision.filter( ( data ) => data.actionType === 'reviewer' && data.isChecked === true );
 
 
-    if ( checkreview.length > 0 ) {
+    if ( checkreview.length > 0&&record.status!='Reviewer-Closed' ) {
       let userQuery = [
         {
           $match: {
@@ -1441,6 +1457,7 @@ export async function ticketReview( req, res, next ) {
         let createdOn = dayjs().format( 'DD MMM YYYY' );
         let description = `Created on ${createdOn}`;
 
+
         let Data = {
           'title': title,
           'body': description,
@@ -1463,6 +1480,36 @@ export async function ticketReview( req, res, next ) {
     }
 
     const id = `${inputData.storeId}_${inputData.dateString}_footfall-directory-tagging`;
+    console.log( '-----', record.status );
+    if ( record.status==='Reviewer-Closed' ) {
+      console.log( '🚀 ~ ticketReview ~ id:', id );
+      let Ticket = await getOpenSearchById( openSearch.footfallDirectory, id );
+      console.log( '🚀 ~ ticketReview ~ Ticket:', Ticket.body );
+      if ( Ticket?.body?._source?.type==='store' ) {
+        let findTagging = Ticket?.body?._source?.mappingInfo.filter( ( data ) => data.type==='tagging' );
+        if ( findTagging?.length>0&&findTagging[0].createdByEmail!='' ) {
+          let userData = await findOneUser( { email: findTagging[0]?.createdByEmail } );
+          console.log( '🚀 ~ ticketReview ~ findTagging[0]?.createdByEmail:', findTagging[0]?.createdByEmail );
+          let title = `Received response for the Footfall ticket raised.`;
+          let createdOn = dayjs( Ticket?.body?._source?.dateString ).format( 'DD MMM YYYY' );
+          let description = `Raised on ${createdOn}`;
+
+          let Data = {
+            'title': title,
+            'body': description,
+            'type': 'closed',
+            'date': Ticket?.body?._source?.dateString,
+            'storeId': Ticket?.body?._source?.storeId,
+            'clientId': Ticket?.body?._source?.clientId,
+            'ticketId': Ticket?.body?._source?.ticketId,
+          };
+          if ( userData && userData.fcmToken ) {
+            const fcmToken = userData.fcmToken;
+            await sendPushNotification( title, description, fcmToken, Data );
+          }
+        }
+      }
+    }
     const insertResult = await updateOpenSearchData( openSearch.footfallDirectory, id, { doc: record } );
 
     if ( insertResult && insertResult.statusCode === 201 || insertResult.statusCode === 200 ) {
@@ -1552,7 +1599,7 @@ export async function ticketReview( req, res, next ) {
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.error( { error: err, funtion: 'ticketreview' } );
-    return res.sendError( err, 500 );
+    return res.sendError( error, 500 );
   }
 }
 
@@ -1834,6 +1881,11 @@ export async function ticketApprove( req, res, next ) {
       query: {
         bool: {
           must: [
+            {
+              term: {
+                'type.keyword': 'store',
+              },
+            },
             {
               term: {
                 'storeId.keyword': inputData.storeId,
@@ -2136,6 +2188,37 @@ export async function ticketApprove( req, res, next ) {
     }
 
     const id = `${inputData.storeId}_${inputData.dateString}_footfall-directory-tagging`;
+    console.log( '🚀 ~ ticketReview ~ id:', id );
+    console.log( '🚀 ~ ticketReview ~ id:', id );
+    console.log( '🚀 ~ ticketReview ~ id:', id );
+    if ( record.status==='Approver-Closed' ) {
+      let Ticket = await getOpenSearchById( openSearch.footfallDirectory, id );
+      console.log( '🚀 ~ ticketApprove ~ Ticket:', Ticket?.body );
+      if ( Ticket?.body?._source?.type==='store' ) {
+        let findTagging = Ticket?.body?._source?.mappingInfo.filter( ( data ) => data.type==='tagging' );
+        console.log( '🚀 ~ ticketApprove ~ findTagging[0].createdByEmail:', findTagging[0].createdByEmail );
+        if ( findTagging?.length>0&&findTagging[0].createdByEmail!='' ) {
+          let userData = await findOneUser( { email: findTagging[0]?.createdByEmail } );
+          let title = `Received response for the Footfall ticket raised.`;
+          let createdOn = dayjs( Ticket?.body?._source?.dateString ).format( 'DD MMM YYYY' );
+          let description = `Raised on ${createdOn}`;
+
+          let Data = {
+            'title': title,
+            'body': description,
+            'type': 'closed',
+            'date': Ticket?.body?._source?.dateString,
+            'storeId': Ticket?.body?._source?.storeId,
+            'clientId': Ticket?.body?._source?.clientId,
+            'ticketId': Ticket?.body?._source?.ticketId,
+          };
+          if ( userData && userData.fcmToken ) {
+            const fcmToken = userData.fcmToken;
+            await sendPushNotification( title, description, fcmToken, Data );
+          }
+        }
+      }
+    }
     const insertResult = await updateOpenSearchData( openSearch.footfallDirectory, id, { doc: record } );