tango-app-api-store-builder 1.0.0-beta-213 → 1.0.0-beta-214

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-213",
+    "version": "1.0.0-beta-214",
     "description": "storeBuilder",
     "main": "index.js",
     "type": "module",

package/src/controllers/managePlano.controller.js

@@ -1464,6 +1464,9 @@ export async function updateStoreFixture( req, res ) {
           },
       );
     }
+    if ( req.body?.editMode ) {
+      await floorService.updateOne( { _id: new mongoose.Types.ObjectId( currentFixture.floorId ) }, { isEdited: true } );
+    }
     res.sendSuccess( 'Updated Successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'updateStoreFixture', error: e } );

package/src/controllers/storeBuilder.controller.js

@@ -4606,7 +4606,7 @@ export async function planoList( req, res ) {
         } );
       }
       if ( inputData.filter.status.includes( 'completed' ) ) {
-        let taskType= [ 'layout', 'fixture', 'vm' ];
+        let taskType= [ 'fixture' ];
         let andCondition = [];
         taskType.forEach( ( type ) => {
           andCondition.push(
@@ -4617,7 +4617,7 @@ export async function planoList( req, res ) {
                 },
               } },
               {
-                [`taskDetails.${type}Status`]: '',
+                [`taskDetails.${type}Status`]: 'complete',
               },
           );
         } );
@@ -4890,6 +4890,7 @@ export async function getTaskDetails( req, res ) {
               floorId: '$_id.floorId',
               redoStatus: '$redoStatus',
               endTime: '$scheduleEndTime_iso',
+              taskId: '$taskId',
               breach: {
                 $cond: {
                   if: {
@@ -5274,6 +5275,7 @@ export async function getTaskDetails( req, res ) {
                 redoStatus: '$$task.redoStatus',
                 endTime: '$$task.endTime',
                 breach: '$$task.breach',
+                taskId: '$$task.taskId',
                 feedbackStatus: {
                   $switch: {
                     branches: [
@@ -5304,7 +5306,7 @@ export async function getTaskDetails( req, res ) {
     let taskInfo = await planotaskService.aggregate( query );
     let disabledInfo = [];
     let floorDetails = await layoutService.findOne( { _id: req.query.floorId }, { isEdited: 1, planoProgress: 1 } );
-    disabledInfo = taskInfo?.[0]?.taskStatus?.filter( ( ele ) => ( ( ele.feedbackStatus && ![ 'complete', 'disagree' ].includes( ele.feedbackStatus ) ) || ele.status != 'submit' ) && !ele?.breach );
+    disabledInfo = taskInfo?.[0]?.taskStatus?.filter( ( ele ) => ( ele.feedbackStatus && ![ 'complete', 'disagree' ].includes( ele.feedbackStatus ) ) || ( ele.status != 'submit' && !ele?.breach ) );
     if ( floorDetails.isEdited ) {
       let findPending = taskInfo?.[0]?.taskStatus?.findIndex( ( ele ) => ele.type == 'fixture' && ele.feedbackStatus == 'pending' );
       if ( findPending != -1 ) {

package/src/controllers/task.controller.js

@@ -1113,7 +1113,7 @@ export async function revokeTask( req, res ) {
     if ( !req.body.floorId ) {
       return res.sendError( 'floor id is required', 400 );
     }
-    await processedService.deleteMany( { planoId: req.body.planoId, floorId: req.body.floorId, checklistStatus: { $ne: 'submit' }, ...( req.body?.type && { planoType: req.body?.type } ) } );
+    await processedService.deleteMany( { planoId: req.body.planoId, floorId: req.body.floorId, ...( req.body?.type != 'fixture' && { checklistStatus: { $ne: 'submit' } } ), ...( req.body?.type && { planoType: req.body?.type } ) } );
     return res.sendSuccess( 'Task revoked successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'revokeTask', error: e } );