tango-app-api-store-builder 1.0.0-beta-182 → 1.0.0-beta-184

package/package.json

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

package/src/controllers/fixtureTemplate.controller.js

@@ -72,7 +72,7 @@ export async function updateTemplate( req, res ) {
     if ( !templateDetails ) {
       return res.sendError( 'No data found', 204 );
     }
-    let checkName = await fixtureConfigService.find( { _id: { $nin: req.params.templateId }, fixtureName: inputData.fixtureName } );
+    let checkName = await fixtureConfigService.findOne( { _id: { $ne: req.params.templateId }, fixtureName: inputData.fixtureName } );
     if ( checkName ) {
       return res.sendError( 'Fixture name already exist', 400 );
     }

package/src/controllers/managePlano.controller.js

@@ -1022,6 +1022,12 @@ export async function getRolloutFeedback( req, res ) {
     const filterByApprovalStatus = req.body.filterByApprovalStatus || '';
     const resultMap = {};
     const commentMap = {};
+    if ( req.body.redo ) {
+      let taskDetails = await planoTaskService.findOne( { taskId: req.body.taskId, fixtureId: req.body.fixtureId } );
+      if ( !taskDetails ) {
+        req.body.taskId = req.body.refTaskId;
+      }
+    }
     await Promise.all(
         taskTypes.map( async ( type, index ) => {
           const pipeline = buildPipelineByType( type, req.body.planoId, req.body.floorId, filterByStatus, filterByApprovalStatus, req.body.showtask, req.body.taskId );
@@ -1088,6 +1094,50 @@ export async function getRolloutFeedbackv2( req, res ) {
       merchRolloutComment: commentMap['merchRollout'] || [],
       vmRolloutComment: commentMap['vmRollout'] || [],
     };
+    if ( filterByStatus.length || filterByApprovalStatus ) {
+      let data = response[`${req.body.type}RolloutData`].filter( ( ele ) => ele.storeFixtureList.length );
+      if ( filterByStatus.length == 1 ) {
+        data = data.filter( ( type ) => {
+          let fixtureList = type.storeFixtureList.filter( ( ele ) => filterByStatus.includes( ele.status ) );
+          if ( filterByStatus.includes( 'complete' ) ) {
+            return type.storeFixtureList.length == fixtureList.length;
+          } else {
+            return fixtureList.length;
+          }
+        },
+        );
+      }
+      if ( filterByApprovalStatus ) {
+        if ( filterByApprovalStatus === 'pending' ) {
+          data = data.filter( ( type ) => {
+            let fixtureList = type.storeFixtureList.filter( ( ele ) => {
+              if ( ele.status === 'complete' && !ele.answers?.[0]?.issues.length && !ele.answers?.[0]?.status ) {
+                return true;
+              } else {
+                return ele.answers?.some( ( ans ) =>
+                  ans.issues?.some( ( issue ) =>
+                    issue?.Details?.some( ( detail ) => detail.status === 'pending' ),
+                  ),
+                );
+              }
+            } );
+
+            return fixtureList.length;
+          } );
+        }
+      }
+      response[`${req.body.type}RolloutData`] = data;
+    }
+    response.vmRolloutData = await Promise.all( response.vmRolloutData.map( async ( ele ) => {
+      ele.storeFixtureList = await Promise.all( ele.storeFixtureList.map( async ( fixt ) => {
+        fixt.FixtureData.vmConfig = await Promise.all( fixt.FixtureData.vmConfig.map( async ( config ) => {
+          let vmDetails = await planoVmService.findOne( { _id: config.vmId }, { vmType: 1, vmName: 1 } );
+          return { ...config, vmType: vmDetails.vmType, vmName: vmDetails.vmName };
+        } ) );
+        return fixt;
+      } ) );
+      return ele;
+    } ) );
     res.sendSuccess( response );
   } catch ( e ) {
     logger.error( { functionName: 'getRolloutFeedbackv2', error: e } );
@@ -1128,11 +1178,12 @@ function pipelineStage( type, planoId, floorId, filterByStatus, filterByApproval
         {
           $match: {
             $expr: {
-              $eq: [ '$taskId', '$$taskId' ],
+              $and: [
+                { $eq: [ '$taskId', '$$taskId' ] },
+              ],
             },
           },
         },
-
       ],
       as: 'planoData',
     },
@@ -1162,13 +1213,6 @@ function pipelineStage( type, planoId, floorId, filterByStatus, filterByApproval
     },
   };
 
-  let unwindCommenTask = {
-    $unwind: {
-      path: '$commentData',
-      preserveNullAndEmptyArrays: true,
-    },
-  };
-
 
   const commonLookups = type === 'layout' ? [] : [
     {
@@ -1206,55 +1250,6 @@ function pipelineStage( type, planoId, floorId, filterByStatus, filterByApproval
     },
   ];
 
-  const vmStages = [ 'vm', 'vmRollout' ].includes( type ) ? [
-    {
-      $unwind: { path: '$FixtureData.vmConfig', preserveNullAndEmptyArrays: true },
-    },
-    {
-      $lookup: {
-        from: 'planovmdetails',
-        let: { vmId: '$FixtureData.vmConfig.vmId' },
-        pipeline: [
-          {
-            $match: { $expr: { $eq: [ '$_id', '$$vmId' ] } },
-          },
-          {
-            $project: { vmName: 1, vmType: 1 },
-          },
-        ],
-        as: 'vmDetails',
-      },
-    },
-    {
-      $unwind: { path: '$vmDetails', preserveNullAndEmptyArrays: true },
-    },
-    {
-      $set: {
-        'FixtureData.vmConfig.vmName': '$vmDetails.vmName',
-        'FixtureData.vmConfig.vmType': '$vmDetails.vmType',
-      },
-    },
-    {
-      $group: {
-        _id: {
-          taskId: '$taskId',
-          fixtureId: '$FixtureData._id',
-        },
-        rootDoc: { $first: '$$ROOT' },
-        vmConfigs: { $push: '$FixtureData.vmConfig' },
-      },
-    },
-    {
-      $addFields: {
-        'rootDoc.FixtureData.vmConfig': '$vmConfigs',
-      },
-    },
-    {
-      $replaceRoot: { newRoot: '$rootDoc' },
-    },
-
-
-  ] : [];
   let finalGrouping = [
     {
       $group: {
@@ -1322,9 +1317,9 @@ function pipelineStage( type, planoId, floorId, filterByStatus, filterByApproval
     taskLookup,
     unwindTask,
     commandLookup,
-    unwindCommenTask,
+    // unwindCommenTask,
     ...commonLookups,
-    ...vmStages,
+    // ...vmStages,
     ...finalGrouping,
     { $sort: { _id: 1 } },
   ];

package/src/controllers/task.controller.js

@@ -142,8 +142,8 @@ export async function createTask( req, res ) {
       delete payload._id;
       delete payload.createdAt;
       delete payload.updatedAt;
-      await processedService.create( payload );
-      return res.sendSuccess( 'Task redo triggered successfully' );
+      let response = await processedService.create( payload );
+      return res.sendSuccess( { message: 'Task redo triggered successfully', taskId: response?._id } );
     } else {
       if ( !req.body?.checkListName ) {
         return res.sendError( 'ChecklistName is required', 400 );