tango-app-api-task 3.4.1-activitylog-2 → 3.4.1-activitylog-4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.4.1-activitylog-2",
+    "version": "3.4.1-activitylog-4",
     "description": "Task",
     "main": "index.js",
     "type": "module",

package/src/controllers/task.controller.js

@@ -248,6 +248,7 @@ export async function createUpdateTask( req, res ) {
               questionEdit: questionList.questionEdit,
               questionDelete: questionList.questionDelete,
             },
+            userType: req?.user?.userType || '',
           };
           await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, insertLogData );
         }
@@ -266,6 +267,7 @@ export async function createUpdateTask( req, res ) {
           createdBy: req.user.userName,
           coverage: 'store',
           logDetails: {},
+          userType: req?.user?.userType || '',
         };
         await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
       }
@@ -285,6 +287,7 @@ export async function createUpdateTask( req, res ) {
           createdBy: req.user.userName,
           coverage: 'store',
           logDetails: {},
+          userType: req?.user?.userType || '',
         };
         await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
       }
@@ -1158,6 +1161,7 @@ export async function taskConfig( req, res ) {
             ...( inputBody.coverage == 'user' ) ? { userAdded: inputBody.added } :{ userAdded: [] },
             ...( req.body.removed.user.length ) ? { userRemoved: inputBody.removed.user } :{ userRemoved: [] },
           },
+          userType: req?.user?.userType || '',
         };
         await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, insertData );
       }
@@ -1176,6 +1180,7 @@ export async function taskConfig( req, res ) {
           createdBy: req.user.userName,
           coverage: inputBody.coverage,
           logDetails: {},
+          userType: req?.user?.userType || '',
         };
         await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
       }
@@ -1819,6 +1824,7 @@ export async function reinitiateTask( req, res ) {
           storeRemoved: [],
           userAdded: [],
           userRemoved: [],
+          userType: req?.user?.userType || '',
         },
       };
       await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, insertData );
@@ -1907,15 +1913,26 @@ export async function createChecklistTask( req, res ) {
     }
 
     if ( response?._id ) {
+      inputBody.question[0].answers.forEach( ( ans ) => {
+        ans.validation = false;
+        ans.showLinked = false;
+        ans.linkedQuestion = 0;
+        ans.validationType = '';
+        if ( ![ 'image', 'descriptiveImage', 'multipleImage' ].includes( inputBody.question[0].answerType ) ) {
+          ans.referenceImage = '';
+        }
+      } );
       if ( inputBody.question[0].questionReferenceImage.length ) {
         let images = [];
         inputBody.question[0].questionReferenceImage.forEach( ( ele ) => {
-          let imgUrl = decodeURIComponent( ele.split( '?' )[0] );
-          let url = imgUrl.split( '/' );
-          if ( url.includes( 'https:' ) || url.includes( 'http:' ) ) {
-            url.splice( 0, 3 );
+          if ( ele.trim() ) {
+            let imgUrl = decodeURIComponent( ele.split( '?' )[0] );
+            let url = imgUrl.split( '/' );
+            if ( url.includes( 'https:' ) || url.includes( 'http:' ) ) {
+              url.splice( 0, 3 );
+            }
+            images.push( url.join( '/' ) );
           }
-          images.push( url.join( '/' ) );
         } );
         inputBody.question[0].questionReferenceImage = images;
       }
@@ -2026,6 +2043,7 @@ export async function createChecklistTask( req, res ) {
           'userEmail': inputBody.userEmail,
           'coverage': 'store',
           'logDetails': {},
+          'userType': req?.user?.userType || '',
         };
         let urlopensearch = JSON.parse( process.env.OPENSEARCH );
         console.log( 'logData', logData );
@@ -2245,6 +2263,7 @@ export async function createChecklistMultiTask( req, res ) {
             // 'userEmail': inputBody.userEmail,
             'coverage': 'store',
             'logDetails': {},
+            'userType': req?.user?.userType || '',
           };
           let urlopensearch = JSON.parse( process.env.OPENSEARCH );
           console.log( 'logData', logData );
@@ -2319,6 +2338,7 @@ export async function approveTask( req, res ) {
           'logDetails': {
             'approved': storeNames,
           },
+          'userType': req?.user?.userType || '',
         };
         let urlopensearch = JSON.parse( process.env.OPENSEARCH );
         console.log( 'logData', logData );
@@ -2438,6 +2458,7 @@ export async function redoTask( req, res ) {
         'createdBy': req.user.userName,
         'coverage': taskDetails.coverage,
         'logDetails': {},
+        'userType': req?.user?.userType || '',
       };
       let urlopensearch = JSON.parse( process.env.OPENSEARCH );
       console.log( 'logData', logData );
@@ -2554,6 +2575,7 @@ export async function redomultiTask( req, res ) {
           'createdBy': req.user.userName,
           'coverage': taskDetails.coverage,
           'logDetails': {},
+          'userType': req?.user?.userType || '',
         };
         let urlopensearch = JSON.parse( process.env.OPENSEARCH );
         console.log( 'logData', logData );
@@ -2998,6 +3020,7 @@ export const updatePublish = async ( req, res ) => {
       createdBy: req.user.userName,
       coverage: getCheckDetails.coverage,
       logDetails: {},
+      userType: req?.user?.userType || '',
     };
     await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
     return res.sendSuccess( { checklistName: getCheckDetails.checkListName, message: 'Updated Successfully' } );
@@ -3084,6 +3107,7 @@ export const duplicateChecklist = async ( req, res ) => {
           createdBy: req.user.userName,
           coverage: checkDetails.coverage,
           logDetails: {},
+          userType: req?.user?.userType || '',
         };
         insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
         return res.sendSuccess( { message: 'Task Duplicated Successfully' } );

package/src/controllers/taskDashboard.controllers.js

@@ -750,6 +750,7 @@ export const taskDropdownListV1 = async ( req, res ) => {
     let findAndQuery = [];
     findAndQuery.push(
         { client_id: requestData.clientId },
+        { $and: [ { checkListName: { $ne: '' } }, { checkListName: { $ne: null } } ] },
         // { checkListType: 'task' },
         // { isdeleted: false },
     );