tango-app-api-infra 3.9.5-vms.50 → 3.9.5-vms.52

package/package.json

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

package/src/controllers/footfallDirectory.controllers.js

@@ -127,7 +127,6 @@ export async function tangoReviewTicket( req, res ) {
 
     const getFootfallCount = await getOpenSearchData( openSearch.footfall, getQuery );
     const hits = getFootfallCount?.body?.hits?.hits || [];
-    logger.info( { hits } );
     if ( hits?.[0]?._source?.footfall_count <= 0 ) {
       return res.sendError( 'You can’t create a ticket because this store has 0 footfall data' );
     }
@@ -158,7 +157,6 @@ export async function tangoReviewTicket( req, res ) {
     };
     let findTicket = await getOpenSearchData( openSearch.footfallDirectory, findQuery );
     let Ticket = findTicket.body?.hits?.hits;
-    console.log( Ticket );
     if ( Ticket.length === 0 ) {
       return res.sendError( 'Ticket not found', 400 );
     }
@@ -182,7 +180,6 @@ export async function tangoReviewTicket( req, res ) {
         },
       },
     };
-    console.log( '🚀 ~ tangoReviewTicket ~ Ticket[0].type:', Ticket[0]?._source?.type );
     if ( Ticket[0]?._source?.type != 'internal' ) {
       getTicket.query.bool.must.push( {
         term: {
@@ -192,12 +189,11 @@ export async function tangoReviewTicket( req, res ) {
     }
     const getFootfallticketData = await getOpenSearchData( openSearch.footfallDirectory, getTicket );
     const ticketData = getFootfallticketData?.body?.hits?.hits;
-    logger.info( { ticketData, getFootfallticketData } );
-    console.log( '🚀 ~ tangoReviewTicket ~ ticketData, getFootfallticketData:', ticketData, getFootfallticketData );
+
     if ( !ticketData || ticketData?.length == 0 ) {
       return res.sendError( 'You don’t have any tagged images right now', 400 );
     }
-    logger.info( { ticketData, getFootfallticketData } );
+
     const record = {
 
       status: 'Closed',
@@ -216,12 +212,11 @@ export async function tangoReviewTicket( req, res ) {
     let autoCloseAccuracy = getConfig?.footfallDirectoryConfigs?.autoCloseAccuracy;
 
     const getNumber = autoCloseAccuracy.split( '%' )[0];
-    logger.info( { getNumber } );
+
     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] );
-    logger.info( { tangoReview, revised } );
     // If autoclose enabled and revisedPercentage meets/exceeds threshold, close ticket and skip revision
     if (
       isAutoCloseEnable === true &&
@@ -400,11 +395,9 @@ export async function tangoReviewTicket( req, res ) {
     if ( inputData.ticketType === 'internal' ) {
       id = `${inputData.storeId}_${inputData.dateString}_internal_footfall-directory-tagging`;
     }
-    console.log( '🚀 ~ tangoReviewTicket ~ id:', id );
-    console.log( '🚀 ~ tangoReviewTicket ~ record:', record );
+
     const insertResult = await updateOpenSearchData( openSearch.footfallDirectory, id, { doc: record } );
 
-    logger.info( { insertResult, record, id } );
     if ( insertResult && ( insertResult.statusCode === 201 || insertResult.statusCode === 200 ) ) {
       return res.sendSuccess( 'Ticket closed successfully' );
     } else {
@@ -552,7 +545,6 @@ export async function ticketSummary1( req, res ) {
 
     const getData = await getOpenSearchData( openSearch.footfallDirectory, getQuery );
     const aggs = getData?.body?.aggregations;
-    logger.info( { aggs: aggs, body: getData?.body } );
 
     const result = {
       totalTickets: aggs.totalTicketCount.value,
@@ -867,6 +859,15 @@ export async function ticketList( req, res ) {
       query: {
         bool: {
           must: [
+            {
+              'range': {
+                'dateString': {
+                  'gte': inputData.fromDate,
+                  'lte': inputData.toDate,
+                  'format': 'yyyy-MM-dd',
+                },
+              },
+            },
             {
               terms: {
                 'clientId.keyword': Array.isArray( inputData.clientId ) ?
@@ -1015,7 +1016,7 @@ export async function ticketList( req, res ) {
         }
       }
     } else {
-      if ( req.user.role === 'superadmin' ) {
+      if ( inputData?.permissionType ==='approve' ) {
         for ( let item of ticketListData ) {
           temp.push( {
 
@@ -1037,6 +1038,26 @@ export async function ticketList( req, res ) {
             tangoStatus: item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.revicedPerc || '--',
             approvedBy: item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.createdByEmail || '--',
 
+          } );
+        }
+      } else if ( inputData?.permissionType ==='review' ) {
+        for ( let item of ticketListData ) {
+          temp.push( {
+
+            ticketId: item?.ticketId,
+            storeId: item?.storeId,
+            storeName: item?.storeName,
+            ticketRaised: item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.createdAt,
+            issueDate: item?.dateString,
+            footfall: item?.footfallCount,
+            dueDate: '',
+            type: item.type || 'store',
+            storeRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.revicedPerc || '--',
+            reviewerRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.revicedPerc || '--',
+
+            status: item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.status || '--',
+            ReviewedBy: item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.createdByEmail || '--',
+
           } );
         }
       } else if ( req.user.role === 'user' ) {
@@ -2344,7 +2365,6 @@ export async function updateTempStatus( req, res ) {
         comments: comments || '',
       } );
     }
-    logger.info( { docsToUpdate } );
     const bulkPayload = [];
     // 4. Build bulk update payload
     for ( const doc of docsToUpdate ) {
@@ -2362,8 +2382,48 @@ export async function updateTempStatus( req, res ) {
     // Count successes
     const updatedCount = bulkResp?.body?.items?.filter( ( item ) => item?.update?.result === 'updated' || item?.update?.result === 'noop' ).length ?? 0;
 
-    logger.info( { updated: updatedCount, by: 'updateTempStatus', ids: id } );
+    if ( inputData?.comments && inputData?.comments !== '' ) {
+      const id = `${inputData.storeId}_${inputData.dateString}_${Date.now()}`;
+      const searchBody1 = {
+        size: 10000,
+        query: {
+          bool: {
+            must: [
+              {
+                terms: {
+                  '_id': docIds,
+                },
+              },
+              {
+                term: {
+                  isParent: false,
+                },
+              },
+            ],
+          },
+        },
+      };
+
+      const getSearchResp = await getOpenSearchData(
+          openSearch.revop,
+          searchBody1,
+      );
+
 
+      const taggedImages = getSearchResp?.body?.hits?.hits?.length > 0? getSearchResp?.body?.hits?.hits : [];
+      const logs = {
+        type: inputData.type,
+        category: taggedImages?.[0]?._source?.revopsType || '',
+        taggedImages: taggedImages,
+        status: inputData?.status,
+        createdByEmail: req?.user?.email,
+        createdByUserName: req?.user?.userName,
+        createdByRole: req?.user?.role,
+        message: inputData.comments || '',
+        createdAt: new Date(),
+      };
+      await insertWithId( openSearch.vmsCommentsLog, id, logs );
+    }
     return res.sendSuccess( { updated: updatedCount } );
   } catch ( error ) {
     const err = error.message;
@@ -2609,7 +2669,6 @@ export async function checkTicketExists( req, res ) {
     };
     let findTicket = await getOpenSearchData( openSearch.footfallDirectory, findQuery );
     let Ticket = findTicket.body?.hits?.hits;
-    console.log( Ticket );
 
 
     res.sendSuccess( Ticket );

package/src/dtos/footfallDirectory.dtos.js

@@ -536,7 +536,7 @@ export const assignTicketValid = {
 export const updateTempStatusSchema = Joi.object().keys( {
   id: Joi.array().items( Joi.string().required() ).required(),
   status: Joi.string().required(),
-  type: Joi.string().required(),
+  type: Joi.string().required().allow( 'review', 'approve' ),
   comments: Joi.string().optional().allow( '' ),