tango-app-api-store-builder 1.0.0-beta-158 → 1.0.0-beta-159

package/src/controllers/task.controller.js

@@ -1,4 +1,3 @@
-import * as taskService from '../service/task.service.js';
 import * as processedService from '../service/processedTaskservice.js';
 import * as storeService from '../service/store.service.js';
 import * as processedChecklistService from '../service/processedchecklist.service.js';
@@ -11,7 +10,7 @@ import * as checklistService from '../service/checklist.service.js';
 import timeZone from 'dayjs/plugin/timezone.js';
 import * as planoProductService from '../service/planoProduct.service.js';
 import mongoose from 'mongoose';
-// const ObjectId = mongoose.Types.ObjectId;
+const ObjectId = mongoose.Types.ObjectId;
 import * as floorService from '../service/storeBuilder.service.js';
 import * as planoStaticService from '../service/planoStaticData.service.js';
 import * as assignService from '../service/assignService.service.js';
@@ -128,10 +127,13 @@ export async function createTask( req, res ) {
       await processedService.updateOne( { _id: req.body.taskId }, { checklistStatus: 'open', redoStatus: true, date_iso: new Date( dayjs().format( 'YYYY-MM-DD' ) ), scheduleStartTime_iso: dayjs.utc( '12:00 AM', 'hh:mm A' ).format(), scheduleEndTime_iso: dayjs.utc( scheduleEndTime, 'hh:mm A' ).format(), date_string: dayjs().format( 'YYYY-MM-DD' ), date_iso: new Date( dayjs().format( 'YYYY-MM-DD' ) ) } );
       return res.sendSuccess( 'Task redo triggered successfully' );
     } else {
-      let taskDetails = await taskService.find( { isPlano: true, client_id: req.body.clientId, ...( req.body.checkListName )? { checkListName: req.body.checkListName } : {} } );
-      if ( !taskDetails.length ) {
-        return res.sendError( 'No data found', 204 );
+      if ( !req.body?.checkListName ) {
+        return res.sendError( 'ChecklistName is required', 400 );
       }
+      // let taskDetails = await taskService.find( { isPlano: true, ...( req.body.checkListName )? { checkListName: req.body.checkListName } : {} } );
+      // if ( !taskDetails.length ) {
+      //   return res.sendError( 'No data found', 204 );
+      // }
       let userDetails;
       let storeList;
       let endDate;
@@ -200,104 +202,113 @@ export async function createTask( req, res ) {
           await createUser( userData );
         }
       }
-      await Promise.all( taskDetails.map( async ( task ) => {
-        let splitName = task?.checkListName.split( ' ' );
-        splitName.pop();
-        let data = {
-          client_id: req.body.clientId,
-          date_iso: new Date( dayjs().format( 'YYYY-MM-DD' ) ),
-          date_string: dayjs().format( 'YYYY-MM-DD' ),
-          sourceCheckList_id: task._id,
-          checkListName: task.checkListName,
-          checkListId: task._id,
-          scheduleStartTime: '12:00 AM',
-          scheduleEndTime: scheduleEndTime,
-          scheduleStartTime_iso: dayjs.utc( '12:00 AM', 'hh:mm A' ).format(),
-          scheduleEndTime_iso: dayjs.utc( endDate, 'YYYY-MM-DD hh:mm A' ).format(),
-          allowedOverTime: false,
-          allowedStoreLocation: req.body?.geoFencing || false,
-          createdBy: req?.user?._id || task?.createdBy,
-          createdByName: req?.user?.userName || task?.createdByName,
-          questionAnswers: [],
-          isdeleted: false,
-          questionCount: 0,
-          storeCount: 0,
-          locationCount: 0,
-          checkListType: 'task',
-          country: '',
-          store_id: '',
-          storeName: '',
-          userId: '',
-          userName: '',
-          userEmail: '',
-          checklistStatus: 'open',
-          timeFlagStatus: true,
-          timeFlag: 0,
-          questionFlag: 0,
-          mobileDetectionFlag: 0,
-          storeOpenCloseFlag: 0,
-          reinitiateStatus: false,
-          markasread: false,
-          uniformDetectionFlag: 0,
-          scheduleRepeatedType: 'daily',
-          approvalStatus: false,
-          approvalEnable: false,
-          redoStatus: false,
-          isPlano: true,
-          planoType: splitName.length == 1 ? splitName[0].toLowerCase() : splitName[0].toLowerCase() + splitName[2],
-        };
-        let query = [
-          {
-            $addFields: {
-              store: { $toLower: '$storeName' },
-            },
+      // await Promise.all( taskDetails.map( async ( task ) => {
+      let taskId = new ObjectId();
+      let [ first ] = req.body?.checkListName.split( ' ' );
+      first = first.toLowerCase();
+      if ( req.body?.checkListName.toLowerCase().includes( 'rollout' ) ) {
+        if ( req.body.checkListName.toLowerCase().includes( 'visual' ) ) {
+          first = 'vmRollout';
+        } else {
+          first = 'merchRollout';
+        }
+      }
+      let data = {
+        client_id: req.body.clientId,
+        date_iso: new Date( dayjs().format( 'YYYY-MM-DD' ) ),
+        date_string: dayjs().format( 'YYYY-MM-DD' ),
+        sourceCheckList_id: taskId,
+        checkListName: req.body.checkListName,
+        checkListId: taskId,
+        scheduleStartTime: '12:00 AM',
+        scheduleEndTime: scheduleEndTime,
+        scheduleStartTime_iso: dayjs.utc( '12:00 AM', 'hh:mm A' ).format(),
+        scheduleEndTime_iso: dayjs.utc( endDate, 'YYYY-MM-DD hh:mm A' ).format(),
+        allowedOverTime: false,
+        allowedStoreLocation: req.body?.geoFencing || false,
+        createdBy: req?.user?._id,
+        createdByName: req?.user?.userName,
+        questionAnswers: [],
+        isdeleted: false,
+        questionCount: 0,
+        storeCount: 0,
+        locationCount: 0,
+        checkListType: 'task',
+        country: '',
+        store_id: '',
+        storeName: '',
+        userId: '',
+        userName: '',
+        userEmail: '',
+        checklistStatus: 'open',
+        timeFlagStatus: true,
+        timeFlag: 0,
+        questionFlag: 0,
+        mobileDetectionFlag: 0,
+        storeOpenCloseFlag: 0,
+        reinitiateStatus: false,
+        markasread: false,
+        uniformDetectionFlag: 0,
+        scheduleRepeatedType: 'daily',
+        approvalStatus: false,
+        approvalEnable: false,
+        redoStatus: false,
+        isPlano: true,
+        planoType: first,
+      };
+      let query = [
+        {
+          $addFields: {
+            store: { $toLower: '$storeName' },
           },
-          {
-            $match: {
-              clientId: req.body.clientId,
-              store: { $in: storeList },
-            },
+        },
+        {
+          $match: {
+            clientId: req.body.clientId,
+            store: { $in: storeList },
           },
-        ];
+        },
+      ];
 
-        let storeDetails = await storeService.aggregate( query );
-        await Promise.all( storeDetails.map( async ( store ) => {
-          let getUserEmail = req.body.stores.find( ( ele ) => ele.store.toLowerCase() == store.storeName.toLowerCase() );
-          let planoDetails = await planoService.findOne( { storeName: store.storeName } );
-          if ( planoDetails ) {
-            const [ floorDetails, floorCount ] = await Promise.all( [
-              await floorService.find( { planoId: planoDetails._id, ...( req.body?.floorId ) ? { _id: req.body?.floorId }:{} }, { _id: 1, floorName: 1 } ),
-              await floorService.count( { planoId: planoDetails._id } ),
-            ] );
-            for ( let i=0; i<floorDetails.length; i++ ) {
-              if ( getUserEmail ) {
-                let query = [
-                  {
-                    $addFields: {
-                      emailLower: { $toLower: '$email' },
-                    },
+      let storeDetails = await storeService.aggregate( query );
+      await Promise.all( storeDetails.map( async ( store ) => {
+        let getUserEmail = req.body.stores.find( ( ele ) => ele.store.toLowerCase() == store.storeName.toLowerCase() );
+        let planoDetails = await planoService.findOne( { storeName: store.storeName } );
+        if ( planoDetails ) {
+          const [ floorDetails, floorCount ] = await Promise.all( [
+            await floorService.find( { planoId: planoDetails._id, ...( req.body?.floorId ) ? { _id: req.body?.floorId }:{} }, { _id: 1, floorName: 1 } ),
+            await floorService.count( { planoId: planoDetails._id } ),
+          ] );
+          for ( let i=0; i<floorDetails.length; i++ ) {
+            if ( getUserEmail ) {
+              let query = [
+                {
+                  $addFields: {
+                    emailLower: { $toLower: '$email' },
                   },
-                  {
-                    $match: {
-                      clientId: req.body.clientId,
-                      emailLower: getUserEmail.email.toLowerCase(),
-                    },
+                },
+                {
+                  $match: {
+                    clientId: req.body.clientId,
+                    emailLower: getUserEmail.email.toLowerCase(),
                   },
-                ];
-                userDetails = await userService.aggregate( query );
-                userDetails = userDetails[0];
-              }
-              let taskData = { ...data };
-              if ( floorCount > 1 ) {
-                taskData.checkListName = taskData.checkListName +' - '+ floorDetails[i].floorName;
-              }
-              taskData.floorId = floorDetails[i]._id;
-              taskData.store_id = store.storeId;
-              taskData.storeName = store.storeName;
-              taskData.userId = userDetails._id;
-              taskData.userName = userDetails.userName;
-              taskData.userEmail = userDetails.email;
-              taskData.planoId = planoDetails?._id;
+                },
+              ];
+              userDetails = await userService.aggregate( query );
+              userDetails = userDetails[0];
+            }
+            let taskData = { ...data };
+            if ( floorCount > 1 ) {
+              taskData.checkListName = taskData.checkListName +' - '+ floorDetails[i].floorName;
+            }
+            taskData.floorId = floorDetails[i]._id;
+            taskData.store_id = store.storeId;
+            taskData.storeName = store.storeName;
+            taskData.userId = userDetails._id;
+            taskData.userName = userDetails.userName;
+            taskData.userEmail = userDetails.email;
+            taskData.planoId = planoDetails?._id;
+            if ( !req.body?.checkListName.toLowerCase().includes( 'rollout' ) ) {
               let planoProgress = req.body.checkListName == 'Fixture Verification' ? 50 : req.body.checkListName == 'VM Verification' ? 75 : 25;
               if ( req.body?.checkListName && req.body.checkListName == 'Layout Verification' ) {
                 await planoTaskService.deleteMany( { planoId: planoDetails?._id, floorId: taskData?.floorId } );
@@ -308,19 +319,17 @@ export async function createTask( req, res ) {
                 await planoTaskService.deleteMany( { planoId: planoDetails?._id, floorId: taskData?.floorId, type: type } );
               }
               await floorService.updateOne( { _id: taskData?.floorId }, { planoProgress } );
-              for ( let j=0; j<req.body.days; j++ ) {
-                let currDate = dayjs().add( j, 'day' );
-                let time = '12:00 AM';
-                if ( currDate.format( 'YYYY-MM-DD' ) == dayjs().format( 'YYYY-MM-DD' ) ) {
-                  time = dayjs().format( 'hh:mm A' );
-                }
-                let insertData = { ...taskData, date_string: currDate.format( 'YYYY-MM-DD' ), date_iso: new Date( currDate.format( 'YYYY-MM-DD' ) ), scheduleStartTime_iso: dayjs.utc( `${currDate.format( 'YYYY-MM-DD' )} ${time}`, 'YYYY-MM-DD hh:mm A' ).format() };
-                await processedService.updateOne( { date_string: currDate.format( 'YYYY-MM-DD' ), store_id: insertData.store_id, userEmail: insertData.userEmail, planoId: insertData.planoId, sourceCheckList_id: task._id, ...( taskData?.floorId ) ? { floorId: taskData.floorId }:{} }, insertData );
-              }
             }
+            // for ( let j=0; j<req.body.days; j++ ) {
+            let currDate = dayjs();
+            let time = dayjs().format( 'hh:mm A' );
+            let insertData = { ...taskData, date_string: currDate.format( 'YYYY-MM-DD' ), date_iso: new Date( currDate.format( 'YYYY-MM-DD' ) ), scheduleStartTime_iso: dayjs.utc( `${currDate.format( 'YYYY-MM-DD' )} ${time}`, 'YYYY-MM-DD hh:mm A' ).format() };
+            await processedService.updateOne( { date_string: currDate.format( 'YYYY-MM-DD' ), store_id: insertData.store_id, userEmail: insertData.userEmail, planoId: insertData.planoId, planoType: taskData.planoType, ...( taskData?.floorId ) ? { floorId: taskData.floorId }:{} }, insertData );
+            // }
           }
-        } ) );
+        }
       } ) );
+      // } ) );
       return res.sendSuccess( 'Task created successfully' );
     }
   } catch ( e ) {
@@ -528,13 +537,13 @@ export async function updateStatus( req, res ) {
       email: req.user.email,
       comment: req.body.comments,
     };
-    if ( req.body.status == 'inprogress' ) {
-      await processedService.updateOne( { planoId: taskDetails.planoId, userEmail: taskDetails.userEmail, store_id: taskDetails.store_id, ...( taskDetails?.floorId ) ? { floorId: taskDetails.floorId } : {}, date_iso: { $gt: new Date( dayjs().format( 'YYYY-MM-DD' ) ) } }, { checklistStatus: 'inprogress', startTime_string: timeString } );
-    }
+    // if ( req.body.status == 'inprogress' ) {
+    //   await processedService.updateOne( { planoId: taskDetails.planoId, userEmail: taskDetails.userEmail, store_id: taskDetails.store_id, ...( taskDetails?.floorId ) ? { floorId: taskDetails.floorId } : {}, date_iso: { $gt: new Date( dayjs().format( 'YYYY-MM-DD' ) ) } }, { checklistStatus: 'inprogress', startTime_string: timeString } );
+    // }
     await processedService.updateOne( { _id: req.body.taskId }, { checklistStatus: req.body.status, ...( req.body.status == 'inprogress' ) ? { startTime_string: timeString } : { submitTime_string: timeString }, comments: { $push: comments } } );
-    if ( req.body.status == 'submit' ) {
-      await processedService.deleteMany( { planoId: taskDetails.planoId, userEmail: taskDetails.userEmail, store_id: taskDetails.store_id, ...( taskDetails?.floorId ) ? { floorId: taskDetails.floorId } : {}, date_iso: { $gt: new Date( dayjs().format( 'YYYY-MM-DD' ) ) } } );
-    }
+    // if ( req.body.status == 'submit' ) {
+    //   await processedService.deleteMany( { planoId: taskDetails.planoId, userEmail: taskDetails.userEmail, store_id: taskDetails.store_id, ...( taskDetails?.floorId ) ? { floorId: taskDetails.floorId } : {}, date_iso: { $gt: new Date( dayjs().format( 'YYYY-MM-DD' ) ) } } );
+    // }
     let vmTask = await planoTaskService.find(
         {
           planoId: new mongoose.Types.ObjectId( taskDetails.planoId ),
@@ -1019,3 +1028,12 @@ export async function redoTask( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+
+export async function revokeTask( req, res ) {
+  try {
+    await processedService.deleteMany( { checklistName: req.body.checkListName, date_string: dayjs().format( 'YYYY-MM-DD' ), planoId: req.body.planoId, floorId: req.body.floorId } );
+  } catch ( e ) {
+    logger.error( { functionName: 'revokeTask', error: e } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/dtos/validation.dtos.js

@@ -110,6 +110,7 @@ export const updateFixtureSchema = joi.object( {
   status: joi.string().required(),
   fixtureCapacity: joi.number().required(),
   isBodyEnabled: joi.boolean().required(),
+  clientId: joi.string().required(),
 } );
 
 export const fixtureIdSchema = joi.object( {

package/src/routes/managePlano.routes.js

@@ -20,4 +20,5 @@ managePlanoRouter
     .post( '/getGlobalComment', isAllowedSessionHandler, managePlanoController.getGlobalComment )
     .post( '/createRevision', managePlanoController.createPlanoRevision )
     .post( '/getRevisions', managePlanoController.getAllPlanoRevisions )
-    .post( '/getRevisionData', managePlanoController.getPlanoRevisionById );
+    .post( '/getRevisionData', managePlanoController.getPlanoRevisionById )
+    .post( '/getRolloutFeedback', managePlanoController.getRolloutFeedback );

package/src/routes/storeBuilder.routes.js

@@ -51,4 +51,6 @@ storeBuilderRouter
 storeBuilderRouter
     .post( '/planoList', isAllowedSessionHandler, storeBuilderController.planoList )
     .get( '/taskDetails', isAllowedSessionHandler, storeBuilderController.getTaskDetails )
-    .get( '/getPlanoUser', isAllowedSessionHandler, storeBuilderController.getPlanoUser );
+    .get( '/getPlanoUser', isAllowedSessionHandler, storeBuilderController.getPlanoUser )
+    .post( '/planoRolloutList', isAllowedSessionHandler, storeBuilderController.getRolloutDetails )
+    .get( '/getRolloutTaskDetails', isAllowedSessionHandler, storeBuilderController.getRolloutTaskDetails );