tango-app-api-task 3.7.19 → 3.7.21

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.7.19",
+    "version": "3.7.21",
     "description": "Task",
     "main": "index.js",
     "type": "module",

package/src/controllers/task.controller.js

@@ -5038,12 +5038,9 @@ export async function taskcreation( req, res ) {
     inputBody.clientId = 458;
     inputBody.taskDescription = '';
     let userId;
-    let storeDetails;
-    if ( inputBody?.storeName ) {
-      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 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 );
     }
 
 
@@ -5059,10 +5056,10 @@ export async function taskcreation( req, res ) {
     inputBody.userEmail = finduser.email;
 
 
-    let title = `New Task Alert ${inputBody.taskName}-`+storeDetails?.storeName ? storeDetails?.storeName : ``+`-${dayjs().format( 'YYYY-MM-DD' )}`;
+    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 ? storeDetails?.storeName : `you` +`. Please complete it before the due date of ${date}.`;
+    let description = `A new task has been assigned to ${storeDetails.storeName}. Please complete it before the due date of ${date}.`;
     if ( userDetails && userDetails.fcmToken ) {
       const fcmToken = userDetails.fcmToken;
       await sendPushNotification( title, description, fcmToken );
@@ -5089,19 +5086,13 @@ export async function taskcreation( req, res ) {
     if ( req.body && req.body.referenceImage && req.body.referenceImage.length > 3 ) {
       return res.sendError( 'Maximum 3 referenceImage only allowed', 500 );
     }
-    let taskName;
-    if ( inputBody?.storeName ) {
-      taskName = `${inputBody.taskName}(${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )})`;
-    } else {
-      taskName = `${inputBody.taskName}(-${dayjs().format( 'YYYY-MM-DD' )})`;
-    }
     let data = {
-      checkListName: taskName,
+      checkListName: `${inputBody.taskName}(${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )})`,
       checkListDescription: inputBody.taskDescription,
       createdBy: creator[0]._id,
       createdByName: creator[0].userName,
       publish: true,
-      questionCount: inputBody?.questions?.length || 1,
+      questionCount: 1,
       storeCount: 1,
       scheduleDate: date,
       scheduleEndTime: time,
@@ -5112,7 +5103,6 @@ export async function taskcreation( req, res ) {
       publishDate: new Date(),
       locationCount: 1,
       ...( inputBody?.checkListId ) ? { referenceCheckListId: inputBody?.checkListId } : {},
-      coverage: inputBody?.storeName ? 'store' : 'user',
     };
     let clientDetails = await clientService.findOne( { clientId: inputBody?.clientId }, { traxVideoUploadTimeLimit: 1 } );
     data['videoUploadTimeLimit'] = clientDetails?.traxVideoUploadTimeLimit || 0;
@@ -5220,8 +5210,8 @@ export async function taskcreation( req, res ) {
       let userDetails = {
         userName: inputBody.userName,
         userEmail: inputBody.userEmail,
-        store_id: storeDetails?.storeId,
-        storeName: storeDetails?.storeName,
+        store_id: storeDetails.storeId,
+        storeName: storeDetails.storeName,
         city: storeDetails?.storeProfile?.city,
         checkFlag: true,
         checkListId: response?._id,
@@ -5231,7 +5221,6 @@ export async function taskcreation( req, res ) {
         assignId: storeDetails?._id,
         country: storeDetails?.storeProfile?.country,
         state: storeDetails?.storeProfile?.state,
-        coverage: inputBody?.storeName ? 'store' : 'user',
       };
       await taskAssignService.create( userDetails );
       await insertSingleProcessData( response?._id );
@@ -5549,11 +5538,12 @@ export async function userMigrations( req, res ) {
 export async function StoreHygienetask( req, res ) {
   try {
     let inputBody = req.body;
-
-    inputBody.clientId = 11;
+    if ( !inputBody?.clientId ) {
+      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 } );
+    let storeDetails = await storeService.findOne( { storeName: inputBody.storeName, clientId: inputBody.clientId, status: 'active' }, { storeId: 1, storeName: 1, storeProfile: 1, spocDetails: 1 } );
     if ( !storeDetails ) {
       return res.sendError( 'Store Not Found', 500 );
     }
@@ -5566,7 +5556,25 @@ export async function StoreHygienetask( req, res ) {
 
     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 );
+      finduser = await userService.findOne( { email: storeDetails?.spocDetails?.[0]?.email, clientId: inputBody.clientId }, { userId: '$_id', userName: 1, userEmail: '$email' } );
+      if ( !finduser ) {
+        finduser = await userService.findOne( { email: storeDetails?.spocDetails?.[0]?.email, clientId: { $ne: inputBody.clientId } }, { userId: '$_id', userName: 1, userEmail: '$email' } );
+        if ( finduser ) {
+          return res.sendError( 'UserEmail is mapped with another clientId', 400 );
+        }
+        let userData = {
+          userName: storeDetails?.spocDetails?.[0]?.email.split( '@' )?.[0],
+          email: storeDetails?.spocDetails?.[0]?.email,
+          mobileNumber: '',
+          clientId: inputBody.clientId,
+        };
+
+        finduser = await createUser( userData );
+        finduser.userId = finduser._id;
+        finduser.userName = finduser.userName;
+        finduser.userEmail = finduser.email;
+      }
+      // return res.sendError( 'No user Found For this store', 500 );
     }
 
     userId = finduser.userId;
@@ -5599,10 +5607,10 @@ export async function StoreHygienetask( req, res ) {
     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 } );
+      userAdmin = await userService.find( { clientId: inputBody.clientId, role: 'superadmin', 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 } );
+    let creator = await userService.find( { clientId: inputBody.clientId, role: 'superadmin', userType: 'client', isActive: true } );
     if ( creator && creator.length === 0 ) {
       return res.sendError( 'Invalid Creator Details', 500 );
     }
@@ -6077,19 +6085,19 @@ async function insertStoreHygienetaskSingleProcessedTask( checkTask, inputBody,
     newData.checkListType = 'task' || '';
     let insertprocessdata = await taskProcessedService.insert( newData );
     if ( insertprocessdata ) {
-      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?.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 );
+      // }
       return true;
     } else {
       return false;
@@ -6742,7 +6750,7 @@ export async function createAITaskGroup( req, res ) {
               ],
             },
             {
-              featurName: 'TangoEye',
+              featureName: 'TangoEye',
               modules: [
                 {
                   name: 'ZoneTag',
@@ -6753,7 +6761,7 @@ export async function createAITaskGroup( req, res ) {
               ],
             },
             {
-              featurName: 'TangoTrax',
+              featureName: 'TangoTrax',
               modules: [
                 {
                   name: 'checklist',
@@ -6769,6 +6777,29 @@ export async function createAITaskGroup( req, res ) {
                 },
               ],
             },
+            {
+              featureName: 'FootfallDirectory',
+              modules: [
+                {
+                  name: 'creator',
+                  isAdd: true,
+                  isEdit: true,
+
+                },
+                {
+                  name: 'reviewer',
+                  isAdd: false,
+                  isEdit: false,
+
+                },
+                {
+                  name: 'approver',
+                  isAdd: false,
+                  isEdit: false,
+
+                },
+              ],
+            },
           ],
         };
         let response = await userService.create( params );

package/src/dtos/task.dto.js

@@ -22,6 +22,7 @@ export const StoreHygienetaskSchema = Joi.object().keys( {
   scheduleEndTime: Joi.string().optional(),
   referenceImage: Joi.array().required(),
   zoneName: Joi.string().required(),
+  clientId: Joi.string().optional(),
 } );
 
 
@@ -55,7 +56,7 @@ const gettaskSchema = Joi.object( {
   sourceCheckList_id: Joi.string().required(),
 } );
 export const taskcreationSchema = Joi.object().keys( {
-  storeName: Joi.string().optional().allow( '' ),
+  storeName: Joi.string().required(),
   taskName: Joi.string().required(),
   user: Joi.string().required(),
   questions: Joi.array().items( questionSchema ).required(),
@@ -64,7 +65,6 @@ export const taskcreationSchema = Joi.object().keys( {
   scheduleEndTime: Joi.string().optional(),
   approver: Joi.string().required(),
   creator: Joi.string().required(),
-  coverage: Joi.string().optional(),
 } );
 
 export const commonAiTaskvalidation = {