tango-app-api-task 3.4.0-alpha-4 → 3.4.0-beta-1

package/package.json

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

package/src/controllers/task.controller.js

@@ -191,8 +191,8 @@ export async function createUpdateTask( req, res ) {
                 delete ans.answeroptionNumber;
               } );
               let compare = findDifferences( qn, question );
-              if ( Object.keys( compare ).length && ( compare?.answerType || compare?.answers || compare?.linkType ) ) {
-                questionList.questionEdit.push( { sectionName: ele.section, questions: [ { previous: qn }, { new: question } ] } );
+              if ( Object.keys( compare ).length && ( compare?.answerType || compare?.answers || compare?.linkType || compare?.qname ) ) {
+                questionList.questionEdit.push( { sectionName: ele.section, questions: [ { previous: qn, new: question } ] } );
               }
             } else {
               let sectionIndex = questionList.questionDelete.findIndex( ( sec ) => sec.sectionName === ele.section );
@@ -231,7 +231,7 @@ export async function createUpdateTask( req, res ) {
             sourceCheckList_id: inputBody._id,
             checkListName: inputBody.checklistName,
             fromCheckListName: '',
-            type: 'checklist',
+            type: 'task',
             action: 'edited',
             storeName: '',
             store_id: '',
@@ -659,14 +659,14 @@ export const validateUserv1 = async ( req, res ) => {
       {
         $project: {
           newEmail: { $toLower: '$email' },
-          isActive: 1,
+          // isActive: 1,
           clientId: 1,
         },
       },
       {
         $match: {
           newEmail: { $in: userEmailList },
-          isActive: true,
+          // isActive: true,
           clientId: { $ne: req.body.clientId },
         },
       },
@@ -1095,7 +1095,7 @@ export async function taskConfig( req, res ) {
           checkListName: checklistDetails.checkListName,
           fromCheckListName: '',
           type: 'task',
-          action: 'updated',
+          action: inputBody.publish ? 'updated' : 'draft',
           storeName: '',
           store_id: '',
           createdByEmail: req.user.email,
@@ -2190,7 +2190,7 @@ export async function approveTask( req, res ) {
     if ( req.body?.storeId?.length ) {
       query['store_id'] = { $in: req.body.storeId };
     }
-    let taskDetails = await taskProcessedService.find( query, { _id: 1, checklistStatus: 1, storeName: 1, store_id: 1, userEmail: 1 } );
+    let taskDetails = await taskProcessedService.find( query, { _id: 1, checklistStatus: 1, storeName: 1, store_id: 1, userEmail: 1, client_id: 1, coverage: 1 } );
     if ( !taskDetails.length ) {
       return res.sendError( 'No data found', 204 );
     }
@@ -2199,7 +2199,7 @@ export async function approveTask( req, res ) {
       let updateResponse = await taskProcessedService.updateMany( { _id: { $in: idList } }, { approvalStatus: true } );
       if ( updateResponse.modifiedCount || updateResponse.matchedCount ) {
         let inputstores = taskDetails.filter( ( data ) => data.checklistStatus == 'submit' );
-
+        let storeNames = inputstores.map( ( data ) => data.storeName );
         let params = {
           'payload': {
             sourceCheckList_id: req.body.sourceCheckList_id,
@@ -2212,8 +2212,6 @@ export async function approveTask( req, res ) {
             approvalStatus: true,
           },
         };
-
-
         const requestOptions = {
           method: 'POST',
           headers: {
@@ -2224,7 +2222,26 @@ export async function approveTask( req, res ) {
         let url = JSON.parse( process.env.LAMBDAURL );
 
         let searchResponse = await fetch( url.approveTask, requestOptions );
-
+        let logData= {
+          'client_id': taskDetails[0].client_id,
+          'createAt': new Date(),
+          'sourceCheckList_id': req.body.sourceCheckList_id,
+          'checkListName': taskDetails[0].checkListName,
+          'fromCheckListName': taskDetails[0].checkListName,
+          'type': 'checklist',
+          'action': 'approved',
+          'storeName': '',
+          'store_id': '',
+          'createdByEmail': req.user.email,
+          'createdBy': req.user._id,
+          'coverage': taskDetails[0].coverage,
+          'logDetails': {
+            'approved': storeNames,
+          },
+        };
+        let urlopensearch = JSON.parse( process.env.OPENSEARCH );
+        console.log( 'logData', logData );
+        await insertOpenSearchData( urlopensearch.traxActivityLog, logData );
         if ( searchResponse.ok ) {
           let pendingstores = taskDetails.filter( ( data ) => data.checklistStatus != 'submit' );
           if ( pendingstores && pendingstores.length > 0 ) {
@@ -2972,6 +2989,22 @@ export const duplicateChecklist = async ( req, res ) => {
           sections.push( sectionDetails );
         }
         await taskQuestionService.insertMany( sections );
+        let logObj = {
+          client_id: checkDetails.client_id,
+          createAt: new Date(),
+          sourceCheckList_id: checkDetails._id,
+          checkListName: checkDetails.checkListName,
+          fromCheckListName: '',
+          type: 'task',
+          action: 'duplicated',
+          storeName: '',
+          store_id: '',
+          createdByEmail: req.user.email,
+          createdBy: req.user.userName,
+          coverage: checkDetails.coverage,
+          logDetails: {},
+        };
+        insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
         return res.sendSuccess( { message: 'Task Duplicated Successfully' } );
       } else {
         return res.sendSuccess( { message: 'Duplicated Successfully' } );
@@ -4350,7 +4383,7 @@ export async function updateAssign( req, res ) {
       },
     ];
     let assignUserDetails = await userService.aggregate( query );
-    await Promise.all( req.body.assignedList.map( async ( assign ) => {
+    for ( let assign of req.body.assignedList ) {
       let userDetails = assignUserDetails.find( ( ele ) => ele.email.toLowerCase() == assign.userEmail.toLowerCase() );
       if ( !userDetails ) {
         let userData = {
@@ -4360,6 +4393,7 @@ export async function updateAssign( req, res ) {
           clientId: req.body.clientId,
         };
         userDetails = await createUser( userData );
+        assignUserDetails.push( userDetails );
       }
       let data = {
         ...assign,
@@ -4373,7 +4407,7 @@ export async function updateAssign( req, res ) {
       };
       delete data._id;
       assignedUserList.push( data );
-    } ) );
+    }
     let assignGroupDetails = [];
     if ( req.body.coverage == 'store' ) {
       assignGroupDetails = await clusterServices.findcluster( { _id: { $in: req.body.assignedGroup } } );

package/src/controllers/taskDashboard.controllers.js

@@ -1,6 +1,6 @@
 import * as taskService from '../service/task.service.js';
 import * as processedTaskService from '../service/processedTaskList.service.js';
-import { logger, download } from 'tango-app-api-middleware'; // getChecklistUsers
+import { logger, download, insertOpenSearchData } from 'tango-app-api-middleware'; // getChecklistUsers
 import dayjs from 'dayjs';
 import mongoose from 'mongoose';
 // const ObjectId = mongoose.Types.ObjectId;
@@ -961,7 +961,7 @@ export const taskDeleteV1 = async ( req, res ) => {
       return res.sendError( 'Missing taskId in request body', 400 );
     }
 
-    const taskConfig = await taskService.findOne( { _id: new mongoose.Types.ObjectId( requestData.taskId ) }, { _id: 1 } );
+    const taskConfig = await taskService.findOne( { _id: new mongoose.Types.ObjectId( requestData.taskId ) } );
     if ( !taskConfig ) {
       // console.log( 'Task found:', taskConfig );
       return res.sendError( 'Task not found', 404 );
@@ -973,12 +973,29 @@ export const taskDeleteV1 = async ( req, res ) => {
     );
 
     if ( resultData ) {
+      let logObj = {
+        client_id: taskConfig.client_id,
+        createAt: new Date(),
+        sourceCheckList_id: taskConfig._id,
+        checkListName: taskConfig.checkListName,
+        fromCheckListName: '',
+        type: 'task',
+        action: 'deleted',
+        storeName: '',
+        store_id: '',
+        createdByEmail: req.user.email,
+        createdBy: req.user.userName,
+        coverage: taskConfig.coverage,
+        logDetails: {},
+      };
+      insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, logObj );
       // console.log( 'Update result:', resultData );
       return res.sendSuccess( { message: 'Task deleted successfully' } );
     } else {
       return res.sendError( 'Something went wrong please try again', 500 );
     }
   } catch ( e ) {
+    // console.log( 'e', e );
     logger.error( 'taskDeleteV1 =>', e );
     return res.sendError( e, 500 );
   }