tango-app-api-infra 3.9.5-vms.64 → 3.9.5-vms.66

package/package.json

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

package/src/controllers/footfallDirectory.controllers.js

@@ -1387,101 +1387,116 @@ export async function getTickets( req, res ) {
                 commentsResponse = commentsRes?.body?.hits?.hits?.map( ( hit ) => hit._source ) || [];
 
                 // Check if duplicate condition exists in commentsResponse
-                const isDuplicate = Array.isArray( commentsResponse ) &&
-                  commentsResponse.some( ( c ) => c.category === 'duplicate' );
 
                 // Structure comments output
                 let commentsDetails = [];
-                if ( isDuplicate ) {
-                  // Duplicate case - check from commentsResponse
-                  // Collect for each type (tagging, review, approve)
-                  const types = [ 'tagging', 'review', 'approve' ];
-                  commentsDetails = types.map( ( typeValue ) => {
-                    // parent value from original comment structure
-                    let parent = null;
-                    // Get all comments of this type (no filter by category)
-                    let comms = commentsResponse
-                        .filter( ( c ) => c.type === typeValue )
-                        .map( ( c ) => {
-                          if ( typeValue === 'tagging' ) {
+
+
+                const types = [ 'tagging', 'review', 'approve' ];
+
+                // Process each type
+                types.forEach( ( typeValue ) => {
+                  if ( typeValue === 'tagging' ) {
+                    // For tagging, group by category and create separate objects for each category
+                    const taggingComments = commentsResponse.filter( ( c ) => c.type === typeValue );
+
+                    // Group by category
+                    const categoryGroups = {};
+                    taggingComments.forEach( ( c ) => {
+                      const category = c.category || 'other';
+                      if ( !categoryGroups[category] ) {
+                        categoryGroups[category] = [];
+                      }
+                      categoryGroups[category].push( c );
+                    } );
+
+                    // Create separate objects for each category
+                    Object.keys( categoryGroups ).forEach( ( category ) => {
+                      const categoryComments = categoryGroups[category];
+                      let parent = null;
+
+                      const comms = categoryComments.map( ( c ) => {
+                        if ( category === 'duplicate' ) {
+                          if ( !parent && c.parent ) {
                             parent = c.parent;
-                            return {
-                              createdByEmail: c.createdByEmail,
-                              createdByUserName: c.createdByUserName,
-                              createdByRole: c.createdByRole,
-                              message: c.message,
-                            };
                           }
-                          if ( typeValue === 'review' || typeValue === 'approve' ) {
+                          return {
+                            createdByEmail: c.createdByEmail,
+                            createdByUserName: c.createdByUserName,
+                            createdByRole: c.createdByRole,
+                            message: c.message,
+                          };
+                        } else {
+                          return {
+                            id: c.id,
+                            tempId: c.tempId,
+                            timeRange: c.timeRange,
+                            entryTime: c.entryTime,
+                            exitTime: c.exitTime,
+                            filePath: c.filePath,
+                            isChecked: c.isChecked,
+                            createdAt: c.createdAt,
+                            message: c.message,
+                            createdByEmail: c.createdByEmail,
+                            createdByUserName: c.createdByUserName,
+                            createdByRole: c.createdByRole,
+                          };
+                        }
+                      } );
+
+                      const taggingObj = {
+                        category: category,
+                        type: typeValue,
+                        comments: comms,
+                      };
+
+                      // Add parent only for duplicate category
+                      if ( category === 'duplicate' && parent !== null ) {
+                        taggingObj.parent = parent;
+                      }
+
+                      commentsDetails.push( taggingObj );
+                    } );
+                  } else if ( typeValue === 'review' || typeValue === 'approve' ) {
+                    // For review and approve, keep existing structure
+                    const comms = commentsResponse
+                        .filter( ( c ) => c.type === typeValue )
+                        .map( ( c ) => {
+                          if ( c.category === 'duplicate' ) {
                             return {
-                              parent: c.parent,
+                              parent: c?.taggedImages[0]?._source?.parent,
                               category: c.category,
                               taggedImages: Array.isArray( c.taggedImages ) ?
-                              c.taggedImages.map( ( img ) => ( {
-                                id: img?._source?.id,
-                                tempId: img?._source?.tempId,
-                                timeRange: img?._source?.timeRange,
-                                entryTime: img?._source?.entryTime,
-                                exitTime: img?._source?.exitTime,
-                                filePath: img?._source?.filePath,
-                                isChecked: img?._source?.isChecked,
-                              } ) ) :
-                              [],
+                                c.taggedImages.map( ( img ) => ( {
+                                  id: img?._source?.id,
+                                  tempId: img?._source?.tempId,
+                                  timeRange: img?._source?.timeRange,
+                                  entryTime: img?._source?.entryTime,
+                                  exitTime: img?._source?.exitTime,
+                                  filePath: img?._source?.filePath,
+                                  isChecked: img?._source?.isChecked,
+                                } ) ) :
+                                [],
                               createdByEmail: c.createdByEmail,
                               createdByUserName: c.createdByUserName,
                               createdByRole: c.createdByRole,
                               status: c.status,
                               message: c.message,
                             };
-                          }
-                          return {};
-                        } );
-                    return {
-                      ...( typeValue === 'tagging' ? { category: 'duplicate' } : {} ),
-                      type: typeValue,
-                      ...( typeValue === 'tagging' ? { parent } : {} ),
-                      comments: comms,
-                    };
-                  } );
-                } else {
-                  // For non-duplicate categories
-                  // Collect by type/tag (tagging/review/approve) and build similar structure
-                  const types = [ 'tagging', 'review', 'approve' ];
-                  commentsDetails = types.map( ( typeValue ) => {
-                    // parent for these non-duplicate is always null
-                    let comms = commentsResponse
-                        .filter( ( c ) => c.type === typeValue )
-                        .map( ( c ) => {
-                          if ( typeValue === 'tagging' ) {
-                            return {
-                              id: c.id,
-                              tempId: c.tempId,
-                              timeRange: c.timeRange,
-                              entryTime: c.entryTime,
-                              exitTime: c.exitTime,
-                              filePath: c.filePath,
-                              isChecked: c.isChecked,
-                              createdAt: c.createdAt,
-                              message: c.message,
-                              createdByEmail: c.createdByEmail,
-                              createdByUserName: c.createdByUserName,
-                              createdByRole: c.createdByRole,
-                            };
-                          }
-                          if ( typeValue === 'review' || typeValue === 'approve' ) {
+                          } else {
                             return {
                               category: c.category,
                               taggedImages: Array.isArray( c.taggedImages ) ?
-                              c.taggedImages.map( ( img ) => ( {
-                                id: img?._source?.id,
-                                tempId: img?._source?.tempId,
-                                timeRange: img?._source?.timeRange,
-                                entryTime: img?._source?.entryTime,
-                                exitTime: img?._source?.exitTime,
-                                filePath: img?._source?.filePath,
-                                isChecked: img?._source?.isChecked,
-                              } ) ) :
-                              [],
+                                c.taggedImages.map( ( img ) => ( {
+                                  id: img?._source?.id,
+                                  tempId: img?._source?.tempId,
+                                  timeRange: img?._source?.timeRange,
+                                  entryTime: img?._source?.entryTime,
+                                  exitTime: img?._source?.exitTime,
+                                  filePath: img?._source?.filePath,
+                                  isChecked: img?._source?.isChecked,
+                                } ) ) :
+                                [],
                               createdByEmail: c.createdByEmail,
                               createdByUserName: c.createdByUserName,
                               createdByRole: c.createdByRole,
@@ -1489,16 +1504,24 @@ export async function getTickets( req, res ) {
                               message: c.message,
                             };
                           }
-                          return {};
                         } );
-                    return {
-                      ...( typeValue === 'tagging' ? { category: 'duplicate' } : {} ),
-                      parent: null,
-                      type: typeValue,
-                      comments: comms,
-                    };
-                  } );
-                }
+
+                    // Only add if there are comments
+                    if ( comms.length > 0 ) {
+                      commentsDetails.push( {
+                        type: typeValue,
+                        comments: comms,
+                      } );
+                    } else {
+                      // Add empty comments array if no comments
+                      commentsDetails.push( {
+                        type: typeValue,
+                        comments: [],
+                      } );
+                    }
+                  }
+                } );
+
 
                 item._source.commentsDetails = commentsDetails;
               }

package/src/validations/footfallDirectory.validation.js

@@ -508,8 +508,8 @@ export async function ticketCreation( req, res, next ) {
           if ( r.actionType === 'reviewer' && r.isChecked === true ) {
             revisionMapping = {
               type: 'review',
-              revicedFootfall: revisedFootfall,
-              revicedPerc: Math.round( ( revisedFootfall / footfallCount ) * 100 || 0 ) + '%',
+              // revicedFootfall: revisedFootfall,
+              // revicedPerc: Math.round( ( revisedFootfall / footfallCount ) * 100 || 0 ) + '%',
               count: tempAcc,
               revisedDetail: formattedTaggingData,
               status: 'Open',
@@ -526,8 +526,8 @@ export async function ticketCreation( req, res, next ) {
           } else if ( r.actionType === 'tango' && r.isChecked === true ) {
             tangoReviewMapping = {
               type: 'tangoreview',
-              revicedFootfall: revisedFootfall,
-              revicedPerc: Math.round( ( revisedFootfall / footfallCount ) * 100 || 0 ) + '%',
+              // revicedFootfall: revisedFootfall,
+              // revicedPerc: Math.round( ( revisedFootfall / footfallCount ) * 100 || 0 ) + '%',
               count: tempAcc,
               revisedDetail: formattedTaggingData,
               status: 'Open',
@@ -570,7 +570,7 @@ export async function ticketCreation( req, res, next ) {
       ];
 
       const finduserList = await aggregateUser( userQuery );
-      console.log( '🚀 ~ ticketCreation ~ finduserList:', finduserList.length );
+
 
       const createdOn = dayjs().format( 'DD MMM YYYY' );
       const title = `${getstoreName?.storeName} Have raised a ticket for a Footfall Mismatch`;
@@ -596,12 +596,12 @@ export async function ticketCreation( req, res, next ) {
                     m.name === 'reviewer' && ( m.isAdd === true || m.isEdit === true ),
               ),
             );
-            console.log( '🚀 ~ ticketCreation ~ ticketsFeature:', ticketsFeature );
+
 
             if ( !ticketsFeature ) return;
 
             const notifyUser = await getAssinedStore( userData, req.body.storeId );
-            console.log( '🚀 ~ ticketCreation ~ notifyUser:', notifyUser );
+
             if ( !notifyUser || !userData?.fcmToken ) return;
 
             await sendPushNotification( title, description, userData.fcmToken, Data );
@@ -1223,8 +1223,8 @@ export async function ticketReview( req, res, next ) {
           if ( r.actionType === 'approver' && r.isChecked === true ) {
             approverMapping = {
               type: 'approve',
-              revicedFootfall: revisedFootfall,
-              revicedPerc: Math.round( ( revisedFootfall / footfallCount ) * 100 || 0 ) + '%',
+              // revicedFootfall: revisedFootfall,
+              // revicedPerc: Math.round( ( revisedFootfall / footfallCount ) * 100 || 0 ) + '%',
               count: tempAcc,
               revisedDetail: formattedTaggingData,
               status: 'Open',
@@ -1232,8 +1232,8 @@ export async function ticketReview( req, res, next ) {
           } else if ( r.actionType === 'tango' && r.isChecked === true ) {
             tangoReviewMapping = {
               type: 'tangoreview',
-              revicedFootfall: revisedFootfall,
-              revicedPerc: Math.round( ( revisedFootfall / footfallCount ) * 100 || 0 ) + '%',
+              // revicedFootfall: revisedFootfall,
+              // revicedPerc: Math.round( ( revisedFootfall / footfallCount ) * 100 || 0 ) + '%',
               count: tempAcc,
               revisedDetail: formattedTaggingData,
               status: 'Open',
@@ -1269,7 +1269,7 @@ export async function ticketReview( req, res, next ) {
         },
       ];
       let finduserList = await aggregateUser( userQuery );
-      console.log( '🚀 ~ ticketReview ~ finduserList:', finduserList.length );
+
 
       // return;
       for ( let userData of finduserList ) {
@@ -1499,7 +1499,7 @@ export async function ticketApprove( req, res, next ) {
     if ( !taggingImages || taggingImages?.length == 0 ) {
       return res.sendError( 'You don’t have any tagged images right now', 400 );
     }
-    logger.info( { taggingImages } );
+
     const formattedTaggingData = formatRevopTaggingHits( taggingImages );
 
     const getTicket = {
@@ -1647,14 +1647,14 @@ export async function ticketApprove( req, res, next ) {
 
         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( {
@@ -1678,8 +1678,8 @@ export async function ticketApprove( req, res, next ) {
       //   if ( r.actionType === 'tango' && r.isChecked === true ) {
       tangoReviewMapping = {
         type: 'tangoreview',
-        revicedFootfall: revisedFootfall,
-        revicedPerc: Math.round( ( revisedFootfall / footfallCount ) * 100 || 0 ) + '%',
+        // revicedFootfall: revisedFootfall,
+        // revicedPerc: Math.round( ( revisedFootfall / footfallCount ) * 100 || 0 ) + '%',
         count: tempAcc,
         revisedDetail: formattedTaggingData,
         status: 'Open',
@@ -1769,13 +1769,13 @@ export async function ticketApprove( req, res, next ) {
         },
       ];
       let finduserList = await aggregateUser( userQuery );
-      console.log( '🚀 ~ ticketReview ~ finduserList:', finduserList );
+
 
       for ( let userData of finduserList ) {
         let title = `${getstoreName?.storeName} Have raised a ticket for a Footfall Mismatch`;
         let createdOn = dayjs().format( 'DD MMM YYYY' );
         let description = `Created on ${createdOn}`;
-        console.log( '🚀 ~ ticketCreation ~ userData.role:', userData.email );
+
         let Data = {
           'title': title,
           'body': description,
@@ -1787,7 +1787,7 @@ export async function ticketApprove( req, res, next ) {
         };
 
         const ticketsFeature = userData?.rolespermission?.some( ( f ) => f.featureName === 'FootfallDirectory' && ( f.modules.find( ( m ) => m.name == 'approver' && ( m.isAdd == true || m.isEdit == true ) ) ) );
-        console.log( ticketsFeature );
+
         if ( ticketsFeature ) {
           let notifyuser = await getAssinedStore( userData, req.body.storeId );
           if ( userData && userData.fcmToken && notifyuser ) {
@@ -1801,7 +1801,7 @@ export async function ticketApprove( req, res, next ) {
     const id = `${inputData.storeId}_${inputData.dateString}_footfall-directory-tagging`;
     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 {