tango-app-api-infra 3.9.5-vms.82 → 3.9.5-vms.84

package/package.json

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

package/src/controllers/footfallDirectory.controllers.js

@@ -312,6 +312,33 @@ 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: item.type === 'approve'? 'Tango Review Done':'Closed',
+            };
+          } );
+        }
+
+        record.mappingInfo.push(
+            {
+              type: 'finalRevision',
+              mode: inputData.mappingInfo?.mode,
+              revicedFootfall: revisedFootfall,
+              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,
+              createdAt: new Date(),
+            },
+
+
+        );
       }
     } else {
       if ( Array.isArray( record.mappingInfo ) ) {
@@ -392,7 +419,7 @@ export async function tangoReviewTicket( req, res ) {
     const insertResult = await updateOpenSearchData( openSearch.footfallDirectory, id, { doc: record } );
 
     if ( insertResult && ( insertResult.statusCode === 201 || insertResult.statusCode === 200 ) ) {
-      if ( record.status = 'Closed' && inputData.ticketType !== 'internal' ) {
+      if ( ( record.status === 'Closed' || record.status === 'Open - Accuracy Issue' ) && inputData.ticketType !== 'internal' ) {
         const query = {
           storeId: inputData?.storeId,
           isVideoStream: true,
@@ -532,7 +559,7 @@ export async function tangoReviewAccuracyClosedTicket( req, res ) {
         },
       },
     };
-    if ( Ticket[0]?._source?.type != 'internal' ) {
+    if ( Ticket[0]?._source?.type !== 'internal' ) {
       getTicket.query.bool.must.push(
           {
             nested: {
@@ -576,22 +603,24 @@ export async function tangoReviewAccuracyClosedTicket( req, res ) {
           .filter( ( item ) => item.type === 'tangoreview' )
           .map( ( item ) => ( {
             ...item,
-            status: 'Closed',
+            status: 'Closed - Accuracy Issue',
             createdByEmail: req?.user?.email,
             createdByUserName: req?.user?.userName,
             createdByRole: req?.user?.role,
+            comments: inputData?.comments || '',
+            subComments: inputData?.subComments ||'',
           } ) );
 
       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',
+      //     };
+      //   } );
+      // }
 
       record.mappingInfo.push(
           {
@@ -606,6 +635,8 @@ export async function tangoReviewAccuracyClosedTicket( req, res ) {
             createdByUserName: req?.user?.userName,
             createdByRole: req?.user?.role,
             createdAt: new Date(),
+            comments: inputData?.comments || '',
+            subComments: inputData?.subComments || '',
           },
       );
     }
@@ -2209,7 +2240,6 @@ export async function ticketList( req, res ) {
     const offset = inputData.offset == 0 ? 0 : ( inputData.offset - 1 ) * limit || 0;
     inputData.clientId = inputData?.clientId?.split( ',' ); // convert strig to array
 
-
     const ticketsFeature = userInfo?.rolespermission?.some( ( f ) => f.featureName === 'FootfallDirectory' && ( f.modules.find( ( m ) => m.name == 'reviewer' && ( m.isAdd == true || m.isEdit == true ) ) ) );
 
     const ticketsApproveFeature = userInfo?.rolespermission?.some( ( f ) => f.featureName === 'FootfallDirectory' && ( f.modules.find( ( m ) => m.name == 'approver' && ( m.isAdd == true || m.isEdit == true ) ) ) );
@@ -3034,6 +3064,8 @@ export async function ticketList( req, res ) {
               'Approver (%)': item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.revicedPerc || '--',
               'Tango (%)': item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.revicedPerc || '--',
               'Status': item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.status || '--',
+              'Comments': item?.mappingInfo?.find( ( f ) => f.type === 'finalRevision' )?.comments || '--',
+              'Sub Comments': item?.mappingInfo?.find( ( f ) => f.type === 'finalRevision' )?.subComments || '--',
 
             } );
           }
@@ -3054,6 +3086,8 @@ 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?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.status || '--',
+              comments: item?.mappingInfo?.find( ( f ) => f.type === 'finalRevision' )?.comments || '--',
+              subComments: item?.mappingInfo?.find( ( f ) => f.type === 'finalRevision' )?.subComments || '--',
 
             } );
           }

package/src/validations/footfallDirectory.validation.js

@@ -284,20 +284,41 @@ export async function ticketCreation( req, res, next ) {
         },
       },
 
-      // Filter limitations based on effectiveFrom <= date
+      // Convert all effectiveFrom to proper Date
+      {
+        $addFields: {
+          taggingLimitationWithDate: {
+            $map: {
+              input: '$footfallDirectoryConfigs.taggingLimitation',
+              as: 'item',
+              in: {
+                effectiveFrom: { $toDate: '$$item.effectiveFrom' },
+                values: '$$item.values',
+              },
+            },
+          },
+        },
+      },
+
+      // Filter items <= input date
       {
         $addFields: {
           matchedLimitation: {
             $filter: {
-              input: '$footfallDirectoryConfigs.taggingLimitation',
+              input: '$taggingLimitationWithDate',
               as: 'item',
-              cond: { $lte: [ '$$item.effectiveFrom', inputData.dateString ] },
+              cond: {
+                $lte: [
+                  '$$item.effectiveFrom',
+                  { $toDate: inputData.dateString },
+                ],
+              },
             },
           },
         },
       },
 
-      // Pick latest effective record
+      // Sort DESC and pick ONLY top 1 -> latest effective record
       {
         $addFields: {
           effectiveLimitation: {
@@ -319,26 +340,11 @@ export async function ticketCreation( req, res, next ) {
         },
       },
 
-      // Remove originals before final merge
-      {
-        $project: {
-          'config.taggingLimitation': 0,
-          'matchedLimitation': 0,
-        },
-      },
-
-      // Attach effective limitation INSIDE config
-      {
-        $addFields: {
-          'config.effectiveLimitation': '$effectiveLimitation',
-        },
-      },
-
-      // Remove temporary field
       {
         $project: {
+          config: 1,
+          effectiveLimitation: 1,
           footfallDirectoryConfigs: 1,
-          clientId: 1,
         },
       },
     ];
@@ -351,10 +357,10 @@ export async function ticketCreation( req, res, next ) {
     }
 
     // Get taggingLimitation from config (check both possible paths)
-    const taggingLimitation = getConfig?.footfallDirectoryConfigs?.taggingLimitation;
+    const taggingLimitation = getConfig?.effectiveLimitation?.values;
     // Initialize count object from taggingLimitation
     const tempAcc = [];
-    taggingLimitation[taggingLimitation?.length - 1]?.values?.reduce( ( acc, item ) => {
+    taggingLimitation.reduce( ( acc, item ) => {
       if ( item?.type ) {
         // Convert type to camelCase with "Count" suffix
         // e.g., "duplicate" -> "duplicateCount", "housekeeping" -> "houseKeepingCount"
@@ -996,20 +1002,41 @@ export async function ticketReview( req, res, next ) {
         },
       },
 
-      // Filter limitations based on effectiveFrom <= date
+      // Convert all effectiveFrom to proper Date
+      {
+        $addFields: {
+          taggingLimitationWithDate: {
+            $map: {
+              input: '$footfallDirectoryConfigs.taggingLimitation',
+              as: 'item',
+              in: {
+                effectiveFrom: { $toDate: '$$item.effectiveFrom' },
+                values: '$$item.values',
+              },
+            },
+          },
+        },
+      },
+
+      // Filter items <= input date
       {
         $addFields: {
           matchedLimitation: {
             $filter: {
-              input: '$footfallDirectoryConfigs.taggingLimitation',
+              input: '$taggingLimitationWithDate',
               as: 'item',
-              cond: { $lte: [ '$$item.effectiveFrom', inputData.dateString ] },
+              cond: {
+                $lte: [
+                  '$$item.effectiveFrom',
+                  { $toDate: inputData.dateString },
+                ],
+              },
             },
           },
         },
       },
 
-      // Pick latest effective record
+      // Sort DESC and pick ONLY top 1 -> latest effective record
       {
         $addFields: {
           effectiveLimitation: {
@@ -1031,26 +1058,11 @@ export async function ticketReview( req, res, next ) {
         },
       },
 
-      // Remove originals before final merge
-      {
-        $project: {
-          'config.taggingLimitation': 0,
-          'matchedLimitation': 0,
-        },
-      },
-
-      // Attach effective limitation INSIDE config
-      {
-        $addFields: {
-          'config.effectiveLimitation': '$effectiveLimitation',
-        },
-      },
-
-      // Remove temporary field
       {
         $project: {
+          config: 1,
+          effectiveLimitation: 1,
           footfallDirectoryConfigs: 1,
-          clientId: 1,
         },
       },
     ];
@@ -1063,10 +1075,10 @@ export async function ticketReview( req, res, next ) {
     }
 
     // Get taggingLimitation from config (check both possible paths)
-    const taggingLimitation = getConfig?.footfallDirectoryConfigs?.taggingLimitation;
+    const taggingLimitation = getConfig?.effectiveLimitation?.values;
     // Initialize count object from taggingLimitation
     const tempAcc = [];
-    taggingLimitation[taggingLimitation?.length - 1]?.values?.reduce( ( acc, item ) => {
+    taggingLimitation.reduce( ( acc, item ) => {
       if ( item?.type ) {
         // Convert type to camelCase with "Count" suffix
         // e.g., "duplicate" -> "duplicateCount", "housekeeping" -> "houseKeepingCount"
@@ -1598,20 +1610,41 @@ export async function ticketApprove( req, res, next ) {
         },
       },
 
-      // Filter limitations based on effectiveFrom <= date
+      // Convert all effectiveFrom to proper Date
+      {
+        $addFields: {
+          taggingLimitationWithDate: {
+            $map: {
+              input: '$footfallDirectoryConfigs.taggingLimitation',
+              as: 'item',
+              in: {
+                effectiveFrom: { $toDate: '$$item.effectiveFrom' },
+                values: '$$item.values',
+              },
+            },
+          },
+        },
+      },
+
+      // Filter items <= input date
       {
         $addFields: {
           matchedLimitation: {
             $filter: {
-              input: '$footfallDirectoryConfigs.taggingLimitation',
+              input: '$taggingLimitationWithDate',
               as: 'item',
-              cond: { $lte: [ '$$item.effectiveFrom', inputData.dateString ] },
+              cond: {
+                $lte: [
+                  '$$item.effectiveFrom',
+                  { $toDate: inputData.dateString },
+                ],
+              },
             },
           },
         },
       },
 
-      // Pick latest effective record
+      // Sort DESC and pick ONLY top 1 -> latest effective record
       {
         $addFields: {
           effectiveLimitation: {
@@ -1633,26 +1666,11 @@ export async function ticketApprove( req, res, next ) {
         },
       },
 
-      // Remove originals before final merge
-      {
-        $project: {
-          'config.taggingLimitation': 0,
-          'matchedLimitation': 0,
-        },
-      },
-
-      // Attach effective limitation INSIDE config
-      {
-        $addFields: {
-          'config.effectiveLimitation': '$effectiveLimitation',
-        },
-      },
-
-      // Remove temporary field
       {
         $project: {
+          config: 1,
+          effectiveLimitation: 1,
           footfallDirectoryConfigs: 1,
-          clientId: 1,
         },
       },
     ];
@@ -1665,10 +1683,10 @@ export async function ticketApprove( req, res, next ) {
     }
 
     // Get taggingLimitation from config (check both possible paths)
-    const taggingLimitation = getConfig?.footfallDirectoryConfigs?.taggingLimitation;
+    const taggingLimitation = getConfig?.effectiveLimitation?.values;
     // Initialize count object from taggingLimitation
     const tempAcc = [];
-    taggingLimitation[taggingLimitation?.length - 1]?.values?.reduce( ( acc, item ) => {
+    taggingLimitation.reduce( ( acc, item ) => {
       if ( item?.type ) {
         // Convert type to camelCase with "Count" suffix
         // e.g., "duplicate" -> "duplicateCount", "housekeeping" -> "houseKeepingCount"