tango-app-api-trax 3.3.1-beta-49 → 3.3.1-beta-50

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.3.1-beta-49",
+    "version": "3.3.1-beta-50",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,7 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.2.58",
+        "tango-api-schema": "^2.2.61",
         "tango-app-api-middleware": "^3.1.55",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/mobileTrax.controller.js

@@ -227,6 +227,9 @@ export async function startChecklist( req, res ) {
         checkListName: getBeforeChecklist[0].checkListName,
         type: getBeforeChecklist[0].checkListType,
         client_id: req.user.clientId,
+        userEmail: getBeforeChecklist[0].userEmail || '',
+        userName: getBeforeChecklist[0].userName || '',
+        coverage: getBeforeChecklist[0].coverage || '',
       };
       await checklistLogs.create( logInsertData );
       let getchecklist = getupdatedchecklist;
@@ -1825,8 +1828,11 @@ export async function submitChecklist( req, res ) {
           type: getchecklist[0].checkListType,
           client_id: req.user.clientId,
           redoStatus: requestData?.redoStatus ? true : false,
+          userEmail: getchecklist[0].userEmail || '',
+          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 );
@@ -2062,6 +2068,9 @@ async function updateOpenSearch( user, data ) {
       checkListName: getchecklist[0].checkListName,
       type: getchecklist[0].checkListType,
       client_id: user.clientId,
+      userEmail: getchecklist[0].userEmail || '',
+      userName: getchecklist[0].userName || '',
+      coverage: getchecklist[0].coverage || '',
     };
     await checklistLogs.create( logInsertData );
     const requestOptions = {
@@ -2083,6 +2092,9 @@ async function updateOpenSearch( user, data ) {
         checkListName: getchecklist[0].checkListName,
         type: getchecklist[0].checkListType,
         client_id: user.clientId,
+        userEmail: getchecklist[0].userEmail || '',
+        userName: getchecklist[0].userName || '',
+        coverage: getchecklist[0].coverage || '',
       };
       await checklistLogs.create( logInsertData );
     }
@@ -2111,6 +2123,9 @@ async function updateOpenSearchTask( user, data ) {
       checkListName: getchecklist[0].checkListName,
       type: getchecklist[0].checkListType,
       client_id: user.clientId,
+      userEmail: getchecklist[0].userEmail || '',
+      userName: getchecklist[0].userName || '',
+      coverage: getchecklist[0].coverage || '',
     };
     await checklistLogs.create( logInsertData );
     const requestOptions = {
@@ -2132,6 +2147,9 @@ async function updateOpenSearchTask( user, data ) {
         checkListName: getchecklist[0].checkListName,
         type: getchecklist[0].checkListType,
         client_id: user.clientId,
+        userEmail: getchecklist[0].userEmail || '',
+        userName: getchecklist[0].userName || '',
+        coverage: getchecklist[0].coverage || '',
       };
       await checklistLogs.create( logInsertData );
     }

package/src/controllers/trax.controller.js

@@ -402,11 +402,19 @@ export const getConfigDetails = async ( req, res ) => {
       let singleAssign;
       let groupAssign;
       if ( storechecklistdetails.coverage == 'store' ) {
-        singleAssign = assignList.filter( ( item ) => typeof item?.store_id != 'undefined' && item?.store_id != '' ).map( ( item ) => item.assignId );
-        groupAssign = assignList.filter( ( item ) => typeof item?.clusterName != 'undefined' && item?.clusterName != '' ).map( ( item ) => item.assignId );
+        singleAssign = assignList.filter( ( item ) => typeof item?.store_id != 'undefined' && item?.store_id != '' ).map( ( item ) => {
+          return { id: item.assignId, type: 'store' };
+        } );
+        groupAssign = assignList.filter( ( item ) => typeof item?.clusterName != 'undefined' && item?.clusterName != '' ).map( ( item ) => {
+          return { id: item.assignId, type: 'cluster' };
+        } );
       } else {
-        singleAssign = assignList.filter( ( item ) => typeof item?.userEmail != 'undefined' && item?.userEmail !='' ).map( ( item ) => item.assignId );
-        groupAssign = assignList.filter( ( item ) => typeof item?.teamName != 'undefined' && item?.teamName != '' ).map( ( item ) => item.assignId );
+        singleAssign = assignList.filter( ( item ) => typeof item?.userEmail != 'undefined' && item?.userEmail !='' ).map( ( item ) => {
+          return { id: item.assignId, type: 'user' };
+        } );
+        groupAssign = assignList.filter( ( item ) => typeof item?.teamName != 'undefined' && item?.teamName != '' ).map( ( item ) => {
+          return { id: item.assignId, type: 'teams' };
+        } );
       }
       result.checkListDetails = { ...result.checkListDetails, ...{ sections: sectionList }, singleAssign, groupAssign };
     }
@@ -2096,7 +2104,9 @@ export async function assignChecklistUser( req, res ) {
         }
       }
     } ) );
-    return res.sendSuccess( { idList: [ ...new Set( assignData.map( ( item ) => item?.assignId?.toString() ) ) ], assignData } );
+    return res.sendSuccess( { idList: [ ...new Set( assignData.map( ( item ) => {
+      return { id: item?.assignId?.toString(), type: inputBody.coverage == 'store' ? typeof item.clusterName == 'undefined' ? 'store' : 'cluster' : typeof item.teamsName == 'undefined' ? 'user' : 'teams' };
+    } ) ) ], assignData } );
   } catch ( e ) {
     logger.error( { functionName: 'assignUser', error: e } );
     return res.sendError( e, 500 );