tango-app-api-task 3.7.24 → 3.7.26

package/package.json

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

package/src/controllers/task.controller.js

@@ -5038,9 +5038,12 @@ export async function taskcreation( req, res ) {
     inputBody.clientId = 458;
     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 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 );
+      }
     }
 
 
@@ -5056,10 +5059,10 @@ export async function taskcreation( req, res ) {
     inputBody.userEmail = finduser.email;
 
 
-    let title = `New Task Alert ${inputBody.taskName}-${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )}`;
+    let title = `New Task Alert ${inputBody.taskName}-`+storeDetails?.storeName ? 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 description = `A new task has been assigned to`+storeDetails?.storeName ? storeDetails?.storeName : `you` +`. Please complete it before the due date of ${date}.`;
     if ( userDetails && userDetails.fcmToken ) {
       const fcmToken = userDetails.fcmToken;
       await sendPushNotification( title, description, fcmToken );
@@ -5086,13 +5089,19 @@ 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: `${inputBody.taskName}(${storeDetails.storeName}-${dayjs().format( 'YYYY-MM-DD' )})`,
+      checkListName: taskName,
       checkListDescription: inputBody.taskDescription,
       createdBy: creator[0]._id,
       createdByName: creator[0].userName,
       publish: true,
-      questionCount: 1,
+      questionCount: inputBody?.questions?.length || 1,
       storeCount: 1,
       scheduleDate: date,
       scheduleEndTime: time,
@@ -5103,6 +5112,7 @@ 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;
@@ -5210,8 +5220,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,
@@ -5221,6 +5231,7 @@ 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 );

package/src/controllers/taskDashboard.controllers.js

@@ -1104,11 +1104,12 @@ export async function taskDetails( req, res ) {
       },
     ];
 
-    if ( req.body?.searchValue.trim().length ) {
+    if ( req.body?.searchValue?.trim()?.length ) {
+      const safeSearch = escapeRegex( req.body?.searchValue );
       query.push(
           {
             $match: {
-              checkListName: { $regex: req.body.searchValue, $options: 'i' },
+              checkListName: { $regex: safeSearch, $options: 'i' },
             },
           },
       );
@@ -1172,3 +1173,6 @@ export async function taskDetails( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+function escapeRegex( text ) {
+  return text.replace( /[.*+?^${}()|[\]\\]/g, '\\$&' );
+}

package/src/dtos/task.dto.js

@@ -56,7 +56,7 @@ const gettaskSchema = Joi.object( {
   sourceCheckList_id: Joi.string().required(),
 } );
 export const taskcreationSchema = Joi.object().keys( {
-  storeName: Joi.string().required(),
+  storeName: Joi.string().optional().allow( '' ),
   taskName: Joi.string().required(),
   user: Joi.string().required(),
   questions: Joi.array().items( questionSchema ).required(),
@@ -65,6 +65,7 @@ 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 = {