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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.9.5-vms.70",
+    "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,170 @@ 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 );
+  }
+}
+
+export async function tangoReviewAccuracyClosedTicket( req, res ) {
+  try {
+    const inputData = req.body;
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
+
+    let findQuery = {
+      size: 10000,
+      query: {
+        bool: {
+          must: [
+            {
+              term: {
+                'storeId.keyword': inputData.storeId,
+              },
+            },
+            {
+              term: {
+                'dateString': inputData.dateString,
+              },
+            },
+          ],
+        },
+      },
+    };
+    let findTicket = await getOpenSearchData( openSearch.footfallDirectory, findQuery );
+    let Ticket = findTicket.body?.hits?.hits;
+
+    if ( Ticket.length === 0 ) {
+      return res.sendError( 'Ticket not found', 400 );
+    }
+    const getTicket = {
+      size: 10000,
+      query: {
+        bool: {
+          must: [
+            {
+              term: {
+                'storeId.keyword': inputData.storeId,
+              },
+            },
+            {
+              term: {
+                'dateString': inputData.dateString,
+              },
+            },
+
+          ],
+        },
+      },
+    };
+    if ( Ticket[0]?._source?.type != 'internal' ) {
+      getTicket.query.bool.must.push(
+          {
+            nested: {
+              path: 'mappingInfo',
+              query: {
+                bool: {
+                  must: [
+                    {
+                      term: {
+                        'mappingInfo.type': 'tangoreview',
+                      },
+                    },
+
+                  ],
+                },
+              },
+            },
+          },
+      );
+    }
+    const getFootfallticketData = await getOpenSearchData( openSearch.footfallDirectory, getTicket );
+    const ticketData = getFootfallticketData?.body?.hits?.hits;
+
+    if ( !ticketData || ticketData?.length == 0 ) {
+      return res.sendError( 'You don’t have any tagged images right now', 400 );
+    }
+
+    const record = {
+
+      status: 'Closed - Accuracy Issue',
+      createdByEmail: req?.user?.email,
+      createdByUserName: req?.user?.userName,
+      createdByRole: req?.user?.role,
+      mappingInfo: ticketData?.[0]?._source?.mappingInfo,
+    };
+
+    // If autoclose enabled and revisedPercentage meets/exceeds threshold, close ticket and skip revision
+
+    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,
+          } ) );
+
+      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: 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: '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,
+            createdByRole: req?.user?.role,
+            createdAt: new Date(),
+          },
+      );
+    }
+
+
+    // return;
+
+    let id = `${inputData.storeId}_${inputData.dateString}_footfall-directory-tagging`;
+
+    const insertResult = await updateOpenSearchData( openSearch.footfallDirectory, id, { doc: record } );
+
+    if ( insertResult && ( insertResult.statusCode === 201 || insertResult.statusCode === 200 ) ) {
+      return res.sendSuccess( 'Ticket closed successfully' );
+    } else {
+      return res.sendError( 'Internal Server Error', 500 );
+    }
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, funtion: 'tangoReviewAccuracyClosedTicket' } );
     return res.sendError( err, 500 );
   }
 }
@@ -1053,7 +1216,7 @@ export async function ticketList( req, res ) {
       }
     }
 
-    if ( req?.user?.userType == 'tango' && inputData.tangoType !== 'internal' ) {
+    if ( req?.user?.userType === 'tango' && inputData.tangoType !== 'internal' ) {
       searchQuery.query.bool.must.push(
           {
             term: {
@@ -1081,7 +1244,7 @@ export async function ticketList( req, res ) {
 
 
       );
-    } else if ( req?.user?.userType == 'client' && inputData.tangoType !== 'internal' ) {
+    } else if ( req?.user?.userType === 'client' && inputData.tangoType !== 'internal' ) {
       searchQuery.query.bool.must.push(
           {
             term: {
@@ -1173,8 +1336,8 @@ export async function ticketList( req, res ) {
     const ticketListData = searchResult?.body?.hits?.hits?.map( ( hit ) => hit._source ) || [];
 
     let temp = [];
-    if ( req.user.userType == 'tango' ) {
-      if ( inputData.tangotype == 'store' ) {
+    if ( req.user.userType === 'tango' ) {
+      if ( inputData.tangoType === 'store' ) {
         for ( let item of ticketListData ) {
           temp.push( {
 
@@ -1189,7 +1352,7 @@ export async function ticketList( req, res ) {
             reviewerRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.revicedPerc || '--',
             approverRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.revicedPerc || '--',
             tangoRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.revicedPerc || '--',
-            status: item?.status,
+            status: item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.status || '--',
 
           } );
         }
@@ -1211,7 +1374,7 @@ export async function ticketList( req, res ) {
             approverRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.revicedPerc || '--',
             tangoRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.revicedPerc || '--',
             status: item?.status,
-            tangoStatus: item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.revicedPerc || '--',
+            tangoStatus: item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.status || '--',
 
           } );
         }

package/src/dtos/footfallDirectory.dtos.js

@@ -72,6 +72,17 @@ export const tangoReviewTicketSchema = Joi.object().keys( {
 export const tangoReviewTicketValid = {
   body: tangoReviewTicketSchema,
 };
+export const tangoReviewAccuracyClosedTicketSchema = Joi.object().keys( {
+  storeId: Joi.string().required(),
+  dateString: Joi.string().required(),
+  comments: Joi.string().required(),
+  subComment: Joi.string().required(),
+
+} );
+
+export const tangoReviewAccuracyClosedTicketValid = {
+  body: tangoReviewAccuracyClosedTicketSchema,
+};
 
 export const ticketSummarySchema = Joi.object().keys( {
   clientId: Joi.string().required(),

package/src/routes/footfallDirectory.routes.js

@@ -1,7 +1,7 @@
 import express from 'express';
 import { getClusters, getConfig, isGrantedUsers, isTicketExists, ticketApprove, ticketCreation, ticketReview } from '../validations/footfallDirectory.validation.js';
-import { assignTicket, createTicket, downloadTickets, getTaggedStores, getTickets, multiCloseTicket, openTicketList, reviewerList, tangoReviewTicket, ticketList, ticketSummary, updateStatus, updateTempStatus, updateUserTicketStatus, createinternalTicket, checkTicketExists } from '../controllers/footfallDirectory.controllers.js';
-import { createTicketValid, downloadTicketsValid, getTaggedStoresValid, getTicketsValid, openTicketListValid, reviewerListValid, ticketListValid, ticketSummaryValid, updateStatusValid, assignTicketValid, updateTempStatusValid, updateTicketStatusValid, tangoReviewTicketValid, multiCloseTicketValid } from '../dtos/footfallDirectory.dtos.js';
+import { assignTicket, createTicket, downloadTickets, getTaggedStores, getTickets, multiCloseTicket, openTicketList, reviewerList, tangoReviewTicket, ticketList, ticketSummary, updateStatus, updateTempStatus, updateUserTicketStatus, createinternalTicket, checkTicketExists, tangoReviewAccuracyClosedTicket } from '../controllers/footfallDirectory.controllers.js';
+import { createTicketValid, downloadTicketsValid, getTaggedStoresValid, getTicketsValid, openTicketListValid, reviewerListValid, ticketListValid, ticketSummaryValid, updateStatusValid, assignTicketValid, updateTempStatusValid, updateTicketStatusValid, tangoReviewTicketValid, multiCloseTicketValid, tangoReviewAccuracyClosedTicketValid } from '../dtos/footfallDirectory.dtos.js';
 import { bulkValidate, getAssinedStore, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 
 export const footfallDirectoryRouter = express.Router();
@@ -11,6 +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-accuracy-ticket', isAllowedSessionHandler, validate( tangoReviewAccuracyClosedTicketValid ), tangoReviewAccuracyClosedTicket );
 
 footfallDirectoryRouter.get( '/ticket-summary', isAllowedSessionHandler, bulkValidate( ticketSummaryValid ), ticketSummary );