tango-app-api-store-builder 1.0.0-beta-211 → 1.0.0-beta-212

package/package.json

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

package/src/controllers/managePlano.controller.js

@@ -31,16 +31,32 @@ export async function getplanoFeedback( req, res ) {
 
           let data = await planoTaskService.aggregate( pipeline );
           if ( filterByApprovalStatus && filterByApprovalStatus !== '' ) {
-            data.forEach( ( element ) => {
-              element.answers?.forEach( ( ans ) => {
-                ans.issues = ans.issues?.filter(
-                    ( issue ) => issue.Details && issue.Details.length > 0,
+            if ( type == 'fixture' ) {
+              if ( filterByApprovalStatus == 'pending' ) {
+                data = data.filter( ( element ) => {
+                  return element?.approvalStatus == 'pending';
+                } );
+              } if ( filterByApprovalStatus == 'agree' ) {
+                data = data.filter( ( element ) => {
+                  return element?.answers?.[0]?.status == 'agree';
+                } );
+              } if ( filterByApprovalStatus == 'disagree' ) {
+                data = data.filter( ( element ) => {
+                  return element?.answers?.[0]?.status == 'disagree';
+                } );
+              }
+            } else {
+              data.forEach( ( element ) => {
+                element.answers?.forEach( ( ans ) => {
+                  ans.issues = ans.issues?.filter(
+                      ( issue ) => issue.Details && issue.Details.length > 0,
+                  );
+                } );
+                element.answers = element.answers?.filter(
+                    ( ans ) => ans.issues && ans.issues.length > 0,
                 );
               } );
-              element.answers = element.answers?.filter(
-                  ( ans ) => ans.issues && ans.issues.length > 0,
-              );
-            } );
+            }
             data = data.filter(
                 ( element ) => element.answers && element.answers.length > 0,
             );
@@ -960,6 +976,19 @@ export async function updateFixtureStatus( req, res ) {
           ] );
 
       await planoTaskService.updateOne( { _id: req.body._id }, { approvalStatus: 'approved' } );
+      let fixtureTask = await planoTaskService.find(
+          {
+            planoId: new mongoose.Types.ObjectId( req.body.planoId ),
+            floorId: new mongoose.Types.ObjectId( req.body.floorId ),
+            type: 'fixture',
+          },
+      );
+      if ( fixtureTask.length > 0 ) {
+        let allTaskDone = fixtureTask.filter( ( data ) => !data?.answers?.[0]?.status || data?.answers?.[0]?.status == 'disagree' );
+        if ( allTaskDone.length === 0 ) {
+          await floorService.updateOne( { _id: new mongoose.Types.ObjectId( req.body.floorId ) }, { planoProgress: 100 } );
+        }
+      }
     } else {
       let updateResponse = await planoTaskService.updateOnefilters(
           { _id: new mongoose.Types.ObjectId( req.body._id ) },

package/src/controllers/storeBuilder.controller.js

@@ -2811,12 +2811,12 @@ export async function storeFixturesv2( req, res ) {
                 const masterTemplateIds = new Set();
                 const layoutPolygonWithFixtures = await Promise.all(
                     floor.layoutPolygon.map( async ( element ) => {
-                        const fixtures = await storeFixtureService.findAndSort( {
+                      const fixtures = await storeFixtureService.findAndSort( {
                         floorId: floor._id,
                         associatedElementType: element.elementType,
                         associatedElementNumber: element.elementNumber,
                         fixtureType: { $ne: 'other' },
-                        }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
+                      }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
 
                       const fixturesWithStatus = await Promise.all(
                           fixtures.map( async ( fixture ) => {
@@ -2917,7 +2917,7 @@ export async function storeFixturesv2( req, res ) {
                   $and: [
                     { associatedElementType: { $exists: false } },
                     { associatedElementNumber: { $exists: false } },
-                    { fixtureType: { $ne: 'other' } }
+                    { fixtureType: { $ne: 'other' } },
                   ],
                 }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
 
@@ -3495,7 +3495,7 @@ export async function storeFixturesTaskv2( req, res ) {
                         floorId: floor._id,
                         associatedElementType: element.elementType,
                         associatedElementNumber: element.elementNumber,
-                        fixtureType: { $ne: 'other' }
+                        fixtureType: { $ne: 'other' },
                       }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
 
                       const fixturesWithStatus = await Promise.all(
@@ -3598,7 +3598,7 @@ export async function storeFixturesTaskv2( req, res ) {
                   $and: [
                     { associatedElementType: { $exists: false } },
                     { associatedElementNumber: { $exists: false } },
-                    { fixtureType: { $ne: 'other' } }
+                    { fixtureType: { $ne: 'other' } },
                   ],
                 }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
 
@@ -4864,6 +4864,7 @@ export async function getTaskDetails( req, res ) {
           isPlano: true,
           date_iso: { $lte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) },
           floorId: new mongoose.Types.ObjectId( req.query.floorId ),
+          planoType: { $in: [ 'layout', 'fixture', 'vm' ] },
         },
       },
       {
@@ -5301,9 +5302,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 } );
-    if ( floorDetails && !floorDetails?.isEdited ) {
-      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 );
     return res.sendSuccess( { taskDetails: taskInfo?.[0]?.taskStatus, disabled: disabledInfo?.length ? true : false, planoProgress: floorDetails?.planoProgress ?? 25 } );
   } catch ( e ) {
     logger.error( { functionName: 'getTaskDetails', error: e } );

package/src/controllers/task.controller.js

@@ -694,6 +694,7 @@ export async function updateAnswersv2( req, res ) {
       storeName: req.body?.storeName,
       storeId: req.body?.storeId,
       date_string: dayjs().format( 'YYYY-MM-DD' ),
+      approvalStatus: 'pending',
     };
     if ( req.body.type === 'layout' ) {
       await planoTaskService.updateOne( { planoId: req.body.planoId, taskType: req.body.taskType, floorId: req.body.floorId, fixtureId: req.body.fixtureId, type: req.body.type, ...( taskDetails?._id ) ? { taskId: taskDetails?._id } : {} }, data );