tango-app-api-infra 3.9.5-vms.71 → 3.9.5-vms.72

package/package.json

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

package/src/controllers/footfallDirectory.controllers.js

@@ -302,7 +302,7 @@ export async function tangoReviewTicket( req, res ) {
     } else if ( revised < tangoReview ) {
       // If ticket is closed, do not proceed with revision mapping
 
-      record.status = 'Closed - Accuracy Issue';
+      record.status = 'Open - Accuracy Issue';
       // Only keep or modify mappingInfo items with type "review"
       if ( Array.isArray( record.mappingInfo ) ) {
         const temp = record.mappingInfo
@@ -322,14 +322,14 @@ export async function tangoReviewTicket( req, res ) {
 
         record.mappingInfo = [ ...ticketData?.[0]?._source?.mappingInfo.slice( 0, -1 ),
           ...temp ];
-        if ( Array.isArray( record.mappingInfo ) ) {
-          record.mappingInfo = record.mappingInfo.map( ( item ) => {
-            return {
-              ...item,
-              status: 'Closed',
-            };
-          } );
-        }
+        // if ( Array.isArray( record.mappingInfo ) ) {
+        //   record.mappingInfo = record.mappingInfo.map( ( item ) => {
+        //     return {
+        //       ...item,
+        //       status: 'Closed',
+        //     };
+        //   } );
+        // }
         // If no review mapping existed, push a new one
         // if ( record.mappingInfo.length === 0 ) {
         //   record.mappingInfo.push( {
@@ -445,7 +445,7 @@ export async function tangoReviewTicket( req, res ) {
     }
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
-    logger.error( { error: err, funtion: 'tangoReviewTicket' } );
+    logger.error( { error: error, funtion: 'tangoReviewTicket' } );
     return res.sendError( err, 500 );
   }
 }
@@ -453,44 +453,8 @@ export async function tangoReviewTicket( req, res ) {
 export async function tangoReviewAccuracyClosedTicket( req, res ) {
   try {
     const inputData = req.body;
-
-    // get store info by the storeId into mongo db
-    const getstoreName = await findOneStore( { storeId: inputData.storeId, status: 'active' }, { storeId: 1, storeName: 1, clientId: 1 } );
-
-    if ( !getstoreName || getstoreName == null ) {
-      return res.sendError( 'The store ID is either inActive or not found', 400 );
-    }
-
-    // get the footfall count from opensearch
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-    const dateString = `${inputData.storeId}_${inputData.dateString}`;
-    const getQuery = {
-      query: {
-        terms: {
-          _id: [ dateString ],
-        },
-      },
-      _source: [ 'footfall', 'date_string', 'store_id', 'down_time', 'footfall_count' ],
-      sort: [
-        {
-          date_iso: {
-            order: 'desc',
-          },
-        },
-      ],
-    };
 
-    const getFootfallCount = await getOpenSearchData( openSearch.footfall, getQuery );
-    const hits = getFootfallCount?.body?.hits?.hits || [];
-    if ( hits?.[0]?._source?.footfall_count <= 0 ) {
-      return res.sendError( 'You can’t create a ticket because this store has 0 footfall data' );
-    }
-
-    // get category details from the client level configuration
-    const getConfig = await findOneClient( { clientId: getstoreName.clientId }, { footfallDirectoryConfigs: 1 } );
-    if ( !getConfig || getConfig == null ) {
-      return res.sendError( 'The Client ID is either not configured or not found', 400 );
-    }
     let findQuery = {
       size: 10000,
       query: {
@@ -566,192 +530,61 @@ export async function tangoReviewAccuracyClosedTicket( req, res ) {
 
     const record = {
 
-      status: parseInt( inputData?.mappingInfo?.[0]?.revicedPerc || 0 ) < parseInt( getConfig?.footfallDirectoryConfigs?.tangoReview|| 0 ) ? 'Open - Accuracy Issue' : 'Closed',
-      revicedFootfall: inputData.mappingInfo?.[0]?.revicedFootfall,
-      revicedPerc: inputData.mappingInfo?.[0]?.revicedPerc,
-      mappingInfo: ticketData?.[0]?._source?.mappingInfo,
+      status: 'Closed - Accuracy Issue',
       createdByEmail: req?.user?.email,
       createdByUserName: req?.user?.userName,
       createdByRole: req?.user?.role,
-
+      mappingInfo: ticketData?.[0]?._source?.mappingInfo,
     };
 
-
-    // Retrieve client footfallDirectoryConfigs revision
-    let isAutoCloseEnable = getConfig.footfallDirectoryConfigs.isAutoCloseEnable;
-    let autoCloseAccuracy = getConfig?.footfallDirectoryConfigs?.autoCloseAccuracy;
-
-    const getNumber = autoCloseAccuracy.split( '%' )[0];
-
-    let autoCloseAccuracyValue = parseFloat( ( autoCloseAccuracy || getNumber ).replace( '%', '' ) );
-    let revisedPercentage = inputData.mappingInfo?.revicedPerc;
-    const revised = Number( revisedPercentage?.split( '%' )[0] );
-    const tangoReview = Number( getConfig?.footfallDirectoryConfigs?.tangoReview?.split( '%' )[0] );
     // If autoclose enabled and revisedPercentage meets/exceeds threshold, close ticket and skip revision
-    if (
-      isAutoCloseEnable === true &&
-      revisedPercentage >= autoCloseAccuracyValue
-    ) {
-      record.status = 'Closed';
-      // Only keep or modify mappingInfo items with type "review"
-      if ( Array.isArray( record.mappingInfo ) ) {
-        const temp = record.mappingInfo
-            .filter( ( item ) => item.type === 'tangoreview' )
-            .map( ( item ) => ( {
-              ...item,
 
-              mode: inputData.mappingInfo?.mode,
-              revicedFootfall: inputData.mappingInfo?.revicedFootfall,
-              revicedPerc: inputData.mappingInfo?.revicedPerc,
-              count: inputData.mappingInfo?.count,
-              revisedDetail: inputData.mappingInfo?.revisedDetail,
-              status: 'Closed',
-              createdByEmail: req?.user?.email,
-              createdByUserName: req?.user?.userName,
-              createdByRole: req?.user?.role,
-            } ) );
-
-        record.mappingInfo = [ ...ticketData?.[0]?._source?.mappingInfo.slice( 0, -1 ),
-          ...temp ];
-        // If updating the mapping config to mark [i].status as 'Closed'
-        // Make sure all relevant mappingInfo items of type 'approve' are set to status 'Closed'
-        if ( Array.isArray( record.mappingInfo ) ) {
-          record.mappingInfo = record.mappingInfo.map( ( item ) => {
-            return {
-              ...item,
-              status: 'Closed',
-            };
-          } );
-        }
-        // If no review mapping existed, push a new one
-        // if ( record.mappingInfo.length === 0 ) {
-        //   record.mappingInfo.push( {
-        //     type: 'tangoreview',
-        //     mode: inputData.mappingInfo?.mode,
-        //     revicedFootfall: inputData.mappingInfo?.revicedFootfall,
-        //     revicedPerc: inputData.mappingInfo?.revicedPerc,
-        //     count: inputData.mappingInfo?.count,
-        //     revisedDetail: inputData.mappingInfo?.revisedDetail,
-        //     status: 'Closed',
-        //     createdByEmail: req?.user?.email,
-        //     createdByUserName: req?.user?.userName,
-        //     createdByRole: req?.user?.role,
-        //   } );
-        // }
-      }
-      record.mappingInfo.push(
-          {
-            type: 'finalRevision',
-            mode: inputData.mappingInfo?.mode,
-            revicedFootfall: revisedFootfall,
-            revicedPerc: inputData.mappingInfo?.revicedPerc,
-            count: inputData.mappingInfo?.count,
-            revisedDetail: inputData.mappingInfo?.revisedDetail,
+    if ( Array.isArray( record.mappingInfo ) ) {
+      const temp = record.mappingInfo
+          .filter( ( item ) => item.type === 'tangoreview' )
+          .map( ( item ) => ( {
+            ...item,
             status: 'Closed',
             createdByEmail: req?.user?.email,
             createdByUserName: req?.user?.userName,
             createdByRole: req?.user?.role,
-            createdAt: new Date(),
-          },
-      );
-    } else if ( revised < tangoReview ) {
-      // If ticket is closed, do not proceed with revision mapping
+          } ) );
 
-      record.status = 'Closed - Accuracy Issue';
-      // Only keep or modify mappingInfo items with type "review"
+      record.mappingInfo = [ ...ticketData?.[0]?._source?.mappingInfo.slice( 0, -1 ),
+        ...temp ];
       if ( Array.isArray( record.mappingInfo ) ) {
-        const temp = record.mappingInfo
-            .filter( ( item ) => item.type === 'tangoreview' )
-            .map( ( item ) => ( {
-              ...item,
-              mode: inputData.mappingInfo?.mode,
-              revicedFootfall: inputData.mappingInfo?.revicedFootfall,
-              revicedPerc: inputData.mappingInfo?.revicedPerc,
-              count: inputData.mappingInfo?.count,
-              revisedDetail: inputData.mappingInfo?.revisedDetail,
-              status: 'Closed',
-              createdByEmail: req?.user?.email,
-              createdByUserName: req?.user?.userName,
-              createdByRole: req?.user?.role,
-            } ) );
-
-        record.mappingInfo = [ ...ticketData?.[0]?._source?.mappingInfo.slice( 0, -1 ),
-          ...temp ];
-        if ( Array.isArray( record.mappingInfo ) ) {
-          record.mappingInfo = record.mappingInfo.map( ( item ) => {
-            return {
-              ...item,
-              status: 'Closed',
-            };
-          } );
-        }
-        // If no review mapping existed, push a new one
-        // if ( record.mappingInfo.length === 0 ) {
-        //   record.mappingInfo.push( {
-        //     type: 'tangoreview',
-        //     mode: inputData.mappingInfo?.mode,
-        //     revicedFootfall: inputData.mappingInfo?.revicedFootfall,
-        //     revicedPerc: inputData.mappingInfo?.revicedPerc,
-        //     count: inputData.mappingInfo?.count,
-        //     revisedDetail: inputData.mappingInfo?.revisedDetail,
-        //     status: 'Closed',
-        //     createdByEmail: req?.user?.email,
-        //     createdByUserName: req?.user?.userName,
-        //     createdByRole: req?.user?.role,
-        //   } );
-        // }
+        record.mappingInfo = record.mappingInfo.map( ( item ) => {
+          return {
+            ...item,
+            status: 'Closed',
+          };
+        } );
       }
-    } else {
-      if ( Array.isArray( record.mappingInfo ) ) {
-        const temp = record.mappingInfo
-            .filter( ( item ) => item.type === 'tangoreview' )
-            .map( ( item ) => ( {
-              ...item,
-              mode: inputData.mappingInfo?.mode,
-              revicedFootfall: inputData.mappingInfo?.revicedFootfall,
-              revicedPerc: inputData.mappingInfo?.revicedPerc,
-              count: inputData.mappingInfo?.count,
-              revisedDetail: inputData.mappingInfo?.revisedDetail,
-              status: 'Closed',
-              createdByEmail: req?.user?.email,
-              createdByUserName: req?.user?.userName,
-              createdByRole: req?.user?.role,
-            } ) );
 
-        record.mappingInfo = [ ...ticketData?.[0]?._source?.mappingInfo.slice( 0, -1 ),
-          ...temp ];
-        if ( Array.isArray( record.mappingInfo ) ) {
-          record.mappingInfo = record.mappingInfo.map( ( item ) => {
-            return {
-              ...item,
-              status: 'Closed',
-            };
-          } );
-        }
-        // If no review mapping existed, push a new one
-        // if ( record.mappingInfo.length === 0 ) {
-        //   record.mappingInfo.push( {
-        //     type: 'tangoreview',
-        //     mode: inputData.mappingInfo?.mode,
-        //     revicedFootfall: inputData.mappingInfo?.revicedFootfall,
-        //     revicedPerc: inputData.mappingInfo?.revicedPerc,
-        //     count: inputData.mappingInfo?.count,
-        //     revisedDetail: inputData.mappingInfo?.revisedDetail,
-        //     status: 'Closed',
-        //     createdByEmail: req?.user?.email,
-        //     createdByUserName: req?.user?.userName,
-        //     createdByRole: req?.user?.role,
-        //   } );
-        // }
-      }
+
+      // If no review mapping existed, push a new one
+      // if ( record.mappingInfo.length === 0 ) {
+      //   record.mappingInfo.push( {
+      //     type: 'tangoreview',
+      //     mode: inputData.mappingInfo?.mode,
+      //     revicedFootfall: temp?.mappingInfo?.revicedFootfall,
+      //     revicedPerc: temp?.mappingInfo?.revicedPerc,
+      //     count: temp?.mappingInfo?.count,
+      //     revisedDetail: temp?.mappingInfo?.revisedDetail,
+      //     status: 'Closed',
+      //     createdByEmail: req?.user?.email,
+      //     createdByUserName: req?.user?.userName,
+      //     createdByRole: req?.user?.role,
+      //   } );
+      // }
       record.mappingInfo.push(
           {
             type: 'finalRevision',
-            mode: inputData.mappingInfo?.mode,
-            revicedFootfall: inputData.mappingInfo?.revicedFootfall,
-            revicedPerc: inputData.mappingInfo?.revicedPerc,
-            count: inputData.mappingInfo?.count,
-            revisedDetail: inputData.mappingInfo?.revisedDetail,
+            mode: 'web',
+            revicedFootfall: temp?.[0]?.revicedFootfall,
+            revicedPerc: temp?.[0].revicedPerc,
+            count: temp?.[0].count,
+            revisedDetail: temp?.[0]?.revisedDetail,
             status: 'Closed',
             createdByEmail: req?.user?.email,
             createdByUserName: req?.user?.userName,
@@ -761,35 +594,10 @@ export async function tangoReviewAccuracyClosedTicket( req, res ) {
       );
     }
 
-    if ( Ticket[0]?._source?.type==='store' ) {
-      let findTagging = Ticket[0]?._source?.mappingInfo.filter( ( data ) => data.type==='tagging' );
-      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[0]?._source?.dateString ).format( 'DD MMM YYYY' );
-        let description = `Raised on ${createdOn}`;
 
-        let Data = {
-          'title': title,
-          'body': description,
-          'type': 'closed',
-          'date': Ticket[0]?._source?.dateString,
-          'storeId': Ticket[0]?._source?.storeId,
-          'clientId': Ticket[0]?._source?.clientId,
-          'ticketId': Ticket[0]?._source?.ticketId,
-        };
-        if ( userData && userData.fcmToken ) {
-          const fcmToken = userData.fcmToken;
-          await sendPushNotification( title, description, fcmToken, Data );
-        }
-      }
-    }
     // return;
 
     let id = `${inputData.storeId}_${inputData.dateString}_footfall-directory-tagging`;
-    if ( inputData.ticketType === 'internal' ) {
-      id = `${inputData.storeId}_${inputData.dateString}_internal_footfall-directory-tagging`;
-    }
 
     const insertResult = await updateOpenSearchData( openSearch.footfallDirectory, id, { doc: record } );
 
@@ -800,7 +608,7 @@ export async function tangoReviewAccuracyClosedTicket( req, res ) {
     }
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
-    logger.error( { error: err, funtion: 'tangoReviewTicket' } );
+    logger.error( { error: error, funtion: 'tangoReviewAccuracyClosedTicket' } );
     return res.sendError( err, 500 );
   }
 }

package/src/routes/footfallDirectory.routes.js

@@ -11,7 +11,7 @@ footfallDirectoryRouter.post( '/create-internalticket', isAllowedSessionHandler,
 footfallDirectoryRouter.post( '/checkTicketExists', isAllowedSessionHandler, checkTicketExists );
 
 footfallDirectoryRouter.post( '/tango-review-ticket', isAllowedSessionHandler, validate( tangoReviewTicketValid ), tangoReviewTicket );
-footfallDirectoryRouter.post( '/tango-review-ticket', isAllowedSessionHandler, validate( tangoReviewAccuracyClosedTicketValid ), tangoReviewAccuracyClosedTicket );
+footfallDirectoryRouter.post( '/tango-review-accuracy-ticket', isAllowedSessionHandler, validate( tangoReviewAccuracyClosedTicketValid ), tangoReviewAccuracyClosedTicket );
 
 footfallDirectoryRouter.get( '/ticket-summary', isAllowedSessionHandler, bulkValidate( ticketSummaryValid ), ticketSummary );