tango-app-api-infra 3.9.5-vms.93 → 3.9.5-vms.96

package/package.json

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

package/src/controllers/footfallDirectory.controllers.js

@@ -222,7 +222,7 @@ export async function tangoReviewTicket( req, res ) {
     const getFootfallticketData = await getOpenSearchData( openSearch.footfallDirectory, getTicket );
     const ticketData = getFootfallticketData?.body?.hits?.hits;
     logger.info( { ticketData, msg: '...........9' } );
-    if ( !ticketData || ticketData?.length == 0 ) {
+    if ( ( !ticketData || ticketData?.length == 0 ) && inputData?.ticketType !== 'internal' ) {
       return res.sendError( 'You don’t have any tagged images right now', 400 );
     }
 
@@ -556,7 +556,7 @@ export async function tangoReviewAccuracyClosedTicket( req, res ) {
     const getFootfallticketData = await getOpenSearchData( openSearch.footfallDirectory, getTicket );
     const ticketData = getFootfallticketData?.body?.hits?.hits;
 
-    if ( !ticketData || ticketData?.length == 0 ) {
+    if ( ( !ticketData || ticketData?.length == 0 ) && inputData?.ticketType !== 'internal' ) {
       return res.sendError( 'You don’t have any tagged images right now', 400 );
     }
 
@@ -3570,88 +3570,9 @@ export async function getTickets( req, res ) {
     if ( !response || response.length == 0 ) {
       return res.sendError( `No Pending items in the selected dates for the store`, 400 );
     }
-    let temp = [];
-    if ( inputData?.action ) {
-      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,
-          revicedPerc: hit?._source?.revicedPerc,
-          revicedFootfall: hit?._source?.revicedFootfall,
-          mappingInfo: hit?._source?.mappingInfo,
-          employeeStatus: hit?._source?.employeeStatus,
-          houseKeepingStatus: hit?._source?.houseKeepingStatus,
-          duplicateStatus: hit?._source?.duplicateStatus,
-          junkStatus: hit?._source?.junkStatus,
-          storeName: hit?._source?.storeName,
-          ticketId: hit?._source?.ticketId,
-          footfallCount: hit?._source?.footfallCount,
-          comments: hit?._source?.comments,
-          email: hit?._source?.comments,
-          userName: hit?._source?.userName,
-          role: hit?._source?.role,
-          createdAt: hit?._source?.createdAt,
-          updatedAt: hit?._source?.updatedAt,
-          tempId: hit?._source?.tempId,
-          houseKeepingCount: hit?._source?.houseKeepingCount,
-          employeeCount: hit?._source?.employeeCount,
-          duplicateCount: hit?._source?.duplicateCount,
-          junkCount: hit?._source?.junkCount,
-          houseKeepingACCount: hit?._source?.houseKeepingACCount,
-          employeeACCount: hit?._source?.employeeACCount,
-          duplicateACCount: hit?._source?.duplicateACCount,
-          junkACCount: hit?._source?.junkACCount,
-          approverUserName: hit?._source?.approverUserName,
-          approverEmail: hit?._source?.approverEmail,
-          approverRole: hit?._source?.approverRole,
-          type: hit?._source?.type,
-        };
-        let result;
 
 
-        const matched = hit.matched_queries;
-        // Add only matched data array
-        if ( matched.includes( 'matched_employee' ) && ( !inputData.revopsType || inputData.revopsType == 'employee' ) ) {
-          result = defaultData;
-          result.employee = hit?._source?.employee;
-          // result.type = 'employee';
-          result.matched = matched;
-        }
-        if ( matched.includes( 'matched_housekeeping' ) && ( !inputData.revopsType || inputData.revopsType == 'houseKeeping' ) ) {
-          result = defaultData;
-          result.houseKeeping = hit?._source?.houseKeeping;
-          result.matched = matched;
-        }
-        if ( matched.includes( 'matched_duplicate' ) && ( !inputData.revopsType || inputData.revopsType == 'duplicateImages' ) ) {
-          result = defaultData;
-          result.duplicateImages = hit?._source?.duplicateImages;
-          result.matched = matched;
-        }
-
-        if ( matched.includes( 'matched_junk' ) && ( !inputData.revopsType || inputData.revopsType == 'junk' ) ) {
-          result = defaultData;
-          result.junk = hit?._source?.junk;
-          result.matched = matched;
-        }
-
-        if ( result ) {
-          const nested = [
-            {
-              _id: hit._id,
-              _index: hit._index,
-              _score: 0,
-              _source: result,
-            },
-          ];
-          temp.push( ...nested );
-        }
-      } );
-    }
-
-    const finalResponse = inputData.action ? temp : response;
+    const finalResponse = response;
     const getRevopQuery = {
       size: 10000,
       query: {
@@ -3894,9 +3815,10 @@ export async function getTickets( req, res ) {
                 mappingObj.revisedDetail = processedRevopSources;
               }
             } );
-          } else {
-            item._source.mappingInfo.revisedDetail = processedRevopSources;
           }
+          // else {
+          //   item._source.mappingInfo.revisedDetail = processedRevopSources;
+          // }
         }
       }
     } else if (
@@ -3906,7 +3828,11 @@ export async function getTickets( req, res ) {
     ) {
       finalResponse._source.mappingInfo.revisedDetail = processedRevopSources;
     }
+    if ( inputData.action && inputData.action !== '' ) {
+      const isCheck = inputData.action === 'approved'? true : false;
 
+      finalResponse[0]._source.mappingInfo[finalResponse?.[0]?._source.mappingInfo?.length -1].revisedDetail = filterRevisedDetailByIsChecked( finalResponse?.[0]?._source?.mappingInfo[finalResponse?.[0]?._source?.mappingInfo?.length -1].revisedDetail, isCheck );
+    }
     return res.sendSuccess( { result: finalResponse } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
@@ -3915,6 +3841,35 @@ export async function getTickets( req, res ) {
   }
 }
 
+function filterRevisedDetailByIsChecked( revisedDetailArr, isCheckedValue ) {
+  if ( !Array.isArray( revisedDetailArr ) ) return [];
+
+  // Helper function to filter duplicateImage recursively, only for revopsType === "duplicate"
+  function filterDuplicateImages( duplicateImages, isChecked ) {
+    if ( !Array.isArray( duplicateImages ) ) return [];
+    return duplicateImages
+        .filter( ( img ) => img.isChecked === isChecked )
+        .map( ( img ) => ( {
+          ...img,
+          duplicateImage: filterDuplicateImages( img.duplicateImage, isChecked ),
+        } ) );
+  }
+
+  return revisedDetailArr
+      .filter( ( item ) => item.isChecked === isCheckedValue )
+      .map( ( item ) => {
+        if ( item.revopsType === 'duplicate' && Array.isArray( item.duplicateImage ) ) {
+        // Filter the duplicateImage recursively for duplicates only
+          return {
+            ...item,
+            duplicateImage: filterDuplicateImages( item.duplicateImage, isCheckedValue ),
+          };
+        } else {
+          return { ...item };
+        }
+      } );
+}
+
 export async function updateStatus( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
@@ -5301,7 +5256,7 @@ export async function checkTicketExists( req, res ) {
       },
     };
     let findTicket = await getOpenSearchData( openSearch.footfallDirectory, findQuery );
-    let Ticket = findTicket.body?.hits?.hits;
+    let Ticket = findTicket?.body?.hits?.hits;
 
 
     res.sendSuccess( Ticket );

package/src/dtos/footfallDirectory.dtos.js

@@ -264,7 +264,7 @@ export const getTicketsSchema = Joi.object().keys( {
   //     } ),
   ticketId: Joi.string().required(),
   // status: Joi.string().optional(),
-  action: Joi.string().optional(),
+  action: Joi.string().optional().allow( '' ),
   // revopsType: Joi.string().optional(),
   // limit: Joi.number().required(),
   // offset: Joi.number().optional(),

package/src/validations/footfallDirectory.validation.js

@@ -359,6 +359,7 @@ export async function ticketCreation( req, res, next ) {
     // Get taggingLimitation from config (check both possible paths)
     const taggingLimitation = getConfig?.effectiveLimitation?.values;
     // Initialize count object from taggingLimitation
+
     const tempAcc = [];
     taggingLimitation.reduce( ( acc, item ) => {
       if ( item?.type ) {
@@ -409,11 +410,6 @@ export async function ticketCreation( req, res, next ) {
                   'isParent': false,
                 },
               },
-              {
-                term: {
-                  isChecked: true,
-                },
-              },
             ],
           },
         },
@@ -421,7 +417,7 @@ export async function ticketCreation( req, res, next ) {
           type_counts: {
             terms: {
               field: 'revopsType.keyword',
-              size: 100,
+              size: 10000,
             },
           },
         },
@@ -430,7 +426,6 @@ export async function ticketCreation( req, res, next ) {
 
       const revopData = await getOpenSearchData( openSearch.revop, revopQuery );
       const buckets = revopData?.body?.aggregations?.type_counts?.buckets || [];
-
       // Map OpenSearch revopsType values to count object keys
       buckets.forEach( ( bucket ) => {
         const revopsType = bucket.key;
@@ -458,13 +453,13 @@ export async function ticketCreation( req, res, next ) {
     const totalCount = Array.isArray( tempAcc ) ?
       tempAcc.reduce( ( sum, acc ) => sum + ( acc.value || 0 ), 0 ) :
       0;
-
+    logger.info( { totalCount, tempAcc } );
     const footfallCount = hits?.[0]?._source?.footfall_count || 0;
     const revisedFootfall = Math.max( 0, footfallCount - totalCount );
     if ( footfallCount - revisedFootfall == 0 ) {
       return res.sendError( 'Cannot create a ticket because footfall hasn’t changed', 400 );
     }
-
+    logger.info( { footfallCount, revisedFootfall } );
     const taggingData = {
       size: 10000,
       query: {