tango-app-api-store-builder 1.0.0-beta-127 → 1.0.0-beta-128

package/package.json

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

package/src/controllers/planoLibrary.controller.js

@@ -1329,16 +1329,18 @@ export async function getVmDetails( req, res ) {
     getVmDetails = getVmDetails.toObject();
     getVmDetails.templateCount = 0;
     let templateDetails = await fixtureTemplateService.find( { 'vmConfig.vmId': { $in: req.query.vmId } } );
-    if ( templateDetails.length && getVmDetails.status != 'draft' ) {
-      getVmDetails.templateCount = templateDetails.length;
+    if ( getVmDetails.status != 'draft' ) {
       getVmDetails.status = 'inactive';
-      let fixtureDetails = await storeFixtureService.find( { 'vmConfig.vmId': { $in: req.query.vmId } }, { planoId: 1 } );
-      if ( fixtureDetails.length ) {
-        let planoList = fixtureDetails.map( ( ele ) => ele.planoId );
-        let planoDetails = await planoService.find( { _id: { $in: planoList } }, { status: 1 } );
-        planoDetails = planoDetails.map( ( ele ) => ele.status );
-        if ( planoDetails.includes( 'completed' ) ) {
-          getVmDetails.status = 'active';
+      if ( templateDetails.length ) {
+        getVmDetails.templateCount = templateDetails.length;
+        let fixtureDetails = await storeFixtureService.find( { 'vmConfig.vmId': { $in: req.query.vmId } }, { planoId: 1 } );
+        if ( fixtureDetails.length ) {
+          let planoList = fixtureDetails.map( ( ele ) => ele.planoId );
+          let planoDetails = await planoService.find( { _id: { $in: planoList } }, { status: 1 } );
+          planoDetails = planoDetails.map( ( ele ) => ele.status );
+          if ( planoDetails.includes( 'completed' ) ) {
+            getVmDetails.status = 'active';
+          }
         }
       }
     }

package/src/controllers/storeBuilder.controller.js

@@ -3217,7 +3217,7 @@ export async function planoList( req, res ) {
       },
       {
         $group: {
-          _id: { store: '$storeName', type: '$planoType' },
+          _id: { store: '$storeName', floorId: '$floorId', type: '$planoType' },
           planoId: { $last: '$planoId' },
           checklistStatus: { $last: '$checklistStatus' },
           taskId: { $last: '$_id' },
@@ -3235,6 +3235,7 @@ export async function planoList( req, res ) {
           planoId: 1,
           checklistStatus: 1,
           taskId: 1,
+          floorId: '$_id.floorId',
         },
       },
     ];
@@ -3315,7 +3316,7 @@ export async function planoList( req, res ) {
             },
             {
               $group: {
-                _id: '$planoType',
+                _id: { type: '$planoType', floorId: '$floorId' },
                 dateString: { $last: '$date_string' },
                 checklistStatus: { $last: '$checklistStatus' },
                 taskId: { $last: '$_id' },
@@ -3326,9 +3327,10 @@ export async function planoList( req, res ) {
                 _id: null,
                 taskStatus: {
                   $push: {
-                    type: '$_id',
+                    type: '$_id.type',
                     status: '$checklistStatus',
                     date: '$dateString',
+                    floorId: '$_id.floorId',
                   },
                 },
                 taskIds: { $push: '$taskId' },
@@ -3360,7 +3362,7 @@ export async function planoList( req, res ) {
             { $sort: { _id: -1 } },
             {
               $group: {
-                _id: '$planoId',
+                _id: '$floorId',
                 layoutCount: {
                   $sum: {
                     $cond: {
@@ -3539,6 +3541,35 @@ export async function planoList( req, res ) {
                 },
               },
             },
+            {
+              $group: {
+                _id: null,
+                layoutCount: { $sum: '$layoutCount' },
+                fixtureCount: { $sum: '$fixtureCount' },
+                vmCount: { $sum: '$vmCount' },
+                completeLayout: {
+                  $sum: {
+                    $cond: {
+                      if: {
+                        $and: [
+                          { '$gt': [ '$layoutCount', 0 ] },
+                          { '$gt': [ '$layoutPending', 0 ] },
+                          { '$gt': [ '$fixtureCount', 0 ] },
+                          { '$gt': [ '$fixturePending', 0 ] },
+                          { '$gt': [ '$vmCount', 0 ] },
+                          { '$gt': [ '$fixturePending', 0 ] },
+                        ],
+                      },
+                      then: 1,
+                      else: 0,
+                    },
+                  },
+                },
+                layoutPending: { $sum: '$layoutPending' },
+                fixturePending: { $sum: '$fixturePending' },
+                vmPending: { $sum: '$vmPending' },
+              },
+            },
             {
               $project: {
                 _id: 0,
@@ -3636,6 +3667,7 @@ export async function planoList( req, res ) {
                 layoutCount: 1,
                 fixtureCount: 1,
                 vmCount: 1,
+                completeLayout: 1,
               },
             },
           ],

package/src/controllers/task.controller.js

@@ -290,17 +290,17 @@ export async function createTask( req, res ) {
               taskData.userName = userDetails.userName;
               taskData.userEmail = userDetails.email;
               taskData.planoId = planoDetails?._id;
-              for ( let i=0; i<req.body.days; i++ ) {
+              for ( let j=0; j<req.body.days; j++ ) {
                 let planoProgress = req.body.checkListName == 'Fixture Verification' ? 50 : req.body.checkListName == 'VM Verification' ? 75 : 25;
                 if ( req.body?.checkListName && req.body.checkListName == 'Layout Verification' ) {
-                  let taskIdList = await planoTaskService.find( { planoId: planoDetails?._id, floorId: floorDetails[i]._id } );
+                  let taskIdList = await planoTaskService.find( { planoId: planoDetails?._id, floorId: taskData.floorId } );
                   taskIdList = taskIdList.map( ( ele ) => ele.taskId );
-                  await planoTaskService.deleteMany( { planoId: planoDetails?._id, floorId: floorDetails[i]._id } );
+                  await planoTaskService.deleteMany( { planoId: planoDetails?._id, floorId: taskData.floorId } );
                   planoProgress = 25;
                   await processedService.deleteMany( { _id: taskIdList } );
                 }
                 await planoService.updateOne( { _id: planoDetails?._id }, { $set: { planoProgress } } );
-                let currDate = dayjs().add( i, 'day' );
+                let currDate = dayjs().add( j, 'day' );
                 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' )} 12:00 AM`, '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 );
               }