tango-app-api-task 3.5.0-alpha-8 → 3.6.0-task-3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.5.0-alpha-8",
+    "version": "3.6.0-task-3",
     "description": "Task",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "mongodb": "^6.10.0",
         "nodemon": "^3.1.7",
         "npm": "^10.9.2",
-        "tango-api-schema": "^2.2.108",
+        "tango-api-schema": "^2.2.147",
         "tango-app-api-middleware": "^3.1.77",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/task.controller.js

@@ -90,6 +90,7 @@ export async function createUpdateTask( req, res ) {
       createdByName: req.user.userName,
       questionCount: questionCount,
       client_id: req.body?.clientId,
+      checkListFrom: 'manage',
     };
     if ( inputBody._id ) {
       query = { _id: inputBody._id, client_id: req.body?.clientId };
@@ -1274,6 +1275,7 @@ export async function insertSingleProcessData( checklistId, answerTypechange, in
       insertdata.approver = getCLconfig?.approver || [];
       insertdata.restrictAttendance = getCLconfig?.restrictAttendance;
       insertdata.coverage = getCLconfig?.coverage;
+      insertdata.checkListFrom = getCLconfig?.checkListFrom;
       let collectSections = [];
       let sectionQuery = [];
       sectionQuery.push( {
@@ -1316,7 +1318,7 @@ export async function insertSingleProcessData( checklistId, answerTypechange, in
 
         const dateArray = getDaysBeforeEndDate( endDate );
 
-        for ( const dateVal of dateArray ) {
+        for ( const dateVal of [ dateArray[0] ] ) {
           const insertdataquery = {
             date_string: dayjs( dateVal ).format( 'YYYY-MM-DD' ),
             date_iso: dayjs( dateVal ).toDate(),
@@ -1520,6 +1522,7 @@ async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date,
         element4.remainder = getCLconfig?.remainder || [];
         element4.restrictAttendance = getCLconfig?.restrictAttendance;
         element4.coverage = getCLconfig?.coverage;
+        element4.checkListFrom = getCLconfig?.checkListFrom;
         if ( inputBody && inputBody?.streamId ) {
           element4.streamId = inputBody?.streamId;
         }
@@ -1905,6 +1908,7 @@ export async function createChecklistTask( req, res ) {
       locationCount: 1,
       ...( inputBody?.checkListId ) ? { referenceCheckListId: inputBody?.checkListId } : {},
       coverage: checklistDetails?.coverage || 'store',
+      checkListFrom: 'gallery',
     };
 
     if ( req.user.userType == 'tango' || ( req.user.userType == 'client' && [ 'user' ].includes( req.user.role ) ) ) {
@@ -2133,6 +2137,7 @@ export async function createChecklistMultiTask( req, res ) {
         locationCount: 1,
         ...( originaldata?.checkListId ) ? { referenceCheckListId: originaldata?.checkListId } : {},
         coverage: checklistDetails?.coverage || 'store',
+        checkListFrom: 'gallery',
       };
 
       if ( req.user.userType == 'tango' || ( req.user.userType == 'client' && [ 'user' ].includes( req.user.role ) ) ) {
@@ -2706,17 +2711,20 @@ export const taskDropdown = async ( req, res ) => {
     let requestData = req.body;
     let fromDate = new Date( requestData.fromDate );
     let toDate = new Date( requestData.toDate );
-    let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
-    toDate = new Date( toDate.getTime() - userTimezoneOffset );
-    toDate.setUTCHours( 23, 59, 59, 59 );
+    // let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    // toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    // toDate.setUTCHours( 23, 59, 59, 59 );
     let result = {};
+    toDate.setDate( toDate.getDate() + 1 );
 
     let findQuery = [];
     let findAndQuery = [];
     findAndQuery.push(
         { client_id: requestData.clientId },
-        { date_iso: { $gte: fromDate } },
-        { date_iso: { $lte: toDate } },
+        // { date_iso: { $gte: fromDate } },
+        // { date_iso: { $lte: toDate } },
+        { scheduleStartTime_iso: { $lt: toDate } },
+        { scheduleEndTime_iso: { $gte: fromDate } },
         { checkListType: { $in: [ 'task', 'checklistTask', 'cctv' ] } },
     );
 
@@ -2863,6 +2871,7 @@ export const taskList = async ( req, res ) => {
             checkListType: { $in: [ 'task', 'checklistTask', 'cctv' ] },
             client_id: req.query.clientId,
             isdeleted: false,
+            checkListFrom: { $nin: [ 'api' ] },
           },
         },
     );
@@ -2892,6 +2901,7 @@ export const taskList = async ( req, res ) => {
             checkListChar: { $substr: [ '$checkListName', 0, 2 ] },
             priorityType: 1,
             scheduleEndTimeISO: 1,
+            checkListFrom: 1,
           },
         },
     );
@@ -3249,27 +3259,25 @@ export async function teamMigrations( req, res ) {
 }
 export async function clusterMigrations( req, res ) {
   try {
-    let input = [
-
-    ];
+    let input =[];
     for ( let user of input ) {
-      let userexits = await userService.findOne( { email: user.AOMsmailID } );
+      let userexits = await userService.findOne( { 'email': user.clusterEmail, 'clientId': '11' } );
       if ( userexits ) {
-        let findStore = await storeService.findOne( { storeName: user.FacilityCode } );
+        let findStore = await storeService.findOne( { 'storeName': user.storeName, 'clientId': '11' } );
         if ( findStore ) {
-          let clusterExists = await clusterServices.findOneCluster( { clusterName: user.AomName } );
+          let clusterExists = await clusterServices.findOneCluster( { 'clusterName': user.clusterName, 'clientId': '11' } );
           if ( clusterExists ) {
             let data = {
               storeId: findStore.storeId,
               store: findStore._id,
             };
-            let updatecluster = await clusterServices.updateCluster( { clusterName: user.AomName }, { $push: { stores: data } } );
+            let updatecluster = await clusterServices.updateCluster( { 'clusterName': user.clusterName, 'clientId': '11' }, { $push: { stores: data } } );
             console.log( updatecluster );
           } else {
             let payload = {
-              'clusterName': user.AomName,
+              'clusterName': user.clusterName,
               'clientId': '11',
-              'description': user.AomName,
+              'description': user.clusterName,
               'stores': [
                 {
                   storeId: findStore.storeId,
@@ -3450,7 +3458,7 @@ export async function createAiChecklist( req, res ) {
     return res.sendError( e, 500 );
   }
 }
-export async function StoreHygienetask( req, res ) {
+export async function StoreHygienetaskOld( req, res ) {
   try {
     let inputBody = req.body;
 
@@ -3901,6 +3909,7 @@ export async function eyeTesttask( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+
 export async function createAiTask( req, res ) {
   try {
     let inputBody = req.body;
@@ -4745,6 +4754,8 @@ export async function commonAiTask( req, res ) {
       publishDate: new Date(),
       locationCount: 1,
       ...( inputBody?.checkListId ) ? { referenceCheckListId: inputBody?.checkListId } : {},
+      coverage: 'store',
+      checkListFrom: 'api',
     };
     data['approver'] = userAdmin;
     let answer = await findAnswer( inputBody?.answerType );
@@ -5362,3 +5373,622 @@ export async function userMigrations( req, res ) {
     return res.sendError( error, 500 );
   }
 }
+
+export async function StoreHygienetask( req, res ) {
+  try {
+    let inputBody = req.body;
+
+    inputBody.clientId = 11;
+    inputBody.taskDescription = '';
+    let userId;
+    let storeDetails = await storeService.findOne( { storeName: inputBody.storeName, clientId: inputBody.clientId, status: 'active' }, { storeId: 1, storeName: 1, storeProfile: 1 } );
+    if ( !storeDetails ) {
+      return res.sendError( 'Store Not Found', 500 );
+    }
+
+    let url = JSON.parse( process.env.LAMBDAURL );
+    let dailychecklistId = new mongoose.Types.ObjectId( url.dailystoreChecklistId );
+    let KSAchecklistId = new mongoose.Types.ObjectId( url.KSAchecklist );
+    let UAEchecklistId = new mongoose.Types.ObjectId( url.UAEchecklist );
+    let singaporechecklistId = new mongoose.Types.ObjectId( url.singaporechecklist );
+
+    let finduser = await checklistassignconfigModel.findOne( { checkListId: { $in: [ dailychecklistId, KSAchecklistId, UAEchecklistId, singaporechecklistId ] }, store_id: storeDetails.storeId } );
+    if ( !finduser ) {
+      return res.sendError( 'No user Found For this store', 500 );
+    }
+
+    userId = finduser.userId;
+    inputBody.userName = finduser.userName;
+    inputBody.userEmail = finduser.userEmail;
+    let teamList = await findteams( { users: { $elemMatch: { email: finduser.userEmail } } } );
+
+    inputBody.approver = '';
+    for ( let team of teamList ) {
+      for ( let user of team.Teamlead ) {
+        inputBody.approver = user.email + ',' + inputBody.approver;
+      }
+    }
+    inputBody.approver = inputBody.approver.replace( /,$/, '' );
+    let title = `New Task Alert ${inputBody.taskName}-${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )}`;
+    let time = inputBody?.scheduleEndTime || '11:59 PM';
+    let date = inputBody?.scheduleDate || dayjs().format( 'YYYY-MM-DD' );
+    let description = `A new task has been assigned to ${storeDetails.storeName}. Please complete it before the due date of ${date}.`;
+    let userDetails = await userService.findOne( { _id: new mongoose.Types.ObjectId( finduser.userId ) } );
+    if ( userDetails && userDetails.fcmToken ) {
+      const fcmToken = userDetails.fcmToken;
+      await sendPushNotification( title, description, fcmToken );
+    }
+    const inputDateTime = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' );
+    const currentTime = dayjs.utc();
+    if ( inputDateTime.isBefore( currentTime ) ) {
+      return res.sendError( 'The input date-time is before the current time.', 500 );
+    }
+
+    let approverList = inputBody?.approver.split( ',' );
+    let userAdmin = await userService.find( { clientId: inputBody.clientId, email: { $in: approverList }, userType: 'client', isActive: true }, { name: '$userName', email: 1 } );
+    if ( userAdmin && userAdmin.length === 0 ) {
+      userAdmin = await userService.find( { clientId: inputBody.clientId, email: 'rohit.chawla@lenskart.com', userType: 'client', isActive: true }, { name: '$userName', email: 1 } );
+    }
+
+    let creator = await userService.find( { clientId: inputBody.clientId, email: 'rohit.chawla@lenskart.com', userType: 'client', isActive: true } );
+    if ( creator && creator.length === 0 ) {
+      return res.sendError( 'Invalid Creator Details', 500 );
+    }
+
+    if ( req.body && req.body.referenceImage && req.body.referenceImage.length > 3 ) {
+      return res.sendError( 'Maximum 3 referenceImage only allowed', 500 );
+    }
+
+    let answer = await findAnswer( inputBody?.answerType );
+    if ( answer.length == 0 ) {
+      return res.sendError( 'please enter Valid AnswerType', 500 );
+    }
+
+    // Check this Task Already Exist////
+    let checkTask = await taskService.findOne( { checkListName: inputBody.taskName } );
+    if ( checkTask ) {
+      let singleInsert = await insertStoreHygienetaskSingleProcessedTask( checkTask, inputBody, date, time, storeDetails, finduser, answer );
+      if ( singleInsert ) {
+        return res.sendSuccess( 'Task created successfully' );
+      } else {
+        return res.sendError( 'something went wrong, please try again', 500 );
+      }
+    } else {
+      let data = {
+        // checkListName: `${inputBody.taskName}(${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )}-${inputBody.zoneName ? inputBody.zoneName : ''})`,
+        checkListName: inputBody.taskName,
+        checkListDescription: inputBody.taskDescription,
+        createdBy: creator[0]._id,
+        createdByName: creator[0].userName,
+        publish: true,
+        questionCount: 1,
+        storeCount: 1,
+        scheduleDate: date,
+        scheduleEndTime: time,
+        scheduleEndTimeISO: dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' ).format(),
+        priorityType: 'high',
+        client_id: inputBody.clientId,
+        checkListType: 'task',
+        publishDate: new Date(),
+        locationCount: 1,
+        ...( inputBody?.checkListId ) ? { referenceCheckListId: inputBody?.checkListId } : {},
+        coverage: 'store',
+        checkListFrom: 'api',
+      };
+      data['approver'] = userAdmin;
+
+      if ( inputBody?.answerType === 'multiplechoicesingle' || inputBody?.answerType === 'multiplechoicemultiple' ) {
+        if ( inputBody?.options && inputBody?.options.length > 0 ) {
+          let optionsResult = [];
+          let optionList = inputBody?.options.split( ',' );
+          for ( let option of optionList ) {
+            let optiondata = {
+              'answer': '',
+              'sopFlag': false,
+              'validation': false,
+              'validationType': '',
+              'referenceImage': [],
+              'runAI': false,
+              'allowUploadfromGallery': false,
+              'descriptivetype': '',
+              'showLinked': false,
+              'linkedQuestion': 0,
+              'nestedQuestion': [],
+            };
+            optiondata.answer = option;
+            optionsResult.push( optiondata );
+          }
+          answer = optionsResult;
+        } else {
+          return res.sendError( 'please enter Valid Options', 500 );
+        }
+      }
+
+      let response = await taskService.create( data );
+      if ( response?.approver.length ) {
+        let inputData = [];
+        response?.approver.forEach( ( ele ) => {
+          inputData.push( {
+            userEmail: ele.email,
+            checkListId: response._id,
+            type: 'task',
+            client_id: inputBody.clientId,
+            checkListName: data?.checkListName || '',
+          } );
+        } );
+        await traxApprover.insertMany( inputData );
+      }
+
+      if ( response?._id ) {
+        let question = [
+          {
+            'qno': 1,
+            'qname': inputBody.question,
+            'answerType': inputBody?.answerType || 'yes/no',
+            'runAI': false,
+            'runAIDescription': '',
+            'allowUploadfromGallery': false,
+            'linkType': false,
+            'questionReferenceImage': [],
+            'answers': answer,
+            'descriptivetype': 'text',
+          },
+        ];
+
+        let images = [];
+        for ( let imgpath of req.body.referenceImage ) {
+          let configURL = JSON.parse( process.env.BUCKET );
+          let inputData = {
+            Bucket: configURL.aiTraxoutput,
+            Key: imgpath,
+          };
+          let output = await getObject( inputData );
+          let image = {
+            data: output.Body,
+            name: imgpath,
+            mimetype: output.ContentType,
+          };
+          let uplaodedImage = await uploadmultiImage( image );
+          let imgUrl = decodeURIComponent( uplaodedImage?.imgUrl.split( '?' )[0] );
+          let url = imgUrl.split( '/' );
+          if ( url.includes( 'https:' ) || url.includes( 'http:' ) ) {
+            url.splice( 0, 3 );
+          }
+          images.push( url.join( '/' ) );
+        }
+        question[0].questionReferenceImage = images;
+
+        if ( inputBody?.answerType === 'image' || inputBody?.answerType === 'descriptiveImage' || inputBody?.answerType === 'multipleImage' ) {
+          answer[0].referenceImage = question[0].questionReferenceImage;
+        }
+
+        question = {
+          checkListId: response?._id,
+          question: question,
+          section: 'Section 1',
+          checkList: data.checkListName,
+          client_id: inputBody.clientId,
+        };
+        await taskQuestionService.create( question );
+
+        let userDetails = {
+          userName: inputBody.userName,
+          userEmail: inputBody.userEmail,
+          store_id: storeDetails.storeId,
+          storeName: storeDetails.storeName,
+          city: storeDetails?.storeProfile?.city,
+          checkFlag: true,
+          checkListId: response?._id,
+          checkListName: data.checkListName,
+          client_id: inputBody.clientId,
+          userId: userId,
+          assignId: storeDetails?._id,
+        };
+        await taskAssignService.create( userDetails );
+        await insertSingleProcessData( response?._id );
+        return res.sendSuccess( 'Task created successfully' );
+      }
+    }
+  } catch ( e ) {
+    console.log( 'e =>', e );
+    logger.error( { function: 'StoreHygienetask', error: e } );
+    return res.sendError( e, 500 );
+  }
+}
+
+export async function eyeTesttaskNew( req, res ) {
+  try {
+    let inputBody = req.body;
+    inputBody.clientId = 11;
+    inputBody.taskDescription = '';
+    let userId;
+    let storeDetails = await storeService.findOne( { storeName: inputBody.storeName, clientId: inputBody.clientId, status: 'active' }, { storeId: 1, storeName: 1, storeProfile: 1 } );
+    // console.log( 'storeDetails =>', storeDetails );
+    if ( !storeDetails ) {
+      return res.sendError( 'Store Not Found', 500 );
+    }
+
+    let url = JSON.parse( process.env.LAMBDAURL );
+    let dailychecklistId = new mongoose.Types.ObjectId( url.dailystoreChecklistId );
+    let KSAchecklistId = new mongoose.Types.ObjectId( url.KSAchecklist );
+    let UAEchecklistId = new mongoose.Types.ObjectId( url.UAEchecklist );
+    let singaporechecklistId = new mongoose.Types.ObjectId( url.singaporechecklist );
+
+    let finduser = await checklistassignconfigModel.findOne( { checkListId: { $in: [ dailychecklistId, KSAchecklistId, UAEchecklistId, singaporechecklistId ] }, store_id: storeDetails.storeId } );
+
+    if ( !finduser ) {
+      return res.sendError( 'No user Found For this store', 500 );
+    }
+
+    userId = finduser.userId;
+    inputBody.userName = finduser.userName;
+    inputBody.userEmail = finduser.userEmail;
+    let teamList = await findteams( { users: { $elemMatch: { email: finduser.userEmail } } } );
+
+    inputBody.approver = '';
+    for ( let team of teamList ) {
+      for ( let user of team.Teamlead ) {
+        inputBody.approver = user.email + ',' + inputBody.approver;
+      }
+    }
+    inputBody.approver = inputBody.approver.replace( /,$/, '' );
+
+    let title = `New Task Alert ${inputBody.taskName}-${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )}`;
+    let time = inputBody?.scheduleEndTime || '11:59 PM';
+    let date = inputBody?.scheduleDate || dayjs().format( 'YYYY-MM-DD' );
+    let description = `A new task has been assigned to ${storeDetails.storeName}. Please complete it before the due date of ${date}.`;
+    let userDetails = await userService.findOne( { _id: new mongoose.Types.ObjectId( finduser.userId ) } );
+    if ( userDetails && userDetails.fcmToken ) {
+      const fcmToken = userDetails.fcmToken;
+      await sendPushNotification( title, description, fcmToken );
+    }
+    const inputDateTime = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' );
+    const currentTime = dayjs.utc();
+    if ( inputDateTime.isBefore( currentTime ) ) {
+      return res.sendError( 'The input date-time is before the current time.', 500 );
+    }
+
+    let approverList = inputBody?.approver.split( ',' );
+    let userAdmin = await userService.find( { clientId: inputBody.clientId, email: { $in: approverList }, userType: 'client', isActive: true }, { name: '$userName', email: 1 } );
+
+    if ( userAdmin && userAdmin.length === 0 ) {
+      userAdmin = await userService.find( { clientId: inputBody.clientId, email: 'rohit.chawla@lenskart.com', userType: 'client', isActive: true }, { name: '$userName', email: 1 } );
+    }
+
+    let creator = await userService.find( { clientId: inputBody.clientId, email: 'rohit.chawla@lenskart.com', userType: 'client', isActive: true } );
+    if ( creator && creator.length === 0 ) {
+      return res.sendError( 'Invalid Creator Details', 500 );
+    }
+
+    if ( req.body && req.body.referenceImage && req.body.referenceImage.length > 3 ) {
+      return res.sendError( 'Maximum 3 referenceImage only allowed', 500 );
+    }
+
+    let answer = await findAnswer( inputBody?.answerType );
+    if ( answer.length == 0 ) {
+      return res.sendError( 'please enter Valid AnswerType', 500 );
+    }
+
+    // Check this Task Already Exist////
+    let checkTask = await taskService.findOne( { checkListName: inputBody.taskName } );
+    if ( checkTask ) {
+      let singleInsert = await insertEyetestSingleProcessedTask( checkTask, inputBody, date, time, storeDetails, finduser, answer, req );
+      if ( singleInsert ) {
+        return res.sendSuccess( 'Task created successfully' );
+      } else {
+        return res.sendError( 'something went wrong, please try again', 500 );
+      }
+    } else {
+      let data = {
+        // checkListName: `${inputBody.taskName}(${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )})`,
+        checkListName: inputBody.taskName,
+        checkListDescription: inputBody.taskDescription,
+        createdBy: creator[0]._id,
+        createdByName: creator[0].userName,
+        publish: true,
+        questionCount: 1,
+        storeCount: 1,
+        scheduleDate: date,
+        scheduleEndTime: time,
+        scheduleEndTimeISO: dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' ).format(),
+        priorityType: 'high',
+        client_id: inputBody.clientId,
+        checkListType: 'task',
+        publishDate: new Date(),
+        locationCount: 1,
+        ...( inputBody?.checkListId ) ? { referenceCheckListId: inputBody?.checkListId } : {},
+      };
+      data['approver'] = userAdmin;
+
+      if ( inputBody?.answerType === 'multiplechoicesingle' || inputBody?.answerType === 'multiplechoicemultiple' ) {
+        if ( inputBody?.options && inputBody?.options.length > 0 ) {
+          let optionsResult = [];
+          let optionList = inputBody?.options.split( ',' );
+          for ( let option of optionList ) {
+            let optiondata = {
+              'answer': '',
+              'sopFlag': false,
+              'validation': false,
+              'validationType': '',
+              'referenceImage': [],
+              'runAI': false,
+              'allowUploadfromGallery': false,
+              'descriptivetype': '',
+              'showLinked': false,
+              'linkedQuestion': 0,
+              'nestedQuestion': [],
+            };
+            optiondata.answer = option;
+            optionsResult.push( optiondata );
+          }
+          answer = optionsResult;
+        } else {
+          return res.sendError( 'please enter Valid Options', 500 );
+        }
+      }
+
+      let response = await taskService.create( data );
+      if ( response?.approver.length ) {
+        let inputData = [];
+        response?.approver.forEach( ( ele ) => {
+          inputData.push( {
+            userEmail: ele.email,
+            checkListId: response._id,
+            type: 'task',
+            client_id: inputBody.clientId,
+            checkListName: data?.checkListName || '',
+          } );
+        } );
+        await traxApprover.insertMany( inputData );
+      }
+
+      if ( response?._id ) {
+        let question = [
+          {
+            'qno': 1,
+            'qname': inputBody.question,
+            'answerType': inputBody?.answerType || 'yes/no',
+            'runAI': false,
+            'runAIDescription': '',
+            'allowUploadfromGallery': false,
+            'linkType': false,
+            'questionReferenceImage': [],
+            'answers': answer,
+            'descriptivetype': 'text',
+          },
+        ];
+
+        if ( req.files && req.files.referenceImage && req.files.referenceImage.length ) {
+          let images = [];
+          for ( let image of req.files.referenceImage ) {
+            let uplaodedImage = await uploadmultiImage( image );
+            let imgUrl = decodeURIComponent( uplaodedImage.imgUrl.split( '?' )[0] );
+            let url = imgUrl.split( '/' );
+            if ( url.includes( 'https:' ) || url.includes( 'http:' ) ) {
+              url.splice( 0, 3 );
+            }
+            images.push( url.join( '/' ) );
+          }
+          question[0].questionReferenceImage = images;
+        } else {
+          let images = [];
+          if ( req.files && req.files.referenceImage ) {
+            let uplaodedImage = await uploadmultiImage( req.files.referenceImage );
+            let imgUrl = decodeURIComponent( uplaodedImage.imgUrl.split( '?' )[0] );
+            let url = imgUrl.split( '/' );
+            if ( url.includes( 'https:' ) || url.includes( 'http:' ) ) {
+              url.splice( 0, 3 );
+            }
+            images.push( url.join( '/' ) );
+            question[0].questionReferenceImage = images;
+          }
+        }
+
+        if ( inputBody?.answerType === 'image' || inputBody?.answerType === 'descriptiveImage' || inputBody?.answerType === 'multipleImage' ) {
+          answer[0].referenceImage = question[0].questionReferenceImage;
+        }
+
+        question = {
+          checkListId: response?._id,
+          question: question,
+          section: 'Section 1',
+          checkList: data.checkListName,
+          client_id: inputBody.clientId,
+        };
+        await taskQuestionService.create( question );
+
+        let userDetails = {
+          userName: inputBody.userName,
+          userEmail: inputBody.userEmail,
+          store_id: storeDetails.storeId,
+          storeName: storeDetails.storeName,
+          city: storeDetails?.storeProfile?.city,
+          checkFlag: true,
+          checkListId: response?._id,
+          checkListName: data.checkListName,
+          client_id: inputBody.clientId,
+          userId: userId,
+          assignId: storeDetails?._id,
+        };
+        await taskAssignService.create( userDetails );
+        await insertSingleProcessData( response?._id, true, inputBody );
+        return res.sendSuccess( 'Task created successfully' );
+      }
+    }
+  } catch ( e ) {
+    logger.error( { function: 'eyeTesttask', error: e } );
+    return res.sendError( e, 500 );
+  }
+}
+
+async function insertStoreHygienetaskSingleProcessedTask( checkTask, inputBody, date, time, storeDetails, finduser, answer ) {
+  try {
+    let getquestion = await taskQuestionService.findOne( { checkListId: checkTask._id } );
+    let getolddata = await taskProcessedService.findOne( { sourceCheckList_id: checkTask._id } );
+
+    // Question Patten Making
+    let question = [
+      {
+        'qno': 1,
+        'qname': inputBody.question,
+        'answerType': inputBody?.answerType || 'yes/no',
+        'runAI': false,
+        'runAIDescription': '',
+        'allowUploadfromGallery': false,
+        'linkType': false,
+        'questionReferenceImage': [],
+        'answers': answer,
+        'descriptivetype': 'text',
+      },
+    ];
+
+    let images = [];
+    for ( let imgpath of inputBody.referenceImage ) {
+      let configURL = JSON.parse( process.env.BUCKET );
+      let inputData = {
+        Bucket: configURL.aiTraxoutput,
+        Key: imgpath,
+      };
+      let output = await getObject( inputData );
+      let image = {
+        data: output.Body,
+        name: imgpath,
+        mimetype: output.ContentType,
+      };
+      let uplaodedImage = await uploadmultiImage( image );
+      let imgUrl = decodeURIComponent( uplaodedImage?.imgUrl.split( '?' )[0] );
+      let url = imgUrl.split( '/' );
+      if ( url.includes( 'https:' ) || url.includes( 'http:' ) ) {
+        url.splice( 0, 3 );
+      }
+      images.push( url.join( '/' ) );
+    }
+    question[0].questionReferenceImage = images;
+
+    if ( inputBody?.answerType === 'image' || inputBody?.answerType === 'descriptiveImage' || inputBody?.answerType === 'multipleImage' ) {
+      answer[0].referenceImage = question[0].questionReferenceImage;
+    }
+
+    let questions = {
+      questions: question,
+      sectionName: getquestion.section,
+      section_id: getquestion._id,
+    };
+
+    let newData = getolddata.toObject();
+    delete newData._id;
+    newData.date_iso = new Date( dayjs( date, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' ) );
+    newData.date_string = dayjs( date ).format( 'YYYY-MM-DD' );
+    newData.scheduleStartTime_iso = date;
+    newData.scheduleEndTime_iso = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' ).format();
+    newData.store_id = storeDetails.storeId;
+    newData.storeName = storeDetails.storeName;
+    newData.country = storeDetails.storeProfile.country;
+    newData.userId = finduser.userId;
+    newData.userName = finduser.userName;
+    newData.userEmail = finduser.userEmail;
+    newData.checklistStatus = 'open';
+    newData.timeFlagStatus = true;
+    newData.checkListFrom = 'api';
+    newData.createdAt = new Date();
+    newData.updatedAt = new Date();
+    newData.questionAnswers = [ questions ];
+    let insertprocessdata = await taskProcessedService.insert( newData );
+    if ( insertprocessdata ) {
+      return true;
+    } else {
+      return false;
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'insertSingleProcessedTask' } );
+    return false;
+  }
+}
+
+async function insertEyetestSingleProcessedTask( checkTask, inputBody, date, time, storeDetails, finduser, answer, req ) {
+  try {
+    let getquestion = await taskQuestionService.findOne( { checkListId: checkTask._id } );
+    let getolddata = await taskProcessedService.findOne( { sourceCheckList_id: checkTask._id } );
+
+    // Question Patten Making
+    let question = [
+      {
+        'qno': 1,
+        'qname': inputBody.question,
+        'answerType': inputBody?.answerType || 'yes/no',
+        'runAI': false,
+        'runAIDescription': '',
+        'allowUploadfromGallery': false,
+        'linkType': false,
+        'questionReferenceImage': [],
+        'answers': answer,
+        'descriptivetype': 'text',
+      },
+    ];
+
+    if ( req.files && req.files.referenceImage && req.files.referenceImage.length ) {
+      let images = [];
+      for ( let image of req.files.referenceImage ) {
+        let uplaodedImage = await uploadmultiImage( image );
+        let imgUrl = decodeURIComponent( uplaodedImage.imgUrl.split( '?' )[0] );
+        let url = imgUrl.split( '/' );
+        if ( url.includes( 'https:' ) || url.includes( 'http:' ) ) {
+          url.splice( 0, 3 );
+        }
+        images.push( url.join( '/' ) );
+      }
+      question[0].questionReferenceImage = images;
+    } else {
+      let images = [];
+      if ( req.files && req.files.referenceImage ) {
+        let uplaodedImage = await uploadmultiImage( req.files.referenceImage );
+        let imgUrl = decodeURIComponent( uplaodedImage.imgUrl.split( '?' )[0] );
+        let url = imgUrl.split( '/' );
+        if ( url.includes( 'https:' ) || url.includes( 'http:' ) ) {
+          url.splice( 0, 3 );
+        }
+        images.push( url.join( '/' ) );
+
+        question[0].questionReferenceImage = images;
+      }
+    }
+
+    if ( inputBody?.answerType === 'image' || inputBody?.answerType === 'descriptiveImage' || inputBody?.answerType === 'multipleImage' ) {
+      answer[0].referenceImage = question[0].questionReferenceImage;
+    }
+
+    let questions = {
+      questions: question,
+      sectionName: getquestion.section,
+      section_id: getquestion._id,
+    };
+
+    let newData = getolddata.toObject();
+    delete newData._id;
+    newData.date_iso = new Date( dayjs( date, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' ) );
+    newData.date_string = dayjs( date ).format( 'YYYY-MM-DD' );
+    newData.scheduleStartTime_iso = dayjs.utc().format( 'YYYY-MM-DD hh:mm A' );
+    newData.scheduleEndTime_iso = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' ).format();
+    newData.store_id = storeDetails.storeId;
+    newData.storeName = storeDetails.storeName;
+    newData.country = storeDetails.storeProfile.country;
+    newData.userId = finduser.userId;
+    newData.userName = finduser.userName;
+    newData.userEmail = finduser.userEmail;
+    newData.checklistStatus = 'open';
+    newData.timeFlagStatus = true;
+    newData.checkListFrom = 'api';
+    newData.createdAt = new Date();
+    newData.updatedAt = new Date();
+    newData.questionAnswers = [ questions ];
+    let insertprocessdata = await taskProcessedService.insert( newData );
+    if ( insertprocessdata ) {
+      return true;
+    } else {
+      return false;
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'insertSingleProcessedTask' } );
+    return false;
+  }
+}

package/src/controllers/taskActionCenter.controllers.js

@@ -39,6 +39,10 @@ export const overallCardsV1 = async ( req, res ) => {
     let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
     toDate.setUTCHours( 23, 59, 59, 59 );
+
+    let taskToDate = new Date( requestData.toDate );
+    taskToDate.setDate( taskToDate.getDate() + 1 );
+
     let groupQuery = {
       $group: {
         _id: '',
@@ -55,7 +59,9 @@ export const overallCardsV1 = async ( req, res ) => {
     let taskQuery = [
       {
         $match: {
-          date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
+          // date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
+          scheduleStartTime_iso: { $lt: taskToDate },
+          scheduleEndTime_iso: { $gte: fromDate },
           sourceCheckList_id: { $in: taskIdList },
           checklistStatus: 'submit',
           approvalStatus: false,
@@ -130,6 +136,9 @@ export const approvalTableV1 = async ( req, res ) => {
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
     toDate.setUTCHours( 23, 59, 59, 59 );
 
+    let taskToDate = new Date( requestData.toDate );
+    taskToDate.setDate( taskToDate.getDate() + 1 );
+
     let groupQuery = [ {
       $sort: {
         checkListName: 1,
@@ -202,7 +211,9 @@ export const approvalTableV1 = async ( req, res ) => {
       query = [
         {
           $match: {
-            date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
+            // date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
+            scheduleStartTime_iso: { $lt: taskToDate },
+            scheduleEndTime_iso: { $gte: fromDate },
             sourceCheckList_id: { $in: taskIdList },
             // ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
             $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ],

package/src/controllers/taskDashboard.controllers.js

@@ -51,9 +51,10 @@ export const overallCardsV1 = async ( req, res ) => {
     let requestData = req.body;
     let fromDate = new Date( requestData.fromDate );
     let toDate = new Date( requestData.toDate );
-    let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
-    toDate = new Date( toDate.getTime() - userTimezoneOffset );
-    toDate.setUTCHours( 23, 59, 59, 59 );
+    toDate.setDate( toDate.getDate() + 1 );
+    // let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    // toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    // toDate.setUTCHours( 23, 59, 59, 59 );
     let findQuery = [];
     let findAndQuery = [];
 
@@ -63,7 +64,9 @@ export const overallCardsV1 = async ( req, res ) => {
     // End: Get User Based Checklist////
 
     findAndQuery.push(
-        { date_iso: { $gte: fromDate, $lte: toDate } },
+        // { date_iso: { $gte: fromDate, $lte: toDate } },
+        { scheduleStartTime_iso: { $lt: toDate } },
+        { scheduleEndTime_iso: { $gte: fromDate } },
         { client_id: requestData.clientId },
         // { store_id: { $in: requestData.storeId } },
         { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ] },
@@ -228,6 +231,9 @@ export const taskTableV1 = async ( req, res ) => {
 export const taskInfoTableV1 = async ( req, res ) => {
   try {
     let requestData = req.body;
+    let fromDate = new Date( requestData.fromDate );
+    let toDate = new Date( requestData.toDate );
+    toDate.setDate( toDate.getDate() + 1 );
     let result = {};
 
     let findQuery = [];
@@ -239,7 +245,9 @@ export const taskInfoTableV1 = async ( req, res ) => {
     // End: Get User Based Checklist////
 
     findAndQuery.push(
-        { date_iso: { $lte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) } },
+        // { date_iso: { $lte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) } },
+        { scheduleStartTime_iso: { $lt: toDate } },
+        { scheduleEndTime_iso: { $gte: fromDate } },
         { client_id: requestData.clientId },
         { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.taskId ) },
         // { store_id: { $in: requestData.storeId } },
@@ -271,40 +279,40 @@ export const taskInfoTableV1 = async ( req, res ) => {
 
     findQuery.push( { $sort: { date_iso: -1, userName: 1 } } );
 
-    findQuery.push(
-        {
-          $group: {
-            _id: { userEmail: '$userEmail', storeId: '$store_id', checklistStatus: '$checklistStatus' },
-            checkListName: { $first: '$checkListName' },
-            createdByName: { $first: '$createdByName' },
-            userName: { $first: '$userName' },
-            userEmail: { $first: '$userEmail' },
-            checklistStatus: { $first: '$checklistStatus' },
-            submitTime_string: { $first: '$submitTime_string' },
-            storeName: { $first: '$storeName' },
-            checkListType: { $first: '$checkListType' },
-            scheduleRepeatedType: { $first: '$scheduleRepeatedType' },
-            date_iso: { $first: '$date_iso' },
-            store_id: { $first: '$store_id' },
-            timeFlag: { $first: '$timeFlag' },
-            date_string: { $first: '$date_string' },
-            sourceCheckList_id: { $first: '$sourceCheckList_id' },
-            reinitiateStatus: { $first: '$reinitiateStatus' },
-            scheduleEndTime_iso: { $first: '$scheduleEndTime_iso' },
-            processedchecklistId: { $first: '$_id' },
-            redoStatus: { $first: '$redoStatus' },
-            priorityType: { $first: '$priorityType' },
-            allowedStoreLocation: { $first: '$allowedStoreLocation' },
-            restrictAttendance: { $first: '$restrictAttendance' },
-            approvalByEmail: { $first: '$approvalByEmail' },
-            approvalTime_string: { $first: '$approvalTime_string' },
-          },
-        },
-    );
+    // findQuery.push(
+    //     {
+    //       $group: {
+    //         _id: { userEmail: '$userEmail', storeId: '$store_id', checklistStatus: '$checklistStatus' },
+    //         checkListName: { $first: '$checkListName' },
+    //         createdByName: { $first: '$createdByName' },
+    //         userName: { $first: '$userName' },
+    //         userEmail: { $first: '$userEmail' },
+    //         checklistStatus: { $first: '$checklistStatus' },
+    //         submitTime_string: { $first: '$submitTime_string' },
+    //         storeName: { $first: '$storeName' },
+    //         checkListType: { $first: '$checkListType' },
+    //         scheduleRepeatedType: { $first: '$scheduleRepeatedType' },
+    //         date_iso: { $first: '$date_iso' },
+    //         store_id: { $first: '$store_id' },
+    //         timeFlag: { $first: '$timeFlag' },
+    //         date_string: { $first: '$date_string' },
+    //         sourceCheckList_id: { $first: '$sourceCheckList_id' },
+    //         reinitiateStatus: { $first: '$reinitiateStatus' },
+    //         scheduleEndTime_iso: { $first: '$scheduleEndTime_iso' },
+    //         processedchecklistId: { $first: '$_id' },
+    //         redoStatus: { $first: '$redoStatus' },
+    //         priorityType: { $first: '$priorityType' },
+    //         allowedStoreLocation: { $first: '$allowedStoreLocation' },
+    //         restrictAttendance: { $first: '$restrictAttendance' },
+    //         approvalByEmail: { $first: '$approvalByEmail' },
+    //         approvalTime_string: { $first: '$approvalTime_string' },
+    //       },
+    //     },
+    // );
 
     findQuery.push( {
       $project: {
-        _id: 0,
+        _id: 1,
         checkListName: 1,
         createdByName: 1,
         userName: 1,
@@ -331,9 +339,15 @@ export const taskInfoTableV1 = async ( req, res ) => {
       },
     } );
 
+    if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
+      findQuery.push( { $sort: { [requestData.sortColumnName]: requestData.sortBy } } );
+    } else {
+      findQuery.push( { $sort: { userEmail: 1 } } );
+    }
+
     findQuery.push( {
       $project: {
-        _id: 0,
+        _id: 1,
         checkListName: 1,
         checkListChar: { $substr: [ '$checkListName', 0, 2 ] },
         createdByName: 1,
@@ -377,11 +391,6 @@ export const taskInfoTableV1 = async ( req, res ) => {
       },
     } );
 
-    if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
-      findQuery.push( { $sort: { [requestData.sortColumnName]: requestData.sortBy } } );
-    } else {
-      findQuery.push( { $sort: { userEmail: 1 } } );
-    }
 
     let limit = parseInt( requestData?.limit ) || 10;
     let skip = limit * ( requestData?.offset -1 ) || 0;
@@ -399,6 +408,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
     } );
 
     let taskInfoData = await processedTaskService.aggregate( findQuery );
+    console.log( 'taskInfoData =>', taskInfoData.length );
 
     if ( !taskInfoData[0].data.length ) {
       return res.sendError( 'no data found', 204 );
@@ -429,7 +439,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
     }
     return res.sendSuccess( result );
   } catch ( error ) {
-    // console.log( 'error =>', error );
+    console.log( 'error =>', error );
     logger.error( { error: error, message: req.query, function: 'taskInfo' } );
     return res.sendError( { error: error }, 500 );
   }
@@ -763,6 +773,9 @@ export const taskDropdownListV1 = async ( req, res ) => {
         // { isdeleted: false },
     );
     findQuery.push( { $match: { $and: findAndQuery } }, { $sort: { date_iso: -1 } } );
+
+    // findQuery.push( { $match: { $or: [ { checkListName: 'Store Hygiene Check' }, { checkListName: 'EyeTest QR Verification' } ] } } );
+
     findQuery.push(
         {
           $group: {
@@ -1026,11 +1039,12 @@ export async function taskDetails( req, res ) {
     // let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
     // let getUserEmails = await getChecklistUsers( loginUser );
     // End: Get User Based Checklist////
-
-    let toDate = new Date( req.body.toDate );
-    let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
-    toDate = new Date( toDate.getTime() - userTimezoneOffset );
-    toDate.setUTCHours( 23, 59, 59, 59 );
+    let fromDate = new Date( requestData.fromDate );
+    let toDate = new Date( requestData.toDate );
+    toDate.setDate( toDate.getDate() + 1 );
+    // let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    // toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    // toDate.setUTCHours( 23, 59, 59, 59 );
     let limit = req.body?.limit || 10;
     let page = req.body?.offset ? ( req.body.offset * req.body.limit ) : 0;
     let idList = [];
@@ -1049,14 +1063,16 @@ export async function taskDetails( req, res ) {
     let query = [
       {
         $match: {
-          date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
+          // date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
+          scheduleStartTime_iso: { $lt: toDate },
+          scheduleEndTime_iso: { $gte: fromDate },
           client_id: req.body.clientId,
           ...( idList.length ) ? { sourceCheckList_id: { $in: idList } } : {},
           // store_id: { $in: req.body.storeId },
           $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ],
         },
       },
-      { $sort: { date_iso: -1 } },
+      { $sort: { scheduleStartTime_iso: -1 } },
       {
         $group: {
           '_id': '$sourceCheckList_id',