tango-app-api-trax 3.5.2-alpha-10 → 3.5.2-alpha-12

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.5.2-alpha-10",
+    "version": "3.5.2-alpha-12",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/gallery.controller.js

@@ -1,6 +1,6 @@
 
 
-import { logger, insertOpenSearchData } from 'tango-app-api-middleware';
+import { logger, insertOpenSearchData, sendTeamsNotification } from 'tango-app-api-middleware';
 import * as storeService from '../services/store.service.js';
 import * as groupService from '../services/group.service.js';
 import * as clusterService from '../services/cluster.service.js';
@@ -288,19 +288,18 @@ export async function approveChecklist( req, res ) {
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
     toDate.setUTCHours( 23, 59, 59, 59 );
     let query = { sourceCheckList_id: req.body.sourceCheckList_id, date_iso: { $gte: req.body.fromDate, $lte: toDate }, $or: [ { checklistStatus: 'submit' }, { redoStatus: true } ], approvalEnable: true };
+    if ( !( req.body.assignedStores && req.body.assignedStores.length >0 ) ) {
+      req.body.assignedStores = req.body.storeId;
+    }
     if ( req.body?.storeId?.length ) {
-      if ( req.body.assignedStores && req.body.assignedStores.length > 0 ) {
-        const filteredStoreIds = req.body.storeId.filter( ( store ) => req.body.assignedStores.includes( store ) );
-        query['store_id'] = { $in: filteredStoreIds };
-      } else {
-        const filteredStoreIds = req.body?.storeId;
-        query['store_id'] = { $in: filteredStoreIds };
-      }
+      const filteredStoreIds = req.body.storeId.filter( ( store ) => req.body.assignedStores.includes( store ) );
+      query['store_id'] = { $in: filteredStoreIds };
     }
     if ( req.body?.userEmail?.length ) {
       query['userEmail'] = { $in: req.body?.userEmail };
     }
-    let checklistDetails = await processedChecklist.find( query, { _id: 1, checklistStatus: 1, storeName: 1, store_id: 1, userEmail: 1, client_id: 1, coverage: 1, checkListName: 1 } );
+    let checklistDetails = await processedChecklist.find( query, { _id: 1, checklistStatus: 1, storeName: 1, store_id: 1, userEmail: 1, client_id: 1, coverage: 1, checkListName: 1, sourceCheckList_id: 1 } );
+    // console.log( 'checklistDetails =>', checklistDetails );
     if ( !checklistDetails.length ) {
       return res.sendError( 'No data found', 204 );
     }
@@ -315,7 +314,19 @@ export async function approveChecklist( req, res ) {
         approvalByEmail: req.user.email,
       };
       let updateResponse = await processedChecklist.updateMany( { _id: { $in: idList }, approvalStatus: false }, approvalUpdateData );
+
+      let teamsMsg;
+      let teamsAlertUrls = process.env.teamsAlertURL ? JSON.parse( process.env.teamsAlertURL ) : '';
+      teamsMsg = 'ClientId: '+ checklistDetails[0].client_id + ', Type: Checklist, Process: started, Action: Approval, ChecklistId: '+ checklistDetails[0].sourceCheckList_id + ', Checklist Name: '+ checklistDetails[0].checkListName +', UpDatedBy: '+ req.user.email;
+      if ( teamsAlertUrls && teamsAlertUrls.approvalAlert ) {
+        sendTeamsNotification( teamsAlertUrls.approvalAlert, teamsMsg );
+      }
+
       if ( updateResponse.modifiedCount || updateResponse.matchedCount ) {
+        teamsMsg = 'ClientId: '+ checklistDetails[0].client_id + ', Type: Checklist, Process: Completed, Updated Count: '+updateResponse.modifiedCount+' Action: Approval, ChecklistId: '+ checklistDetails[0].sourceCheckList_id + ', Checklist Name: '+ checklistDetails[0].checkListName +', UpDatedBy: '+ req.user.email;
+        if ( teamsAlertUrls && teamsAlertUrls.approvalAlert ) {
+          sendTeamsNotification( teamsAlertUrls.approvalAlert, teamsMsg );
+        }
         let inputstores = checklistDetails.filter( ( data ) => data.checklistStatus == 'submit' );
         let storeNames = inputstores.map( ( data ) => data.storeName );
 
@@ -336,7 +347,7 @@ export async function approveChecklist( req, res ) {
             approvalByEmail: req.user.email,
           },
         };
-        // console.log( params );
+        console.log( params );
         const requestOptions = {
           method: 'POST',
           headers: {
@@ -366,6 +377,7 @@ export async function approveChecklist( req, res ) {
           },
           'userType': req.user.userType,
           'requestedStores': filteredStoreIds,
+          'requestedUsers': req.body.userEmail,
         };
         console.log( 'logData', logData );
         let urlopensearch = JSON.parse( process.env.OPENSEARCH );
@@ -386,7 +398,7 @@ export async function approveChecklist( req, res ) {
       return res.sendError( `${redoList.length} stores has not been approved since those stores are not submitted`, 400 );
     }
   } catch ( e ) {
-    console.log( 'e', e );
+    // console.log( 'e', e );
     logger.error( { function: 'approveChecklist', error: e } );
     return res.sendError( e, 500 );
   }