tango-app-api-trax 3.4.1-activitylog-8 → 3.4.1-activitylog-10

package/package.json

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

package/src/controllers/mobileTrax.controller.js

@@ -264,7 +264,7 @@ export async function startChecklist( req, res ) {
         }
       }
       let openSearch = JSON.parse( process.env.OPENSEARCH );
-      console.log( 'openSearch', openSearch );
+      // console.log( 'openSearch', openSearch );
       let inserttraxlogs = {
         client_id: req.user.clientId,
         createAt: new Date(),
@@ -288,7 +288,7 @@ export async function startChecklist( req, res ) {
       return res.sendError( 'something went wrong please try again', 500 );
     }
   } catch ( e ) {
-    console.log( 'e =>', e );
+    // console.log( 'e =>', e );
     logger.error( { function: 'startChecklist', error: e, body: req.body } );
     return res.sendError( e, 500 );
   }
@@ -455,7 +455,7 @@ export async function startTask( req, res ) {
     await checklistLogs.create( logData );
 
     let openSearch = JSON.parse( process.env.OPENSEARCH );
-    console.log( 'openSearch', openSearch );
+    // console.log( 'openSearch', openSearch );
     let inserttraxlogs = {
       client_id: req.user.clientId,
       createAt: new Date(),
@@ -470,9 +470,10 @@ export async function startTask( req, res ) {
       createdBy: task.userName || '',
       coverage: task.coverage || '',
       logDetails: {},
+      userType: req.user.userType,
     };
     // let insertOS = await insertOpenSearchData( 'test-traxlogs', inserttraxlogs );
-    console.log( 'inserttraxlogs', inserttraxlogs );
+    // console.log( 'inserttraxlogs', inserttraxlogs );
     insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
     return res.sendSuccess( getUpdatedTask );
   } catch ( error ) {
@@ -1847,7 +1848,7 @@ export async function submitChecklist( req, res ) {
           userName: getchecklist[0].userName || '',
           coverage: getchecklist[0].coverage || '',
         };
-        console.log( 'logInsertData=>', logInsertData );
+        // console.log( 'logInsertData=>', logInsertData );
         await checklistLogs.create( logInsertData );
         // let time = dayjs().format( 'HH:mm:ss' );
         // let [ hours, minutes ] = time.split( ':' ).map( Number );
@@ -1883,7 +1884,7 @@ export async function submitChecklist( req, res ) {
         if ( requestData.submittype == 'submit' ) {
           updateOpenSearch( req.user, requestData );
           let openSearch = JSON.parse( process.env.OPENSEARCH );
-          console.log( 'openSearch', openSearch );
+          // console.log( 'openSearch', openSearch );
           let inserttraxlogs = {
             client_id: req.user.clientId,
             createAt: new Date(),
@@ -1902,7 +1903,7 @@ export async function submitChecklist( req, res ) {
             logDetails: {},
             userType: req.user.userType,
           };
-          console.log( 'inserttraxlogs', inserttraxlogs );
+          // console.log( 'inserttraxlogs', inserttraxlogs );
           insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
         }
 
@@ -2071,7 +2072,7 @@ export async function submitTask( req, res ) {
       if ( submittype == 'submit' ) {
         updateOpenSearchTask( user, requestData );
         let openSearch = JSON.parse( process.env.OPENSEARCH );
-        console.log( 'openSearch', openSearch );
+        // console.log( 'openSearch', openSearch );
         let inserttraxlogs = {
           client_id: req.user.clientId,
           createAt: new Date(),
@@ -2090,7 +2091,7 @@ export async function submitTask( req, res ) {
           logDetails: {},
           userType: req.user.userType,
         };
-        console.log( 'inserttraxlogs', inserttraxlogs );
+        // console.log( 'inserttraxlogs', inserttraxlogs );
         insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
       }
 
@@ -2107,7 +2108,7 @@ export async function submiteyeTestTask( req, res ) {
   try {
     const { body: requestData, user } = req;
     const { processedcheckListId, date, submittype, currentTime, questionAnswers, streamId, qrCode } = requestData;
-    console.log( requestData );
+    // console.log( requestData );
     if ( !streamId ) {
       return res.sendError( 'streamId is required', 400 );
     }
@@ -2119,7 +2120,7 @@ export async function submiteyeTestTask( req, res ) {
       return res.sendError( 'Qr code already Exists', 400 );
     }
     let findQrExists = await cameraService.findOne( { streamName: streamId, qrCode: qrCode } );
-    console.log( findQrExists );
+    // console.log( findQrExists );
     if ( findQrExists ) {
       return res.sendError( 'Qr code already Exists', 400 );
     }
@@ -2557,7 +2558,7 @@ export async function dashboardv1( req, res ) {
 
     return res.sendSuccess( totalResult );
   } catch ( e ) {
-    console.log( 'v1 =>', e );
+    // console.log( 'v1 =>', e );
     logger.error( { function: 'dashboardv1', error: e, body: req.body } );
     return res.sendError( e, 500 );
   }

package/src/controllers/trax.controller.js

@@ -344,7 +344,7 @@ export const create = async ( req, res ) => {
       return res.sendError( e, 500 );
     } );
   } catch ( e ) {
-    console.log( 'e', e );
+    // console.log( 'e', e );
     logger.error( 'create =>', e );
     return res.sendError( e, 500 );
   }
@@ -2387,7 +2387,7 @@ export const validateUserv1 = async ( req, res ) => {
       }, {} );
 
       const duplicateUsers = Object.keys( duplicateUser ).filter( ( storeName ) => duplicateUser[storeName].count > 1 );
-      console.log( duplicateUsers, 'user' );
+      // console.log( duplicateUsers, 'user' );
       if ( duplicateUsers.length ) {
         return res.sendError( { validate: false, duplicates: duplicateUsers, message: 'Email is Duplicated' }, 400 );
       }
@@ -3352,7 +3352,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
     if ( getCLconfig.coverage == 'store' ) {
       let clusterList = allQuestion.filter( ( ele ) => ele?.clusterName ).map( ( item ) => item.assignId );
       if ( clusterList.length ) {
-        let clusterDetails = await clusterServices.findcluster( { _id: { $in: clusterList } } );
+        let clusterDetails = await clusterServices.findcluster( { _id: { $in: clusterList }, clientId: getCLconfig.client_id } );
         if ( clusterDetails.length ) {
           let idList = clusterDetails.flatMap( ( item ) => item.stores.map( ( ele ) => ele.store ) );
           let getStoreDetails = await storeService.find( { _id: { $in: idList }, status: 'active' } );
@@ -3419,7 +3419,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
     if ( getCLconfig.coverage == 'user' ) {
       let teamsList = allQuestion.filter( ( ele ) => ele?.teamName ).map( ( item ) => item.assignId );
       if ( teamsList.length ) {
-        let teamDetails = await teamsServices.findteams( { _id: { $in: teamsList } } );
+        let teamDetails = await teamsServices.findteams( { _id: { $in: teamsList }, clientId: getCLconfig.client_id } );
         if ( teamDetails.length ) {
           let idList = [ ...teamDetails.flatMap( ( item ) => item.users.map( ( ele ) => ele.userId ) ), ...teamDetails.flatMap( ( item ) => item.Teamlead.map( ( ele ) => ele.userId ) ) ];
           let userIdList = allQuestion.filter( ( qn ) => !qn?.teamName ).map( ( qn ) => qn.assignId.toString() );
@@ -3536,7 +3536,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
         }
         if ( getsubmitDetails ) {
           getsubmitDetails = [ getsubmitDetails ];
-          console.log( submittedDetails, getsubmitDetails );
+          // console.log( submittedDetails, getsubmitDetails );
         }
         function findDifferences( obj1, obj2 ) {
           return Object.keys( obj1 ).reduce( ( diff, key ) => {
@@ -4071,7 +4071,7 @@ export const selectAssign = async ( req, res ) => {
     }
     return res.sendSuccess( { 'totalCount': resuldData.length, 'data': resuldData } );
   } catch ( e ) {
-    console.log( 'e =>', e );
+    // console.log( 'e =>', e );
     logger.error( 'selectAssign =>', e );
     return res.sendError( e, 500 );
   }
@@ -4083,7 +4083,9 @@ async function assignUsers( data ) {
     let clusterDetails = await clusterServices.findcluster( { clientId: data.clientId, _id: new mongoose.Types.ObjectId( data.id ) } );
     if ( clusterDetails.length ) {
       let clusterList = clusterDetails[0].stores.map( ( ele ) => ele.store );
+      // console.log( clusterList );
       let storeDetails = await storeService.find( { _id: { $in: clusterList }, status: 'active' } );
+      // console.log( storeDetails.length );
       assignedData = await Promise.all( storeDetails.map( async ( store ) => {
         let userData = {
           storeId: store.storeId,
@@ -4091,7 +4093,7 @@ async function assignUsers( data ) {
           userName: store.spocDetails?.[0]?.name,
           userEmail: store.spocDetails?.[0]?.email,
           clusterName: clusterDetails?.[0]?.clusterName,
-          id: clusterDetails?.[0]?._id,
+          id: [ clusterDetails?.[0]?._id ],
         };
         return userData;
       } ) );
@@ -4106,7 +4108,7 @@ async function assignUsers( data ) {
           userName: user.userName,
           userEmail: user.email,
           teamName: teamDetails?.[0]?.teamName,
-          id: teamDetails?.[0]?._id,
+          id: [ teamDetails?.[0]?._id ],
         };
         return userData;
       } );
@@ -4144,12 +4146,12 @@ export async function checklistAssign( req, res ) {
         uniqueArr.push( ...uploadData );
       }
     } ) );
-
     if ( uniqueArr.length ) {
       if ( req.body.coverage == 'store' ) {
         uniqueArr = uniqueArr.reduce( ( acc, obj ) => {
           if ( acc[obj.storeName] ) {
             acc[obj.storeName].clusterName += ',' + obj.clusterName;
+            acc[obj.storeName].id.push( ...obj.id );
           } else {
             acc[obj.storeName] = { ...obj };
           }
@@ -4161,6 +4163,7 @@ export async function checklistAssign( req, res ) {
         uniqueArr = uniqueArr.reduce( ( acc, obj ) => {
           if ( acc[obj.userEmail] ) {
             acc[obj.userEmail].teamName += ','+ obj.teamName;
+            acc[obj.userEmail].id.push( ...obj.id );
           } else {
             acc[obj.userEmail] = { ...obj };
           }
@@ -4186,18 +4189,25 @@ export async function updateAssign( req, res ) {
     if ( !checklistDetails ) {
       return res.sendError( 'No data found', 204 );
     }
-    let groupList = req.body.assignedGroup;
-    req.body.assignedGroup = [ ...new Set( req.body.assignedGroup.map( ( item ) => item.id ) ) ];
-    groupList = req.body.assignedGroup.reduce( ( acc, ele ) => {
-      let findDetails = groupList.find( ( item ) => item.id == ele );
-      if ( findDetails ) {
-        acc.push( findDetails?.clusterName || findDetails?.teamName );
-      };
-      return acc;
-    }, [] );
-    // req.body.assignedGroup = req.body.assignedGroup.map( ( ele ) => {
-    //   return { id: ele };
-    // } );
+    let groupList = [];
+    let groupAssignList = req.body.assignedGroup;
+    req.body.assignedGroup = [ ...new Set( req.body.assignedGroup.flatMap( ( item ) => item.id ) ) ];
+
+    groupAssignList.forEach( ( ele ) => {
+      let gName;
+      if ( ele?.clusterName ) {
+        gName = ele.clusterName.split( ',' );
+      }
+      if ( ele?.teamName ) {
+        gName = ele.teamName.split( ',' );
+      }
+      gName.forEach( ( name ) => {
+        if ( !groupList.includes( name ) ) {
+          groupList.push( name );
+        }
+      } );
+    } );
+
     let getAssignedDetails = await assignedService.find( { checkListId: req.body.checkListId } );
     let oldCoverage;
     if ( getAssignedDetails.length ) {