tango-app-api-store-builder 1.0.0-beta-160 → 1.0.0-beta-162

package/package.json

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

package/src/controllers/managePlano.controller.js

@@ -167,7 +167,7 @@ function buildPipelineByType( type, planoId, floorId, filterByStatus, filterByAp
     },
   ];
 
-  const vmStages = type === 'vm' ? [
+  const vmStages = [ 'vm', 'vmRollout' ].includes( type ) ? [
     {
       $unwind: { path: '$FixtureData.vmConfig', preserveNullAndEmptyArrays: true },
     },
@@ -180,7 +180,7 @@ function buildPipelineByType( type, planoId, floorId, filterByStatus, filterByAp
             $match: { $expr: { $eq: [ '$_id', '$$vmId' ] } },
           },
           {
-            $project: { vmName: 1 },
+            $project: { vmName: 1, vmType: 1 },
           },
         ],
         as: 'vmDetails',
@@ -192,6 +192,7 @@ function buildPipelineByType( type, planoId, floorId, filterByStatus, filterByAp
     {
       $set: {
         'FixtureData.vmConfig.vmName': '$vmDetails.vmName',
+        'FixtureData.vmConfig.vmType': '$vmDetails.vmType',
       },
     },
     {
@@ -647,6 +648,78 @@ export async function updateFixtureStatus( req, res ) {
   }
 }
 
+export async function updateRolloutStatus( req, res ) {
+  try {
+    let comments = {
+      userId: req.user._id,
+      userName: req.user.userName,
+      role: req.user.role,
+      responsetype: req.body.type,
+      comment: req.body.comments,
+    };
+
+    let updateResponse = await planoTaskService.updateOnefilters(
+        { _id: new mongoose.Types.ObjectId( req.body._id ) },
+        {
+          $set: { 'answers.$[ans].issues.$[iss].Details.$[det].status': req.body.type },
+        },
+        [
+          { 'ans._id': new mongoose.Types.ObjectId( req.body.answerId ) },
+          { 'iss._id': new mongoose.Types.ObjectId( req.body.issueId ) },
+          { 'det._id': new mongoose.Types.ObjectId( req.body.DetailsId ) },
+
+        ] );
+    if ( updateResponse && updateResponse.answers.length > 0 ) {
+      let findissuse = updateResponse.answers[0].issues.filter( ( data ) => data._id == req.body.issueId );
+      let findDetails = findissuse[0].Details.filter( ( det ) => det.status === 'agree' );
+      if ( findissuse[0].Details.length === findDetails.length ) {
+        await planoTaskService.updateOnefilters(
+            { _id: new mongoose.Types.ObjectId( req.body._id ) },
+            {
+              $set: { 'answers.$[ans].issues.$[iss].status': 'completed' },
+            },
+            [
+              { 'ans._id': new mongoose.Types.ObjectId( req.body.answerId ) },
+              { 'iss._id': new mongoose.Types.ObjectId( req.body.issueId ) },
+            ] );
+      }
+      let findoneplanoData = await planoTaskService.findOne( { _id: new mongoose.Types.ObjectId( req.body._id ) } );
+      let totalApproved = findoneplanoData.answers[0].issues.filter( ( data ) => data.status === 'pending' );
+      if ( totalApproved.length === 0 ) {
+        await planoTaskService.updateOne(
+            {
+              _id: new mongoose.Types.ObjectId( req.body._id ),
+            },
+            {
+              'status': 'complete',
+            },
+        );
+        let data = {};
+        if ( req.body.type == 'vmRollout' ) {
+          data['isVmEdited'] = false;
+        } else {
+          data['isMerchEdited'] = false;
+        }
+        await storeFixtureService.updateOne( { _id: updateResponse.fixtureId }, data );
+      }
+    }
+    await planoTaskService.updateOnefilters(
+        { _id: new mongoose.Types.ObjectId( req.body._id ) },
+        {
+          $push: { 'answers.$[ans].issues.$[iss].comments': comments },
+        },
+        [
+          { 'ans._id': new mongoose.Types.ObjectId( req.body.answerId ) },
+          { 'iss._id': new mongoose.Types.ObjectId( req.body.issueId ) },
+        ] );
+    res.sendSuccess( 'updated successfully' );
+  } catch ( e ) {
+    logger.error( { functionName: 'updateFixtureStatus', error: e } );
+    return res.sendError( e, 500 );
+  }
+}
+
+
 export async function updateStoreFixture( req, res ) {
   try {
     const { fixtureId, data } = req.body;

package/src/controllers/task.controller.js

@@ -15,7 +15,7 @@ import * as floorService from '../service/storeBuilder.service.js';
 import * as planoStaticService from '../service/planoStaticData.service.js';
 import * as assignService from '../service/assignService.service.js';
 import * as storeBuilderService from '../service/storeBuilder.service.js';
-import * as commentsService from '../service/planoGlobalComment.service.js';
+import * as storeFixtureService from '../service/storeFixture.service.js';
 
 
 dayjs.extend( timeZone );
@@ -669,6 +669,11 @@ export async function updateAnswersv2( req, res ) {
       await sendMessageToQueue( `${sqs.url}${sqs.storeBuilder}`, JSON.stringify( sqsData ) );
     }
 
+    if ( data.status == 'complete' && [ 'merchRollout', 'vmRollout' ].includes( data.type ) ) {
+      let query = data.type == 'merchRollout' ? { isMerchEdited: false } : { isVmEdited: false };
+      await storeFixtureService.updateOne( { _id: req.body.fixtureId }, query );
+    }
+
     return res.sendSuccess( 'Fixture details updated successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'updateAnswers', error: e } );
@@ -1032,11 +1037,11 @@ export async function redoTask( req, res ) {
 
 export async function revokeTask( req, res ) {
   try {
-    if(!req.body.taskId) {
-      return res.sendError('Checklist type is required',400)
+    if ( !req.body.taskId ) {
+      return res.sendError( 'Checklist type is required', 400 );
     }
-    await processedService.deleteMany( { _id:req.body.taskId } );
-    return res.sendSuccess('Task revoked successfully');
+    await processedService.deleteMany( { _id: req.body.taskId } );
+    return res.sendSuccess( 'Task revoked successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'revokeTask', error: e } );
     return res.sendError( e, 500 );

package/src/routes/managePlano.routes.js

@@ -21,4 +21,5 @@ managePlanoRouter
     .post( '/createRevision', managePlanoController.createPlanoRevision )
     .post( '/getRevisions', managePlanoController.getAllPlanoRevisions )
     .post( '/getRevisionData', managePlanoController.getPlanoRevisionById )
-    .post( '/getRolloutFeedback', managePlanoController.getRolloutFeedback );
+    .post( '/getRolloutFeedback', managePlanoController.getRolloutFeedback )
+    .post( '/updateRolloutStatus', isAllowedSessionHandler, managePlanoController.updateRolloutStatus );

package/src/service/storeFixture.service.js

@@ -21,7 +21,6 @@ export async function updateOne( query, record ) {
 }
 
 export async function updateMany( query, record ) {
-  console.log( record, 'record' );
   return model.storeFixtureModel.updateMany( query, { $set: record } );
 }