tango-app-api-trax 3.6.0-inditech-1 → 3.6.0-sec-1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.6.0-inditech-1",
+    "version": "3.6.0-sec-1",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/gallery.controller.js

@@ -16,7 +16,6 @@ import { aggregate } from '../services/user.service.js';
 // import axios from 'axios';
 import timeZone from 'dayjs/plugin/timezone.js';
 import customParseFormat from 'dayjs/plugin/customParseFormat.js';
-import * as notificationModel from '../services/notification.service.js';
 
 dayjs.extend( customParseFormat );
 dayjs.extend( timeZone );
@@ -484,8 +483,8 @@ export async function redoChecklist( req, res ) {
         sectionName: question[sectionIndex].sectionName,
         questionName: question[sectionIndex].questions[findQuestion].qname,
         action: 'redo',
-        store_id: checklistDetails?.store_id ? checklistDetails?.store_id : '',
-        storeName: checklistDetails?.storeName ? checklistDetails?.storeName : '',
+        store_id: checklistDetails?.store_id?checklistDetails?.store_id:'',
+        storeName: checklistDetails?.storeName?checklistDetails?.storeName:'',
         client_id: checklistDetails.client_id,
         processedChecklistId: checklistDetails._id,
         type: checklistDetails.checkListType,
@@ -508,16 +507,16 @@ export async function redoChecklist( req, res ) {
       let url = JSON.parse( process.env.LAMBDAURL );
       let searchResponse = await fetch( url.redoChecklist, requestOptions );
       // console.log( searchResponse.ok );
-      let logData = {
+      let logData= {
         'client_id': checklistDetails.client_id,
         'createAt': new Date(),
         'sourceCheckList_id': checklistDetails.sourceCheckList_id,
         'checkListName': checklistDetails.checkListName,
         'fromCheckListName': checklistDetails.checkListName,
         'type': 'checklist',
-        'action': checklistDetails.redoStatus ? 'multiredo' : 'redo',
-        'storeName': checklistDetails?.storeName ? checklistDetails?.storeName : '',
-        'store_id': checklistDetails?.store_id ? checklistDetails?.store_id : '',
+        'action': checklistDetails.redoStatus?'multiredo': 'redo',
+        'storeName': checklistDetails?.storeName?checklistDetails?.storeName:'',
+        'store_id': checklistDetails?.store_id?checklistDetails?.store_id:'',
         'userName': checklistDetails.userName,
         'userEmail': checklistDetails.userEmail,
         'createdByEmail': req.user.email,
@@ -545,7 +544,7 @@ export async function redoChecklist( req, res ) {
 
 export async function redomultiChecklist( req, res ) {
   try {
-    let inputData = req.body.payload.coverage === 'user' ? req.body.payload.userEmail : req.body.payload.storeName;
+    let inputData = req.body.payload.coverage==='user'?req.body.payload.userEmail:req.body.payload.storeName;
 
 
     for ( let originalData of inputData ) {
@@ -626,8 +625,8 @@ export async function redomultiChecklist( req, res ) {
           sectionName: question[sectionIndex].sectionName,
           questionName: question[sectionIndex].questions[findQuestion].qname,
           action: 'redo',
-          store_id: checklistDetails?.store_id ? checklistDetails?.store_id : '',
-          storeName: checklistDetails?.storeName ? checklistDetails?.storeName : '',
+          store_id: checklistDetails?.store_id?checklistDetails?.store_id:'',
+          storeName: checklistDetails?.storeName?checklistDetails?.storeName:'',
           client_id: checklistDetails.client_id,
           processedChecklistId: checklistDetails._id,
           type: checklistDetails.checkListType,
@@ -641,9 +640,9 @@ export async function redomultiChecklist( req, res ) {
         await checklistLogs.create( data );
 
 
-        req.body.payload._id = originalData.checklistId;
-        req.body.payload.section_id = originalData.section_id;
-        req.body.payload.uniqueNo = originalData.uniqueNo;
+        req.body.payload._id=originalData.checklistId;
+        req.body.payload.section_id=originalData.section_id;
+        req.body.payload.uniqueNo=originalData.uniqueNo;
         // console.log( req.body );
 
 
@@ -657,16 +656,16 @@ export async function redomultiChecklist( req, res ) {
         let url = JSON.parse( process.env.LAMBDAURL );
         let searchResponse = await fetch( url.redoChecklist, requestOptions );
         console.log( searchResponse.ok );
-        let logData = {
+        let logData= {
           'client_id': checklistDetails.client_id,
           'createAt': new Date(),
           'sourceCheckList_id': checklistDetails.sourceCheckList_id,
           'checkListName': checklistDetails.checkListName,
           'fromCheckListName': checklistDetails.checkListName,
           'type': 'checklist',
-          'action': checklistDetails.redoStatus ? 'multiredo' : 'redo',
-          'storeName': checklistDetails?.storeName ? checklistDetails?.storeName : '',
-          'store_id': checklistDetails?.store_id ? checklistDetails?.store_id : '',
+          'action': checklistDetails.redoStatus?'multiredo': 'redo',
+          'storeName': checklistDetails?.storeName?checklistDetails?.storeName:'',
+          'store_id': checklistDetails?.store_id?checklistDetails?.store_id:'',
           'userName': checklistDetails.userName,
           'userEmail': checklistDetails.userEmail,
           'createdByEmail': req.user.email,
@@ -770,7 +769,6 @@ export async function approvalstatus( req, res ) {
 export const headerStoresV2 = async ( req, res ) => {
   try {
     let reqestData = req.body;
-
     let getUserEmail = req.user.email;
     let getUserType = req.user.userType;
     let getRole = req.user.role;
@@ -1050,7 +1048,7 @@ export async function teamsList( req, res ) {
     ];
 
 
-    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
+    if ( req.user&&req.user.userType==='client'&&req.user.role!='superadmin' ) {
       query.push( {
         $match: {
           Teamlead: {
@@ -1090,16 +1088,14 @@ export async function userList( req, res ) {
         },
       },
     ];
-    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
-      let findTeams = await findteams( {
-        Teamlead: {
-          $elemMatch: {
-            email: req.user.email,
-          },
-        }, clientId: req.body.clientId,
-      } );
+    if ( req.user&&req.user.userType==='client'&&req.user.role!='superadmin' ) {
+      let findTeams = await findteams( { Teamlead: {
+        $elemMatch: {
+          email: req.user.email,
+        },
+      }, clientId: req.body.clientId } );
       req.body.teams = findTeams.map( ( data ) => data.teamName );
-      if ( req.body.teams.length === 0 ) {
+      if ( req.body.teams.length===0 ) {
         query.push( {
           $match: {
             userEmail: { $in: [ req.user.email ] },
@@ -1133,18 +1129,3 @@ export async function userList( req, res ) {
     return res.sendError( { error: error }, 500 );
   }
 }
-
-
-export async function checkNotificationCount( req, res ) {
-  try {
-    console.log( req.user._id );
-    let notifyRecord = await notificationModel.findnotification( { 'userId': new mongoose.Types.ObjectId( req.user._id ), 'status': 'unsend' } );
-    let findRecord = notifyRecord.map( ( data ) => data._id );
-    console.log( findRecord );
-    await notificationModel.updateManynotification( { _id: { $in: findRecord } }, { $set: { 'status': 'send' } } );
-    return res.sendSuccess( notifyRecord );
-  } catch ( error ) {
-    logger.error( { error: error, function: 'checkNotificationCount' } );
-    return res.sendError( { error: error }, 500 );
-  }
-}

package/src/controllers/internalTrax.controller.js

@@ -22,7 +22,7 @@ import { sendPushNotification, sendAiPushNotification } from 'tango-app-api-midd
 // import * as planoService from '../services/planogram.service.js';
 import * as clusterServices from '../services/cluster.service.js';
 import * as teamsServices from '../services/teams.service.js';
-import * as notificationModel from '../services/notification.service.js';
+
 
 const ObjectId = mongoose.Types.ObjectId;
 dayjs.extend( customParseFormat );
@@ -2345,120 +2345,3 @@ export async function getLiveChecklistClients( req, res ) {
     else res.sendError( error, 500 );
   }
 }
-
-
-export async function notificationCreate( req, res ) {
-  try {
-    let insertData= [];
-    let findAllUser = await userService.find( { clientId: '464', isActive: true } );
-    for ( let user of findAllUser ) {
-      for ( let store of req.body ) {
-        let data= {};
-        data.userId = user._id;
-        data.storeId = store.storeId;
-        data.storeName = store.storeName;
-        data.captureTime = store.captureTime;
-        data.slotNo = store.slotNo;
-        let payload = {
-          userType: user.userType,
-          role: user.role,
-          assignedStores: user.assignedStores,
-          clientId: user.clientId,
-          email: user.email,
-        };
-        let result = await storecheckExists( payload );
-        if ( result ) {
-          insertData.push( data );
-        }
-      }
-    }
-    let create = await notificationModel.insertManynotificationModel( insertData );
-    // console.log( create );
-    if ( create ) {
-      return res.sendSuccess( 'updated successfully' );
-    }
-  } catch ( e ) {
-    logger.error( { error: e, function: 'notificationCreate' } );
-    if ( e.name === 'ValidationError' ) res.sendBadRequest( e );
-    else res.sendError( e, 500 );
-  }
-}
-
-
-export async function storecheckExists( data ) {
-  try {
-    if ( data && data.userType === 'client' && data.role !== 'superadmin' ) {
-      let storeIds = new Set( data.assignedStores.map( ( store ) => store.storeId ) );
-
-
-      // Fetch clusters and teams in parallel
-      const [ clustersList, teamsList ] = await Promise.all( [
-        clusterServices.findcluster( { clientId: data.clientId, Teamlead: { $elemMatch: { email: data.email } } } ),
-        teamsServices.findteams( { clientId: data.clientId, Teamlead: { $elemMatch: { email: data.email } } } ),
-      ] );
-
-      // Process clusters
-      if ( clustersList.length > 0 ) {
-        for ( let cluster of clustersList ) {
-          cluster.stores.forEach( ( store ) => storeIds.add( store.storeId ) );
-        }
-      }
-
-      // Process teams
-      if ( teamsList.length > 0 ) {
-        for ( let team of teamsList ) {
-          for ( let user of team.users ) {
-            let findUser = await userService.findOne( { _id: user.userId } );
-            if ( findUser && findUser.assignedStores?.length > 0 ) {
-              findUser.assignedStores.forEach( ( store ) => storeIds.add( store.storeId ) );
-            }
-
-            // Fetch clusters for the user
-            let userClustersList = await clusterServices.findcluster( { clientId: data.clientId, Teamlead: { $elemMatch: { email: findUser.email } } } );
-            if ( userClustersList.length > 0 ) {
-              for ( let cluster of userClustersList ) {
-                cluster.stores.forEach( ( store ) => storeIds.add( store.storeId ) );
-              }
-            }
-          }
-        }
-      }
-      let TeamMember = await teamsServices.findteams( { clientId: data.clientId, users: { $elemMatch: { email: data.email } } } );
-      if ( TeamMember&&TeamMember.length>0 ) {
-        for ( let team of TeamMember ) {
-          let clusterList = await clusterServices.findcluster( { clientId: data.clientId, teams: { $elemMatch: { name: team.teamName } } } );
-          if ( clusterList.length > 0 ) {
-            for ( let cluster of clusterList ) {
-              cluster.stores.forEach( ( store ) => storeIds.add( store.storeId ) );
-            }
-          }
-        }
-      }
-      let TeamLeader = await teamsServices.findteams( { clientId: data.clientId, Teamlead: { $elemMatch: { email: data.email } } } );
-      if ( TeamLeader&&TeamLeader.length>0 ) {
-        for ( let team of TeamLeader ) {
-          let clusterList = await clusterServices.findcluster( { clientId: data.clientId, teams: { $elemMatch: { name: team.teamName } } } );
-          if ( clusterList.length > 0 ) {
-            for ( let cluster of clusterList ) {
-              cluster.stores.forEach( ( store ) => storeIds.add( store.storeId ) );
-            }
-          }
-        }
-      }
-      // Convert Set back to Array if needed
-
-      let resultStores = Array.from( storeIds );
-      resultStores.filter( ( ele ) => ele.storeId===data.storeId );
-
-      if ( resultStores.length>0 ) {
-        return true;
-      } else {
-        return false;
-      }
-    } else {
-      return true;
-    }
-  } catch ( error ) {
-    logger.error( { error: error, function: 'internalAISendPushNotification' } );
-  }
-}

package/src/controllers/trax.controller.js

@@ -280,6 +280,7 @@ export const create = async ( req, res ) => {
             checkListId: checkListId,
             question: section.questions,
             checkList: inputBody.checklistName,
+            sectionNumber: section.sectionNumber,
           };
           await questionService.create( sectionList ).then( async ( data ) => {
             if ( i == inputBody.sections.length - 1 ) {
@@ -429,6 +430,7 @@ export const getConfigDetails = async ( req, res ) => {
             name: item.section,
             oldName: item?.sectionOldName,
             questions: item.question,
+            sectionNumber: item.sectionNumber,
           } );
         } );
         sectionList = sections;
@@ -906,11 +908,13 @@ export const update = async ( req, res ) => {
           checkListId: checkListId,
           question: section.questions,
           checkList: inputBody.checklistName,
+          sectionNumber: section.sectionNumber,
         } );
       }
     }
     await questionService.deleteMany( { checkListId: checkListId, client_id: req.body.clientId } );
     if ( sectionList.length ) {
+      sectionList.sort( ( a, b ) => a.sectionNumber - b.sectionNumber );
       await questionService.insertMany( sectionList );
     }
 
@@ -1022,6 +1026,14 @@ export const update = async ( req, res ) => {
         userType: req.user.userType,
       };
       insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, insertLogData );
+
+      // / Teams Alert
+      let teamsMsg;
+      let teamsAlertUrls = process.env.teamsAlertURL ? JSON.parse( process.env.teamsAlertURL ) : '';
+      teamsMsg = 'ClientId: '+ insertLogData.client_id + ', Type: Checklist, Action: Checklist Question Edited, ChecklistId: '+ insertLogData.sourceCheckList_id + ', Checklist Name: '+ insertLogData.checkListName +', UpDatedBy: '+ req.user.email;
+      if ( teamsAlertUrls && teamsAlertUrls.questionEditAlert ) {
+        sendTeamsNotification( teamsAlertUrls.questionEditAlert, teamsMsg );
+      }
     }
 
     if ( inputBody.submitType == 'save' ) {
@@ -1670,6 +1682,7 @@ export const updateConfigurev1 =async ( req, res ) => {
       client_id: req.body.clientId,
       createdByEmail: req.user.email,
       approver: inputBody?.checkListDetails?.approver || [],
+      sections: inputBody?.checkListDetails?.sections || [],
     };
     await checklistLogs.create( logInsertData );