tango-app-api-store-builder 1.0.0-beta-121 → 1.0.0-beta-123

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-121",
+    "version": "1.0.0-beta-123",
     "description": "storeBuilder",
     "main": "index.js",
     "type": "module",
@@ -33,7 +33,7 @@
         "selenium-webdriver": "^4.31.0",
         "sharp": "^0.34.1",
         "tango-api-schema": "2.2.155",
-        "tango-app-api-middleware": "^3.1.48",
+        "tango-app-api-middleware": "3.1.48",
         "url": "^0.11.4",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0",

package/src/controllers/managePlano.controller.js

@@ -458,7 +458,7 @@ export async function updateFixtureStatus( req, res ) {
       comment: req.body.comments,
     };
     console.log( comments );
-    // return;
+
     let updateResponse = await planoTaskService.updateOnefilters(
         { _id: new mongoose.Types.ObjectId( req.body._id ) },
         {
@@ -470,8 +470,29 @@ export async function updateFixtureStatus( req, res ) {
           { 'det._id': new mongoose.Types.ObjectId( req.body.DetailsId ) },
 
         ] );
+    if ( updateResponse&&updateResponse.answers.length>0 ) {
+      console.log( updateResponse.answers[0] );
+      let findissuse= updateResponse.answers[0].issues.filter( ( data ) => data._id==req.body.issueId );
+      console.log( findissuse );
+      let findDetails = findissuse[0].Details.filter( ( det ) => det.status==='pending' );
+      console.log( '======', findDetails.length );
+      if ( findDetails.length==0 ) {
+        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 ) },
+
+
+            ] );
+      }
+    }
+
     if ( req.body.taskType==='layout' ) {
-      let updatecomment = await planoTaskService.updateOnefilters(
+      await planoTaskService.updateOnefilters(
           { _id: new mongoose.Types.ObjectId( req.body._id ) },
           {
             $push: { 'answers.$[ans].issues.$[iss].Details.$[det].comments': comments },
@@ -482,9 +503,8 @@ export async function updateFixtureStatus( req, res ) {
             { 'det._id': new mongoose.Types.ObjectId( req.body.DetailsId ) },
 
           ] );
-      console.log( updatecomment );
     } else {
-      let updatecomment = await planoTaskService.updateOnefilters(
+      await planoTaskService.updateOnefilters(
           { _id: new mongoose.Types.ObjectId( req.body._id ) },
           {
             $push: { 'answers.$[ans].issues.$[iss].comments': comments },
@@ -493,9 +513,8 @@ export async function updateFixtureStatus( req, res ) {
             { 'ans._id': new mongoose.Types.ObjectId( req.body.answerId ) },
             { 'iss._id': new mongoose.Types.ObjectId( req.body.issueId ) },
           ] );
-      console.log( updatecomment );
     }
-    console.log( updateResponse );
+
 
     res.sendSuccess( 'updated successfully' );
   } catch ( e ) {

package/src/controllers/planoLibrary.controller.js

@@ -1326,8 +1326,10 @@ export async function getVmDetails( req, res ) {
     if ( !getVmDetails ) {
       return res.sendError( 'No data found', 204 );
     }
-    let templateDetails = await fixtureTemplateService.findOne( { 'vmConfig.vmId': { $in: req.query.vmId } } );
-    if ( templateDetails && getVmDetails.status != 'draft' ) {
+    getVmDetails = getVmDetails.toObject();
+    let templateDetails = await fixtureTemplateService.find( { 'vmConfig.vmId': { $in: req.query.vmId } } );
+    if ( templateDetails.length && getVmDetails.status != 'draft' ) {
+      getVmDetails.templateCount = templateDetails.length;
       getVmDetails.status = 'inactive';
     }
     let fixtureDetails = await storeFixtureService.find( { 'vmConfig.vmId': { $in: req.query.vmId } }, { planoId: 1 } );

package/src/controllers/script.controller.js

@@ -2323,9 +2323,9 @@ export async function updateVmData( req, res ) {
 
 // import https from 'https';
 // async function scrapeCrest() {
-//   const storeIds = [ 'LKST494' ];
+//   const storeIds = [ 'LKST3020' ];
 //   const apiUrl = 'https://api.getcrest.ai/api/ms_shelfsensei/layout/';
-//   const bearerToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzQ5NzkxNzUzLCJpYXQiOjE3NDk3ODgxNTMsImp0aSI6IjhmNDY4MTY0NTY5NTQ0YTU4OWJjMDU2NmU0ZGE0ZjI3IiwidXNlcl9pZCI6MTA4NSwiaWQiOjEwODUsImlzX21lZXNlZWtfYWNjb3VudCI6ZmFsc2UsImN1c3RvbWVyX2dyb3VwIjozOTgsImxpY2VuY2Vfc2NvcGVzIjpbeyJyZXNvdXJjZV9zZXQiOiJwcF9zZXQiLCJzY29wZV9yb2xlIjoiY29udHJpYnV0b3IifSx7InJlc291cmNlX3NldCI6ImRwX3NldCIsInNjb3BlX3JvbGUiOiJjb250cmlidXRvciJ9LHsicmVzb3VyY2Vfc2V0IjoiZGZfc2V0Iiwic2NvcGVfcm9sZSI6ImNvbnRyaWJ1dG9yIn0seyJyZXNvdXJjZV9zZXQiOiJkZWZhdWx0X3NldCIsInNjb3BlX3JvbGUiOiJjb250cmlidXRvciJ9XX0.wHQ2RPML7Jr6yE0V0mNvIrtUT8mFrvp7sBBtH6bhlSc';
+//   const bearerToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzUwMDU1OTMxLCJpYXQiOjE3NTAwNTIzMzEsImp0aSI6IjY5MGM1YTVhYjc3NDRlMmQ5YjlhMmZkYThhODM2MGYxIiwidXNlcl9pZCI6MTA4NSwiaWQiOjEwODUsImlzX21lZXNlZWtfYWNjb3VudCI6ZmFsc2UsImN1c3RvbWVyX2dyb3VwIjozOTgsImxpY2VuY2Vfc2NvcGVzIjpbeyJyZXNvdXJjZV9zZXQiOiJwcF9zZXQiLCJzY29wZV9yb2xlIjoiY29udHJpYnV0b3IifSx7InJlc291cmNlX3NldCI6ImRwX3NldCIsInNjb3BlX3JvbGUiOiJjb250cmlidXRvciJ9LHsicmVzb3VyY2Vfc2V0IjoiZGZfc2V0Iiwic2NvcGVfcm9sZSI6ImNvbnRyaWJ1dG9yIn0seyJyZXNvdXJjZV9zZXQiOiJkZWZhdWx0X3NldCIsInNjb3BlX3JvbGUiOiJjb250cmlidXRvciJ9XX0.juirYxGNCsCe75vwgL2AR9_LeFsr8r4cJmEdygRZGO0';
 //   const filePath = 'response.json';
 //   let allResults = [];
 

package/src/controllers/storeBuilder.controller.js

@@ -3124,6 +3124,7 @@ export async function storeFixturesTaskv2( req, res ) {
                       const vmDetails = await Promise.all( fixture.toObject()?.vmConfig?.map( async ( vm ) => {
                         totalVmCount += 1;
                         const vmInfo = await planoVmService.findOne( { _id: vm.vmId } );
+                        console.log( vmInfo?.toObject() );
                         return {
                           ...vm,
                           ...vmInfo?.toObject(),
@@ -3146,7 +3147,7 @@ export async function storeFixturesTaskv2( req, res ) {
                         disabled: req?.body?.redo ? disabled : false,
                         vmCount: vmCount,
                         shelfConfig: shelfDetails,
-                        vms: vmDetails,
+                        vmConfig: vmDetails,
                       };
                     } ),
                 );
@@ -3665,9 +3666,33 @@ export async function planoList( req, res ) {
 
     let planoList = await planoService.find( { clientId: req.body.clientId }, { _id: 1 } );
     let idList = planoList?.map( ( ele ) => new mongoose.Types.ObjectId( ele._id ) );
-    let planoTaskDetails = await planotaskService.find( { planoId: { $in: idList }, checklistStatus: 'submit' } );
-    idList = planoTaskDetails.map( ( ele ) => new mongoose.Types.ObjectId( ele.planoId ) );
     let taskQuery = [
+      {
+        $match: {
+          client_id: req.body.clientId,
+          planoId: { $in: idList },
+        },
+      },
+      {
+        $group: {
+          _id: '$planoType',
+          checklistStatus: { $last: '$checklistStatus' },
+          planoId: { $last: '$planoId' },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          checklistStatus: 1,
+          planoId: 1,
+        },
+      },
+    ];
+    let planoTaskDetails = await planotaskService.aggregate( taskQuery );
+    console.log( planoTaskDetails );
+    idList = planoTaskDetails.map( ( ele ) => new mongoose.Types.ObjectId( ele.planoId ) );
+    console.log( idList, 'list' );
+    taskQuery = [
       {
         $match: {
           planoId: { $in: idList },

package/src/controllers/task.controller.js

@@ -415,11 +415,12 @@ export async function uploadImage( req, res ) {
       return res.sendError( 'Please upload a file', 400 );
     }
     console.log( req.files );
+    console.log( req.files.file );
     let params = {
       Bucket: JSON.parse( process.env.BUCKET ).storeBuilder,
       Key: `${req.body.taskId}/${req.body.qno}/${Date.now()}/`,
       fileName: req.files.file.name,
-      ContentType: req.files.file.mimeType?req.files.file.mimeType:req.files.file.mimetype,
+      ContentType: req.files.file.mimeType&&req.files.file.mimeType!=undefined?req.files.file.mimeType:req.files.file.mimetype,
       body: req.files.file.data,
     };
     let fileRes = await fileUpload( params );
@@ -743,7 +744,7 @@ export async function generatetaskDetails( req, res ) {
           planoId: { $last: '$planoId' },
           taskId: { $push: '$_id' },
           checklistStatus: { $last: '$checklistStatus' },
-          date_string: { $push: '$date_string' },
+          date_string: { $last: '$date_string' },
         },
       },
       {
@@ -759,7 +760,6 @@ export async function generatetaskDetails( req, res ) {
       },
     ];
     let taskDetails = await processedService.aggregate( query );
-    console.log( taskDetails.flatMap( ( ele ) => ele.taskId ) );
     // ...( req.body.store.length ) ? { storeName: { $in: req.body.store } } : {}, taskId: { $in: taskDetails.flatMap( ( ele ) => ele.taskId ) } },
     let processedTaskDetails = await planoTaskService.find( { date_string: { $gte: req.body.fromDate, $lte: req.body.toDate }, type: 'layout' }, { status: 1, planoId: 1, date_string: 1, _id: 0, taskId: 1 } );
     console.log( processedTaskDetails.length );
@@ -777,8 +777,7 @@ export async function generatetaskDetails( req, res ) {
     } ) );
 
     processedTaskDetails.forEach( ( item ) => {
-      let taskIndex = taskDetails.findIndex( ( taskItem ) => taskItem.checklistStatus =='submit' && taskItem.date_string.includes( item.date_string ) && item.planoId.toString() == taskItem.planoId.toString() );
-      console.log( taskIndex, 'index' );
+      let taskIndex = taskDetails.findIndex( ( taskItem ) => taskItem.checklistStatus =='submit' && taskItem.date_string == item.date_string && item.planoId.toString() == taskItem.planoId.toString() );
       if ( taskIndex != -1 ) {
         taskDetails[taskIndex].storeStatus = item.status == 'complete' ? 'yes' : 'No';
       }
@@ -789,13 +788,14 @@ export async function generatetaskDetails( req, res ) {
     } );
 
 
-    let completeStore = taskDetails.filter( ( ele ) => ele.checklistStatus.includes( 'submit' ) );
+    let completeStore = taskDetails.filter( ( ele ) => ele.checklistStatus == 'submit' );
     completeStore = completeStore.reduce( ( acc, ele ) => {
       if ( !acc[ele.storeName] ) {
         acc[ele.storeName] = {
           storeName: ele.storeName,
           status: 'submit',
           storeStatus: ele.storeStatus,
+          date: ele.date_string,
         };
       }
       return acc;
@@ -804,15 +804,17 @@ export async function generatetaskDetails( req, res ) {
     completeStore = Object.values( completeStore );
 
     let completeStoreList =completeStore.map( ( item ) => item.storeName );
+    console.log( taskDetails );
 
-    let incompleteStore = taskDetails.filter( ( ele ) => !ele.checklistStatus.includes( 'submit' ) );
+    let incompleteStore = taskDetails.filter( ( ele ) => ele.checklistStatus != 'submit' );
 
     incompleteStore = incompleteStore.reduce( ( acc, ele ) => {
       if ( !acc[ele.storeName] ) {
         acc[ele.storeName] = {
           storeName: ele.storeName,
-          status: ele.checklistStatus[ele.checklistStatus.length - 1],
+          status: ele.checklistStatus,
           storeStatus: ele.storeStatus,
+          date: ele.date_string,
         };
       }
       return acc;