tango-app-api-infra 3.9.5-vms.58 → 3.9.5-vms.59

package/package.json

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

package/src/validations/footfallDirectory.validation.js

@@ -410,9 +410,9 @@ export async function ticketCreation( req, res, next ) {
 
     const revopTaggingData = await getOpenSearchData( openSearch.revop, taggingData );
     const taggingImages = revopTaggingData?.body?.hits?.hits;
-    // if ( !taggingImages || taggingImages?.length == 0 ) {
-    //   return res.sendError( 'You don’t have any tagged images right now', 400 );
-    // }
+    if ( !taggingImages || taggingImages?.length == 0 ) {
+      return res.sendError( 'You don’t have any tagged images right now', 400 );
+    }
     const formattedTaggingData = formatRevopTaggingHits( taggingImages );
 
     const record = {
@@ -567,17 +567,22 @@ export async function ticketCreation( req, res, next ) {
         let createdOn = dayjs().format( 'DD MMM YYYY' );
         let description = `Created on ${createdOn}`;
         let Data = {
-          storeId: getstoreName.storeId,
-          issueDate: inputData.dateString,
+          'title': title,
+          'body': description,
+          'type': 'create',
+          'date': record.dateString,
+          'storeId': record.storeId,
+          'clientId': record.clientId,
+          'ticketId': record.ticketId,
         };
 
         const ticketsFeature = userData?.rolespermission?.some( ( f ) => f.featureName === 'FootfallDirectory' && ( f.modules.find( ( m ) => m.name == 'reviewer' && ( m.isAdd == true || m.isEdit == true ) ) ) );
 
         if ( ticketsFeature ) {
-          let notifyuser = await getAssinedStore( userData, req.body.storeId, Data );
+          let notifyuser = await getAssinedStore( userData, req.body.storeId );
           if ( userData && userData.fcmToken && notifyuser ) {
             const fcmToken = userData.fcmToken;
-            await sendPushNotification( title, description, fcmToken );
+            await sendPushNotification( title, description, fcmToken, Data );
           }
         }
       }
@@ -587,7 +592,7 @@ export async function ticketCreation( req, res, next ) {
     const id = `${inputData.storeId}_${inputData.dateString}_footfall-directory-tagging`;
     const insertResult = await insertWithId( openSearch.footfallDirectory, id, record );
     if ( insertResult && insertResult.statusCode === 201 ) {
-      // After successful ticket creation, update status to "submitted" in revop index for the relevant records
+    // After successful ticket creation, update status to "submitted" in revop index for the relevant records
 
 
       const bulkUpdateBody = taggingImages.map( ( img ) => [
@@ -625,14 +630,14 @@ export async function ticketCreation( req, res, next ) {
         const startDateObj = new Date( currentDateObj );
 
         if ( breachDays === 30 ) {
-          // Consider within this month
+        // Consider within this month
           startDateObj.setDate( 1 ); // First day of current month
         } else if ( breachDays === 60 ) {
-          // Consider this month and last month
+        // Consider this month and last month
           startDateObj.setMonth( startDateObj.getMonth() - 1 );
           startDateObj.setDate( 1 ); // First day of last month
         } else {
-          // For other values, calculate months from days
+        // For other values, calculate months from days
           const breachMonths = Math.ceil( breachDays / 30 );
           startDateObj.setMonth( startDateObj.getMonth() - breachMonths + 1 );
           startDateObj.setDate( 1 );
@@ -680,21 +685,21 @@ export async function ticketCreation( req, res, next ) {
         }
 
         if ( breachTicketsCount >= breachCount ) {
-          // Calculate remaining future days in the config period
+        // Calculate remaining future days in the config period
           const futureDates = [];
 
           // Calculate end date of config period
           const configEndDateObj = new Date( currentDateObj );
           if ( breachDays === 30 ) {
-            // End of current month
+          // End of current month
             configEndDateObj.setMonth( configEndDateObj.getMonth() + 1 );
             configEndDateObj.setDate( 0 ); // Last day of current month
           } else if ( breachDays === 60 ) {
-            // End of next month
+          // End of next month
             configEndDateObj.setMonth( configEndDateObj.getMonth() + 2 );
             configEndDateObj.setDate( 0 ); // Last day of next month
           } else {
-            // For other values, add the remaining days
+          // For other values, add the remaining days
             const remainingDays = breachDays - ( Math.floor( ( currentDateObj - startDateObj ) / ( 1000 * 60 * 60 * 24 ) ) );
             configEndDateObj.setDate( configEndDateObj.getDate() + remainingDays );
           }
@@ -723,7 +728,7 @@ export async function ticketCreation( req, res, next ) {
           }
         }
       }
-      const sqsName =sqs.vmsPickleExtention;
+      const sqsName = sqs.vmsPickleExtention;
       const sqsProduceQueue = {
         QueueUrl: `${sqs.url}${sqsName}`,
         MessageBody: JSON.stringify( {
@@ -1144,9 +1149,9 @@ export async function ticketReview( req, res, next ) {
     }
 
     let checkreview = getConfig.footfallDirectoryConfigs.revision.filter( ( data ) => data.actionType === 'reviewer' && data.isChecked === true );
-    let checkapprove = getConfig.footfallDirectoryConfigs.revision.filter( ( data ) => data.actionType === 'approver' && data.isChecked === true );
 
-    if ( checkreview.length > 0 || checkapprove.length > 0 ) {
+
+    if ( checkreview.length > 0 ) {
       let userQuery = [
         {
           $match: {
@@ -1156,6 +1161,7 @@ export async function ticketReview( req, res, next ) {
         },
       ];
       let finduserList = await aggregateUser( userQuery );
+      console.log( '🚀 ~ ticketReview ~ finduserList:', finduserList );
 
       // return;
       for ( let userData of finduserList ) {
@@ -1164,16 +1170,21 @@ export async function ticketReview( req, res, next ) {
         let description = `Created on ${createdOn}`;
 
         let Data = {
-          storeId: getstoreName.storeId,
-          issueDate: inputData.dateString,
+          'title': title,
+          'body': description,
+          'type': 'review',
+          'date': record.dateString,
+          'storeId': record.storeId,
+          'clientId': record.clientId,
+          'ticketId': record.ticketId,
         };
         const ticketsFeature = userData?.rolespermission?.some( ( f ) => f.featureName === 'FootfallDirectory' && ( f.modules.find( ( m ) => m.name == 'reviewer' && ( m.isAdd == true || m.isEdit == true ) ) ) );
 
         if ( ticketsFeature ) {
-          let notifyuser = await getAssinedStore( userData, req.body.storeId, Data );
+          let notifyuser = await getAssinedStore( userData, req.body.storeId );
           if ( userData && userData.fcmToken && notifyuser ) {
             const fcmToken = userData.fcmToken;
-            await sendPushNotification( title, description, fcmToken );
+            await sendPushNotification( title, description, fcmToken, Data );
           }
         }
       }
@@ -1189,7 +1200,7 @@ export async function ticketReview( req, res, next ) {
     }
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
-    logger.error( { error: err, funtion: 'ticketCreation' } );
+    logger.error( { error: err, funtion: 'ticketreview' } );
     return res.sendError( err, 500 );
   }
 }
@@ -1635,12 +1646,11 @@ export async function ticketApprove( req, res, next ) {
           },
       );
     }
-
-
-    let checkreview = getConfig.footfallDirectoryConfigs.revision.filter( ( data ) => data.actionType === 'reviewer' && data.isChecked === true );
+    console.log( req.body, getConfig.footfallDirectoryConfigs.revision );
     let checkapprove = getConfig.footfallDirectoryConfigs.revision.filter( ( data ) => data.actionType === 'approver' && data.isChecked === true );
 
-    if ( checkreview.length > 0 || checkapprove.length > 0 ) {
+
+    if ( checkapprove.length > 0 ) {
       let userQuery = [
         {
           $match: {
@@ -1650,24 +1660,30 @@ export async function ticketApprove( req, res, next ) {
         },
       ];
       let finduserList = await aggregateUser( userQuery );
+      console.log( '🚀 ~ ticketReview ~ finduserList:', finduserList );
 
-      // return;
       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 = {
-          storeId: getstoreName.storeId,
-          issueDate: inputData.dateString,
+          'title': title,
+          'body': description,
+          'type': 'approve',
+          'date': record.dateString,
+          'storeId': record.storeId,
+          'clientId': record.clientId,
+          'ticketId': record.ticketId,
         };
-        const ticketsFeature = userData?.rolespermission?.some( ( f ) => f.featureName === 'FootfallDirectory' && ( f.modules.find( ( m ) => m.name == 'approver' && ( m.isAdd == true || m.isEdit == true ) ) ) );
 
+        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, Data );
+          let notifyuser = await getAssinedStore( userData, req.body.storeId );
           if ( userData && userData.fcmToken && notifyuser ) {
             const fcmToken = userData.fcmToken;
-            await sendPushNotification( title, description, fcmToken );
+            await sendPushNotification( title, description, fcmToken, Data );
           }
         }
       }