tango-app-api-trax 1.0.0-task.120 → 1.0.0-task.121

package/fir-51e77-firebase-adminsdk-x3sdp-fd902b74ae.json

@@ -0,0 +1,14 @@
+
+{
+  "type": "service_account",
+  "project_id": "tango-trax",
+  "private_key_id": "2bf70eb4a3b9f4e74138bce76063c78c75e166d7",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXwmrIk6t5vfdE\niIskCwdg9Q1EyugQQeA5ve8z6hKrXng/goz+gpkonPI5pHHNELgIoOaC6+3QvxRA\nKB30ETqMKkZJQORy0zUaDQq+qyqNTj5AgNizAtnxMOAf46PIe5gWvDaXkyiHN/cE\ngfFdRyW7ctm4EDub7Ii69fr96X9mmbhOtuP/4tG+MhGIe5JmHnVvM75kC1aWb+ob\n8EaQfLeWpxYqXtsEZoCHbVTm+pDUWMGqiMko7C84BcxKOT4RFk4MeV99T0UaZtab\ncgQlWFmbcvev4KeNkkkmbVCSbBawAe1EsY8QMSj1telikh0NExNodeatIbuYBtc1\nnFqaxv7zAgMBAAECggEAHBtr/54qAjBG3bCUZKaORUzdmkIiXPB2gPtGlEzkDE1A\n5DJfvruddkIrMrXcRei0zRRP3SupLiJVs9Q6R/vw5gjmX6bfKM0pZpvHw6ycAvPc\n38F9YRpEF0HAIOfea8FIV92gFs6wkOqym2kdtPL6cA9Dd625/JUAdfAc/m4CpJPG\n4mjPoNEwMi2a66RW1CghmkQ8VgnxGk05UawZ4f6r+ABko5Q/hX/B+crApbriGPo6\nMBVtqxKGcrAmdTXWF8Bpua3I8hwGRqenLc6CY1kPHCb3XleOj+BkGGxzUGRKkJcU\nwkIiLub//XlTnM8V4R72VqKOP0Zo9SUrqPtPEg8FcQKBgQDI8SWGg5NMAsGhmopl\naUtkAKrZEK/waNBVxeFfKmXhq+hZYZ0Fj4ewI/jvKRPF0zPNWuwQuYSb3LxqmaFc\ng0iQT/crlF1skU7a0vZm7wumSxuMJq+qVcEmG8e8tD9hUGAZDImWeLqZ5UfSNbcb\nF82IeFoB5LWBAq8W2ecST4QA1wKBgQDBV2puSB1jqa9ZVgUIiEGsWzgQLSJ43AmM\nLRy058kuGr11XxLXZvc0v3rB8MhMoaNurFXcUjX67dAV3F8ejqL65dCQHwBDiS32\nsMiMmHfCGBHUn/MsjsZ3LTljLC08ltAoeEuluaW9v8sT93BbrIhpdEmD+tDegqdU\nv/QMKAnDRQKBgQClTgyK3k8cpt/YLCRSTQ7iU9I5BAtZAUDybvl6qoxp3Fwmu7DL\nVEpR0yYEyYwkoBzrgTLWh2faOPsfzwb57l6RqdcymLlKiTePuSFPiLPSt9MPtvuo\nayecTBpC2R2S1uZXdQLzMJqB5CbzfZEGzswcyrVw/U97tFOJvvTjEVsMvQKBgHdj\nWHhzFZrWTE45HPCQ2yToSy1KAbBqB4dE0CYxvvw2TOmuZL8YeOxclRwvaDBR287a\nokZjiavCsCzfoOkIoUGXKfvk+M+7ZOOhdKXE/KahIFmQz6OjIpCzH23K+MAiTLXA\n2s2iXuNWDLvunrYtSyr7QO47skDEozllMvlSu/yVAoGAWKjKVyJZeX1yh6ndzfRh\nszTRQ31W77guZm3j0CJtA7SO8eRWLdeg4BwlMT1YFer/Z65QvhJUgAdnh0Iu4Yv/\niFJ6ZwkNWnWg0239WhSroeVwIobafB/0maILkax5NcBcBvIZxBbvS4Y7bR3HqA7r\nxKbTG5i67w5TetuhLWQjt10=\n-----END PRIVATE KEY-----\n",
+  "client_email": "firebase-adminsdk-k7lom@tango-trax.iam.gserviceaccount.com",
+  "client_id": "112026772051782321525",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-k7lom%40tango-trax.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "1.0.0-task.120",
+    "version": "1.0.0-task.121",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,11 @@
         "tango-api-schema": "^2.1.87",
         "tango-app-api-middleware": "^3.1.43-alpha.10",
         "winston": "^3.13.1",
-        "winston-daily-rotate-file": "^5.0.0"
+        "winston-daily-rotate-file": "^5.0.0",
+        "url": "^0.11.4",
+        "path": "^0.12.7",
+        "firebase-admin": "^13.0.0",
+        "fs": "^0.0.1-security"
     },
     "devDependencies": {
         "eslint": "^8.57.0",

package/src/controllers/internalTrax.controller.js

@@ -6,12 +6,23 @@ import * as CLassign from '../services/checklistAssign.service.js';
 import * as checklistLogs from '../services/checklistlog.service.js';
 import * as lenskartEmployeeMapping from '../services/lenskartEmployeeMapping.service.js';
 import * as storeService from '../services/store.service.js';
+import * as userService from '../services/user.service.js';
 import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat.js';
 import timeZone from 'dayjs/plugin/timezone.js';
 import utc from 'dayjs/plugin/utc.js';
 import { logger } from 'tango-app-api-middleware';
 import mongoose from 'mongoose';
+import admin from 'firebase-admin';
+import path from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath( import.meta.url ); // Get the current file path
+const __dirname = path.dirname( __filename );
+const serviceAccountPath = path.join( __dirname, '..', '..', 'fir-51e77-firebase-adminsdk-x3sdp-fd902b74ae.json' );
+admin.initializeApp( {
+  credential: admin.credential.cert( serviceAccountPath ),
+} );
+
 const ObjectId = mongoose.Types.ObjectId;
 dayjs.extend( customParseFormat );
 dayjs.extend( utc );
@@ -407,6 +418,8 @@ async function insertData( requestData ) {
                         element4.publishDate = getCLconfig.publishDate;
                         element4.locationCount = getCLconfig.locationCount;
                         element4.scheduleRepeatedType = getCLconfig.scheduleRepeatedType;
+                        element4.approvalEnable = getCLconfig.approver.length ? true : false;
+                        element4.remainder = getCLconfig?.remainder || [];
                       }
                       if ( userIdList.length ) {
                         allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );
@@ -867,3 +880,106 @@ export async function getUserStoreList( req, res ) {
     return res.sendError( error, 500 );
   }
 };
+
+export async function pushNotification( req, res ) {
+  try {
+    let query = [ {
+      $match: {
+        date_iso: new Date( req.body.date ),
+        $expr: { $gt: [ { $size: '$remainder' }, 0 ] },
+        checklistStatus: { $ne: 'submit' },
+        checkListType: { $in: [ 'custom' ] },
+        timeFlag: 0,
+      },
+    } ];
+
+    if ( req.body.client_id && req.body.client_id.length ) {
+      query.push( {
+        $match: {
+          client_id: { $in: req.body.client_id },
+        },
+      } );
+    }
+
+    query.push( {
+      $project: {
+        scheduleEndTime_iso: 1,
+        store_id: 1,
+        storeName: 1,
+        checkListId: 1,
+        checkListName: 1,
+        client_id: 1,
+        date_iso: 1,
+        userId: 1,
+        scheduleEndTime: 1,
+        remainder: 1,
+      },
+    } );
+
+
+    let checkList = await processedchecklist.aggregate( query );
+
+    if ( !checkList.length ) {
+      return res.sendError( 'no data', 204 );
+    }
+
+    let checklistDetails = [];
+
+    let promises = checkList.map( async ( item ) => {
+      await checkTimeZone( [ item ] );
+    } );
+
+    await Promise.all( promises );
+
+    async function checkTimeZone( ele ) {
+      return Promise.all(
+          ele.map( async ( data ) => {
+            let getStoreZone = await storeService.findOne(
+                { storeId: data.store_id, clientId: data.client_id },
+                { storeProfile: 1 },
+            );
+            if ( getStoreZone ) {
+              let checklistDate = dayjs( dayjs( data.scheduleEndTime, 'hh:mm A' ) ).tz( getStoreZone.storeProfile.timeZone, true );
+              let date = dayjs().tz( getStoreZone.storeProfile.timeZone );
+              if ( data?.remainder?.length && data.remainder.includes( checklistDate.diff( date, 'minute' ) ) ) {
+                let getToken = await userService.findOne( { _id: data.userId }, { fcmToken: 1 } );
+                if ( getToken?.fcmToken ) {
+                  let existCheck = checklistDetails.findIndex( ( item ) => item.checklistName == data.checkListName );
+                  if ( existCheck ) {
+                    checklistDetails[existCheck].token.push( getToken.fcmToken );
+                  } else {
+                    checklistDetails.push( { checklistName: data.checkListName, token: [ getToken.fcmToken ] } );
+                  }
+                }
+              }
+            }
+          } ),
+      );
+    }
+
+    if ( !checklistDetails.length ) {
+      return res.sendError( 'no data found', 204 );
+    }
+
+    checklistDetails.forEach( async ( item ) => {
+      const message = {
+        tokens: item.token,
+        notification: {
+          title: 'Remainder to Fil checklist',
+          body: `${item.checklistName} checklist is going to breach within few minutes`,
+        },
+        data: {
+          customKey: 'customValue',
+        },
+      };
+      const response = await admin.messaging().sendEachForMulticast( message );
+      if ( response.successCount ) {
+        return res.sendSuccess( 'Push notification send successfully' );
+      }
+      return res.sendError( 'Push notification send Failed', 500 );
+    } );
+  } catch ( e ) {
+    logger.error( { function: 'pushNotification', error: e } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/controllers/mobileTrax.controller.js

@@ -29,7 +29,7 @@ export async function storeList( req, res ) {
     if ( !req.query?.date ) {
       return res.sendError( 'date is required', 400 );
     }
-    let userChecklist = await processedchecklist.find( { userId: req.user._id, userEmail: req.user.email, date_string: dayjs( req.query.date ).format( 'YYYY-MM-DD' ) }, { store_id: 1, storeName: 1 } );
+    let userChecklist = await processedchecklist.find( { userId: req.user._id, userEmail: req.user.email, client_id: req.user.clientId, date_string: dayjs( req.query.date ).format( 'YYYY-MM-DD' ) }, { store_id: 1, storeName: 1 } );
     if ( !userChecklist.length ) {
       return res.sendSuccess( [] );
     }
@@ -39,7 +39,7 @@ export async function storeList( req, res ) {
     );
 
     let storeIdList = userChecklist.map( ( item ) => item.store_id );
-    let storeStatus = await storeService.find( { storeId: { $in: storeIdList }, status: 'active' }, { storeId: 1, storeName: 1 } );
+    let storeStatus = await storeService.find( { storeId: { $in: storeIdList }, status: 'active', clientId: req.user.clientId }, { storeId: 1, storeName: 1 } );
     if ( storeStatus.length ) {
       storeStatus = storeStatus.map( ( item ) => {
         return { store_id: item.storeId, storeName: item.storeName };
@@ -1271,7 +1271,7 @@ export async function submitTask( req, res ) {
       };
       await checklistLogs.create( logInsertData );
 
-      updateOpenSearch( user, requestData );
+      updateOpenSearchTask( user, requestData );
 
       return res.sendSuccess( 'Task Updated Successfully' );
     } else {
@@ -1329,6 +1329,51 @@ async function updateOpenSearch( user, data ) {
   }
 }
 
+async function updateOpenSearchTask( user, data ) {
+  let findQuery = [ {
+    $match: {
+      $and: [
+        { _id: new ObjectId( data.processedcheckListId ) },
+        { userId: user._id },
+        { date_string: data.date },
+      ],
+    },
+  } ];
+
+  let getchecklist = await processedTask.aggregate( findQuery );
+  if ( getchecklist.length ) {
+    let logInsertData = {
+      store_id: getchecklist[0].store_id,
+      storeName: getchecklist[0].storeName,
+      action: 'OpenSearch insert Triggered',
+      checklistId: getchecklist[0].checkListId,
+      checkListName: getchecklist[0].checkListName,
+      client_id: user.clientId,
+    };
+    await checklistLogs.create( logInsertData );
+    const requestOptions = {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify( { doc: { ...getchecklist[0] } } ),
+    };
+    let url = JSON.parse( process.env.LAMBDAURL );
+    let searchResponse = await fetch( url.submitTask, requestOptions );
+    if ( searchResponse.ok ) {
+      let logInsertData = {
+        store_id: getchecklist[0].store_id,
+        storeName: getchecklist[0].storeName,
+        action: 'OpenSearch inserted Successfully',
+        checklistId: getchecklist[0].checkListId,
+        checkListName: getchecklist[0].checkListName,
+        client_id: user.clientId,
+      };
+      await checklistLogs.create( logInsertData );
+    }
+  }
+}
+
 export async function dashboard( req, res ) {
   try {
     let requestData = req.query;
@@ -1930,7 +1975,7 @@ export async function taskQuestionList( req, res ) {
       }
     }
 
-    return res.sendSuccess( checklist );
+    return res.sendSuccess( [ checklist ] );
   } catch ( error ) {
     logger.error( { function: 'taskQuestionList', error } );
     return res.sendError( error.message || 'Internal Server Error', 500 );
@@ -1955,10 +2000,17 @@ export async function uploadAnswerImage( req, res ) {
     }
 
     let date = dayjs().format( 'YYYY-MM-DD' );
+    let folder;
+
+    if ( input.type == 'custom' ) {
+      folder = 'checklist-answers';
+    } else {
+      folder = 'task-answers';
+    }
 
     if ( req.files && req.files.answerImage ) {
       let imageUrl;
-      let filePath = `checklist-answers/${req.user.clientId}/${date}/${input.checklistId}/${input.sectionName.replace( ' ', '' )}/${input.questionNo}/`;
+      let filePath = `${folder}/${req.user.clientId}/${date}/${input.checklistId}/${input.sectionName.replace( ' ', '' )}/${input.questionNo}/`;
       let params = {
         fileName: `${Date.now()}-${Math.floor( 1000 + Math.random() * 9000 )}.${req.files.answerImage.name.split( '.' )[1]}`,
         Key: filePath,
@@ -2095,8 +2147,15 @@ export async function login( req, res ) {
       refreshToken: token?.refreshToken,
       type: 'retail',
     };
+
+    let userDetails = await userService.findOne( { fcmToken: inputData.fcmToken } );
+
+    if ( userDetails ) {
+      await userService.updateOne( { _id: userDetails?._id }, { fcmToken: '' } );
+    }
+
     const auth = await create( record );
-    await userService.updateOne( { _id: result?._id }, { refreshToken: token?.refreshToken } );
+    await userService.updateOne( { _id: result?._id }, { refreshToken: token?.refreshToken, fcmToken: inputData.fcmToken } );
 
     if ( auth ) {
       return res.sendSuccess( { result: token } );
@@ -2201,7 +2260,7 @@ export async function getStoreLocation( req, res, next ) {
       return res.sendError( 'No store/Checklist assigned to the user!', 400 );
     }
   } catch ( error ) {
-    console.log( 'SOP Mobile store check middleware error=>', error );
+    logger.error( { function: 'SOP Mobile store check middleware error', error: error } );
     let msg = error.error ? error.error : error;
     return res.sendError( msg, 500 );
   }

package/src/controllers/teaxFlag.controller.js

@@ -3,7 +3,6 @@ import { aggregate } from '../services/processedchecklist.services.js';
 import dayjs from 'dayjs';
 import * as processedchecklistService from '../services/processedchecklist.services.js';
 import * as processedchecklistconfigService from '../services/processedchecklistconfig.services.js';
-import * as checklistconfigService from '../services/checklist.service.js';
 
 
 import utc from 'dayjs/plugin/utc.js';
@@ -783,7 +782,9 @@ export const flagTablesV1 = async ( req, res ) => {
         { date_iso: { $lte: toDate } },
     );
 
-    if ( requestData?.filter === 'question' ) {
+    if ( requestData?.filter === 'all' ) {
+      findAndQuery.push( { $or: [ { questionFlag: { $gte: 1 } }, { timeFlag: { $gte: 1 } }, { checkListType: { $ne: 'custom' } } ] } );
+    } else if ( requestData?.filter === 'question' ) {
       findAndQuery.push( { checkListType: 'custom' } );
       findAndQuery.push( { questionFlag: { $gte: 1 } } );
     } else if ( requestData?.filter === 'time' ) {
@@ -2585,34 +2586,105 @@ export const checklistDropdownSourceChecklist = async ( req, res ) => {
 export const checklistDropdownV1 = async ( req, res ) => {
   try {
     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 result = {};
-    let findQuery = [];
-    let findAndQuery = [];
-    findAndQuery.push(
+
+    let findQuery = [
+      { $match: { $and: [
         { client_id: requestData.clientId },
-        { isdeleted: false },
-    );
-    findQuery.push( { $match: { $and: findAndQuery } } );
-    findQuery.push( {
-      $project: {
-        sourceCheckList_id: '$_id',
-        checkListName: 1,
-        checkListNameLowercase: { $toLower: '$checkListName' },
-        checkListType: 1,
-        createdByName: 1,
-        storeCount: 1,
-        scheduleRepeatedType: 1,
-        scheduleStartTime: 1,
-        scheduleEndTime: 1,
-        publish: 1,
+        {
+          $or: [
+            { store_id: { $in: requestData.storeId } },
+            { aiStoreList: { $in: requestData.storeId } },
+          ],
+        },
+        { date_iso: { $gte: fromDate } },
+        { date_iso: { $lte: toDate } },
+        {
+          $or: [
+            { questionFlag: { $gte: 1 } },
+            { timeFlag: { $gte: 1 } },
+            { checkListType: { $ne: 'custom' } },
+          ],
+        },
+      ] } },
+      {
+        $project: {
+          sourceCheckList_id: 1,
+          checkListName: 1,
+        },
       },
-    } );
-    if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
-      findQuery.push( { $sort: { [requestData.sortColumnName]: requestData.sortBy } } );
-    } else {
-      findQuery.push( { $sort: { ['checkListNameLowercase']: 1 } } );
-    }
-    let getChecklistData = await checklistconfigService.aggregate( findQuery );
+      {
+        $group: {
+          _id: '$sourceCheckList_id',
+          checkListName: { $last: '$checkListName' },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          sourceCheckList_id: '$_id',
+          checkListName: 1,
+        },
+      },
+      {
+        $lookup: {
+          from: 'checklistconfigs',
+          let: { sourceId: '$sourceCheckList_id' },
+          pipeline: [
+            {
+              $match: {
+                $expr: {
+                  $and: [
+                    { $eq: [ '$_id', '$$sourceId' ] },
+                  ],
+                },
+              },
+            },
+            {
+              $project: {
+                _id: 1,
+                checkListName: 1,
+                checkListNameLowercase: { $toLower: '$checkListName' },
+                checkListType: 1,
+                createdByName: 1,
+                publish: 1,
+                scheduleEndTime: 1,
+                scheduleRepeatedType: 1,
+                scheduleStartTime: 1,
+                sourceCheckList_id: '$_id',
+                storeCount: 1,
+              },
+            },
+          ], as: 'checklistData',
+        },
+      },
+      { $unwind: { path: '$checklistData', preserveNullAndEmptyArrays: true } },
+      {
+        $project: {
+          _id: '$checklistData._id',
+          checkListName: '$checklistData.checkListName',
+          checkListNameLowercase: { $toLower: '$checkListName' },
+          checkListType: '$checklistData.checkListType',
+          createdByName: '$checklistData.createdByName',
+          publish: '$checklistData.publish',
+          scheduleEndTime: '$checklistData.scheduleEndTime',
+          scheduleRepeatedType: '$checklistData.scheduleRepeatedType',
+          scheduleStartTime: '$checklistData.scheduleStartTime',
+          sourceCheckList_id: '$checklistData._id',
+          storeCount: '$checklistData.storeCount',
+        },
+      },
+    ];
+
+    findQuery.push( { $sort: { checkListName: 1 } } );
+
+    let getChecklistData = await processedchecklistService.aggregate( findQuery );
+
     if ( !getChecklistData.length ) {
       return res.sendError( { error: 'No Data Found' }, 204 );
     }

package/src/controllers/trax.controller.js

@@ -5,7 +5,7 @@ import * as assignedService from '../services/checklistAssign.service.js';
 import * as clientService from '../services/clients.services.js';
 import * as reisedTicketService from '../services/ticket.service.js';
 import * as userService from '../services/user.service.js';
-import * as domainService from '../services/domain.service.js';
+// import * as domainService from '../services/domain.service.js';
 import * as storeService from '../services/store.service.js';
 import mongoose from 'mongoose';
 import * as processedchecklistConfig from '../services/processedchecklistconfig.services.js';
@@ -13,6 +13,7 @@ import * as processedchecklist from '../services/processedchecklist.services.js'
 import * as checklistLogs from '../services/checklistlog.service.js';
 import * as tagService from '../services/tagging.service.js';
 import * as alertsServices from '../services/clientRequest.service.js';
+import * as traxApprover from '../services/approver.service.js';
 const ObjectId = mongoose.Types.ObjectId;
 import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat.js';
@@ -779,18 +780,25 @@ export const assignedUserDetails = async ( req, res ) => {
       }
     }
 
-    let checklistCount = await assignedService.aggregate( query );
-
-    query.push( { $skip: skip }, { $limit: limit } );
+    query.push( {
+      $facet: {
+        data: [
+          { $skip: skip }, { $limit: limit },
+        ],
+        count: [
+          { $count: 'total' },
+        ],
+      },
+    } );
 
     let checklistDetails = await assignedService.aggregate( query );
 
-    if ( !checklistDetails.length ) {
+    if ( !checklistDetails[0].data.length ) {
       return res.sendError( 'no data found', 204 );
     }
 
     let userDetails = [];
-    checklistDetails.forEach( ( item ) => {
+    checklistDetails[0].data.forEach( ( item ) => {
       userDetails.push( {
         id: item._id,
         userName: item.userName,
@@ -802,7 +810,7 @@ export const assignedUserDetails = async ( req, res ) => {
         checkFlag: item.checkFlag,
       } );
     } );
-    return res.sendSuccess( { users: userDetails, count: checklistCount.length } );
+    return res.sendSuccess( { users: userDetails, count: checklistDetails[0].count[0].total } );
   } catch ( e ) {
     logger.error( 'assignedUserDetails =>', e );
     return res.sendError( e, 500 );
@@ -892,7 +900,7 @@ export const updateConfigure =async ( req, res ) => {
     let logInsertData = {
       action: inputBody.submitType == 'publish' ? 'checklistPublishUsingConfigPage' : 'checklistConfigDraft',
       checklistId: inputBody.checkListDetails._id,
-      checkListName: inputBody?.checkListDetails.checklistName,
+      checkListName: inputBody?.checkListDetails.checkListName,
       createdBy: req.user._id,
       createdByName: req.user.userName,
       client_id: req.body.clientId,
@@ -939,8 +947,32 @@ export const updateConfigure =async ( req, res ) => {
       configEndDate: inputBody?.checkListDetails?.configEndDate || '',
       specificDate: inputBody?.checkListDetails?.specificDate || [],
       allowOnce: inputBody?.checkListDetails?.allowOnce || false,
+      approver: inputBody?.checkListDetails?.approver || [],
+      remainder: inputBody?.checkListDetails?.remainder || [],
     };
 
+    if ( inputBody?.checkListDetails?.approver.length ) {
+      let data = [];
+      let existEmail = await traxApprover.find( { checkListId: inputBody.checkListDetails._id, isDeleted: false } );
+      let mailList = existEmail.map( ( item ) => item.userEmail );
+      existEmail = inputBody?.checkListDetails?.approver.filter( ( item ) => mailList.includes( item.value ) ).map( ( item ) => item.value );
+      let userMailList = inputBody?.checkListDetails?.approver.map( ( ele ) => ele.value );
+      inputBody?.checkListDetails?.approver.forEach( ( ele ) => {
+        if ( !existEmail.includes( ele.value ) ) {
+          data.push( {
+            userEmail: ele.value,
+            checkListId: inputBody.checkListDetails._id,
+            type: 'checklist',
+          } );
+        }
+      } );
+
+      await traxApprover.updateMany( { checkListId: inputBody.checkListDetails._id, userEmail: { $nin: userMailList } }, { isDeleted: true } );
+      if ( data.length ) {
+        await traxApprover.insertMany( data );
+      }
+    }
+
 
     if ( checklistDetails.checkListType != 'custom' && !checklistDetails.client_id ) {
       let getchecklistNumber = await checklistService.findOne( { client_id: req.body.clientId, type: 'checklist' }, { checkListNumber: 1 } );
@@ -1282,7 +1314,7 @@ export const validateUser = async ( req, res ) => {
 
     if ( !req.body?.addUser ) {
       if ( req.body.hasOwnProperty( 'delete' ) ) {
-        let checkExists = await assignedService.findOne( { userEmail: req.body.assignedUsers[0].userEmail, storeName: req.body.assignedUsers[0].storeName } );
+        let checkExists = await assignedService.findOne( { userEmail: req.body.assignedUsers[0].userEmail, storeName: req.body.assignedUsers[0].storeName, checkListId: req.body.id } );
         if ( checkExists ) {
           return res.sendError( 'User already Exists', 400 );
         }
@@ -1349,11 +1381,11 @@ export const validateUser = async ( req, res ) => {
           ];
           let userDetails = await userService.aggregate( query );
           if ( !userDetails.length ) {
-            let checkDomain = item.userEmail.split( '@' )[1].toLowerCase();
-            let brandDomainExists = await domainService.find( { domain: { $regex: checkDomain } } );
-            if ( !brandDomainExists ) {
-              domainExists.push( { message: 'Domain is not exists', email: item.userEmail } );
-            }
+            // let checkDomain = item.userEmail.split( '@' )[1].toLowerCase();
+            // let brandDomainExists = await domainService.findOne( { domain: { $regex: checkDomain } } );
+            // if ( !brandDomainExists ) {
+            //   domainExists.push( { message: 'Domain is not exists', email: item.userEmail } );
+            // }
             let filteredEmail = userEmail.find( ( ele ) => ele.userEmail.toLowerCase() == item.userEmail.toLowerCase() );
             if ( !filteredEmail ) {
               userEmail.push( { userName: item.userName, userEmail: item.userEmail } );
@@ -1390,7 +1422,7 @@ export const validateUser = async ( req, res ) => {
       }
     } else {
       if ( req.body.hasOwnProperty( 'delete' ) ) {
-        let checkExists = await assignedService.findOne( { userEmail: req.body.assignedUsers[0].userEmail, storeName: req.body.assignedUsers[0].storeName } );
+        let checkExists = await assignedService.findOne( { userEmail: req.body.assignedUsers[0].userEmail, storeName: req.body.assignedUsers[0].storeName, checkListId: req.body.id } );
         if ( checkExists ) {
           return res.sendError( 'User already Exists', 400 );
         }
@@ -1956,6 +1988,8 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
       element4.publishDate = getCLconfig.publishDate;
       element4.locationCount = getCLconfig.locationCount;
       element4.scheduleRepeatedType = getCLconfig.scheduleRepeatedType;
+      element4.approvalEnable = getCLconfig.approver.length ? true : false;
+      element4.remainder = getCLconfig?.remainder || [];
     }
     if ( userIdList.length ) {
       allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );
@@ -2011,7 +2045,7 @@ export const aiChecklist = async ( req, res ) => {
 
 export const preDefinedChecklist = async ( req, res ) => {
   try {
-    let data = [ 'opertaionchecklist', 'storehygiene', 'dailystorechecklist', 'lossprevention' ];
+    let data = [ 'opertaionchecklist', 'storehygiene', 'dailystorechecklist', 'lossprevention', 'Infrastructure', 'dailystoreweekday' ];
     let details = [];
     let predefinedWithoutClient = [];
     let predefinedDetails = [];