tango-app-api-trax 3.5.2-alpha-11 → 3.5.2-alpha-13

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.5.2-alpha-11",
+    "version": "3.5.2-alpha-13",
     "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';
@@ -298,7 +298,8 @@ export async function approveChecklist( req, res ) {
     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 );
     }
@@ -313,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 );
 
@@ -364,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 );

package/src/controllers/traxDashboard.controllers.js

@@ -1,4 +1,4 @@
-import { logger, download, getChecklistUsers } from 'tango-app-api-middleware';
+import { logger, download, getChecklistUsers, insertOpenSearchData } from 'tango-app-api-middleware';
 import * as processedchecklistService from '../services/processedchecklist.services.js';
 import * as processedchecklistconfigService from '../services/processedchecklistconfig.services.js';
 import * as checklistconfigService from '../services/checklist.service.js';
@@ -1595,6 +1595,7 @@ export const checklistInfo = async ( req, res ) => {
         } },
         approvalByEmail: 1,
         approvalTime_string: 1,
+        _id: 1,
       },
     } );
 
@@ -1645,6 +1646,7 @@ export const checklistInfo = async ( req, res ) => {
         submitCount: 1,
         approvalByEmail: 1,
         approvalTime_string: 1,
+        _id: 1,
       },
     } );
 
@@ -3827,7 +3829,6 @@ export const reinitiatechecklist = async ( req, res ) => {
     let requestData = req.body;
     let findQuery = [];
     let findAndQuery = [];
-
     if ( requestData._id ) {
       findAndQuery.push(
           { _id: new mongoose.Types.ObjectId( requestData._id ) },
@@ -3837,6 +3838,15 @@ export const reinitiatechecklist = async ( req, res ) => {
         $project: {
           _id: 1,
           reinitiateStatus: 1,
+          store_id: 1,
+          storeName: 1,
+          userEmail: 1,
+          action: 1,
+          sourceCheckList_id: 1,
+          checkListName: 1,
+          client_id: 1,
+          date_iso: 1,
+          coverage: 1,
         },
       } );
       let getChecklist = await processedchecklistService.aggregate( findQuery );
@@ -3844,7 +3854,26 @@ export const reinitiatechecklist = async ( req, res ) => {
         let updateChecklist = await processedchecklistService.updateOne( { _id: new mongoose.Types.ObjectId( requestData._id ) }, { reinitiateStatus: true } );
         if ( updateChecklist ) {
           // Delete Time Flag Detection //
-
+          const data = getChecklist[0];
+          let logObj = {
+            client_id: data.client_id,
+            createAt: new Date(),
+            sourceCheckList_id: data.sourceCheckList_id,
+            checkListName: data.checkListName,
+            fromCheckListName: '',
+            type: 'checklist',
+            action: 'reinitiated',
+            storeName: data.storeName,
+            store_id: data.store_id,
+            userEmail: data.userEmail,
+            createdByEmail: req.user.email,
+            createdBy: req.user.userName,
+            coverage: data.coverage,
+            logDetails: {},
+            userType: req.user.userType,
+            processedChecklistId: data._id,
+          };
+          insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
           return res.sendSuccess( 'Reinitiate Successfully' );
         } else {
           return res.sendError( { error: 'Something Went wrong Please Try Again' }, 400 );
@@ -3854,25 +3883,65 @@ export const reinitiatechecklist = async ( req, res ) => {
       }
     } else if ( requestData.sourceCheckList_id ) {
       findAndQuery.push(
-          { _id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ) },
+          {
+            reinitiateStatus: false,
+            sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ),
+          },
       );
       findQuery.push( { $match: { $and: findAndQuery } } );
       findQuery.push( {
         $project: {
           _id: 1,
           reinitiateStatus: 1,
+          store_id: 1,
+          storeName: 1,
+          userEmail: 1,
+          action: 1,
+          sourceCheckList_id: 1,
+          checkListName: 1,
+          client_id: 1,
+          date_iso: 1,
+          coverage: 1,
         },
       } );
       let getChecklist = await processedchecklistService.aggregate( findQuery );
       if ( getChecklist.length>0 ) {
         let updateQuery = {
-          _id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ),
+          sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ),
           timeFlag: { $gt: 0 },
+          reinitiateStatus: false,
         };
         let updateChecklist = await processedchecklistService.updateMany( updateQuery, { reinitiateStatus: true } );
         if ( updateChecklist ) {
           // Delete Time Flag Detection //
-
+          const data = getChecklist[0];
+          // let stores = getChecklist.map( ( item ) => ( {
+          //   // store_id: item.store_id,
+          //   storeName: item.storeName,
+          // } ) );
+
+          // let users = getChecklist.map( ( item ) => ( {
+          //   userEmail: item.userEmail,
+          // } ) );
+          let logObj = {
+            client_id: data.client_id,
+            createAt: new Date(),
+            sourceCheckList_id: data.sourceCheckList_id,
+            checkListName: data.checkListName,
+            fromCheckListName: '',
+            type: 'checklist',
+            action: 'reinitiated',
+            storeName: data.storeName,
+            store_id: data.store_id,
+            userEmail: data.userEmail,
+            createdByEmail: req.user.email,
+            createdBy: req.user.userName,
+            coverage: data.coverage,
+            logDetails: {},
+            userType: req.user.userType,
+            processedChecklistId: data._id,
+          };
+          insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
           return res.sendSuccess( 'Reinitiate Successfully' );
         } else {
           return res.sendError( { error: 'Something Went wrong Please Try Again' }, 400 );