tango-app-api-store-builder 1.0.0-beta-115 → 1.0.0-beta-117

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-115",
+    "version": "1.0.0-beta-117",
     "description": "storeBuilder",
     "main": "index.js",
     "type": "module",
@@ -32,7 +32,7 @@
         "path": "^0.12.7",
         "selenium-webdriver": "^4.31.0",
         "sharp": "^0.34.1",
-        "tango-api-schema": "2.2.153",
+        "tango-api-schema": "2.2.154",
         "tango-app-api-middleware": "^3.1.48",
         "url": "^0.11.4",
         "winston": "^3.17.0",

package/src/controllers/storeBuilder.controller.js

@@ -3129,11 +3129,20 @@ export async function storeFixturesTaskv2( req, res ) {
                         };
                       } ) );
 
+                      let disabled = true;
+                      if ( compliance?.status && compliance.status == 'incomplete' ) {
+                        let issueDetails = compliance?.answers?.[0]?.issues.find( ( ele ) => ele.status == 'disagree' );
+                        if ( issueDetails ) {
+                          disabled = false;
+                        }
+                      }
+
                       return {
                         ...fixture.toObject(),
                         status: compliance?.status ? compliance.status : '',
                         shelfCount: shelves.shelves,
                         productCount: productCount,
+                        disabled: disabled,
                         vmCount: vmCount,
                         shelfConfig: shelfDetails,
                         vms: vmDetails,
@@ -3247,6 +3256,8 @@ export async function planoList( req, res ) {
           fixtureCapacity: '$fixtureDetails.fixtureCapacity',
           status: 1,
           planoProgress: 1,
+          createdAt: 1,
+          lastUpdate: '$updatedAt',
         },
       },
     ];
@@ -3272,7 +3283,6 @@ export async function planoList( req, res ) {
         ],
       },
     } );
-
     let planoDetails = await planoService.aggregate( query );
 
     if ( !planoDetails[0].data.length ) {

package/src/controllers/task.controller.js

@@ -458,8 +458,14 @@ export async function updateStatus( req, res ) {
     } else {
       currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
     }
-    let submitTimeString = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
-    await processedService.updateOne( { _id: req.body.taskId }, { checklistStatus: req.body.status, ...( req.body.status == 'inprogress' ) ? { startTime_string: submitTimeString } : { submitTime_string: submitTimeString } } );
+    let timeString = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
+    let comments = {
+      userId: req.user._id,
+      userName: req.user.Name,
+      email: req.user.email,
+      comment: req.body.comments,
+    };
+    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' ) ) } } );
     }
@@ -895,3 +901,20 @@ export async function taskSubmitDetails( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+
+export async function redoTask( req, res ) {
+  try {
+    if ( !req.body.taskId ) {
+      return res.sendError( 'Task id is required', 400 );
+    }
+    let getTaskDetails = await processedService.findOne( { _id: req.body.taskId } );
+    if ( !getTaskDetails ) {
+      return res.sendError( e, 204 );
+    }
+    await processedService.updateOne( { _id: req.body.taskId }, { checklistStatus: 'open', redoStatus: true } );
+    return res.sendSuccess( 'Task is republished successfully' );
+  } catch ( e ) {
+    logger.error( { functionName: 'redoTask', error: e } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/dtos/validation.dtos.js

@@ -201,7 +201,7 @@ export const updateTaskConfig = {
 export const uploadBrandListSchema = joi.object( {
   clientId: joi.string().required(),
   brandData: joi.array().items( joi.any() ).min( 1 ).required(),
-  brandUsedList:joi.array().items(joi.any()).min(0)
+  brandUsedList: joi.array().items( joi.any() ).min( 0 ),
 } );
 
 export const uploadBrandList = {

package/src/routes/task.routes.js

@@ -15,4 +15,5 @@ storeBuilderTaskRouter
     .get( '/getFixtureDetails', isAllowedSessionHandler, taskController.getFixtureDetails )
     .get( '/getVmDetails', isAllowedSessionHandler, taskController.getVmDetails )
     .post( '/generateTaskExcel', taskController.generatetaskDetails )
-    .post( '/getSubmitDetails', taskController.taskSubmitDetails );
+    .post( '/getSubmitDetails', taskController.taskSubmitDetails )
+    .post( '/redoTask', isAllowedSessionHandler, taskController.redoTask );