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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-180",
+    "version": "1.0.0-beta-182",
     "description": "storeBuilder",
     "main": "index.js",
     "type": "module",
@@ -32,7 +32,7 @@
         "path": "^0.12.7",
         "selenium-webdriver": "^4.31.0",
         "sharp": "^0.34.1",
-        "tango-api-schema": "^2.3.12",
+        "tango-api-schema": "^2.3.19",
         "tango-app-api-middleware": "3.1.48",
         "url": "^0.11.4",
         "winston": "^3.17.0",

package/src/controllers/fixtureTemplate.controller.js

@@ -152,12 +152,13 @@ export async function getTemplateDetails( req, res ) {
         return vm;
       }
     } ) );
+    templateDetails.status = templateDetails.status == 'draft' ? 'draft' : 'inactive';
     let storeFixtureDetails = await storeFixtureService.find( { fixtureConfigId: req.query.templateId } );
     if ( storeFixtureDetails.length ) {
       let fixtureId = storeFixtureDetails.map( ( ele ) => ele.planoId );
       let planoDetails = await planoService.find( { _id: { $in: fixtureId } }, { status: 1 } );
       planoDetails = planoDetails.map( ( ele ) => ele.status );
-      templateDetails.status = planoDetails.includes( 'completed' ) ? 'active' : 'inactive';
+      templateDetails.status = planoDetails.includes( 'completed' ) ? 'active' : templateDetails.status;
     }
     let data = {
       ...templateDetails,

package/src/controllers/managePlano.controller.js

@@ -922,6 +922,7 @@ export async function updateGlobalComment( req, res ) {
       floorId: new mongoose.Types.ObjectId( req.body.floorId ),
       taskType: req.body.taskType,
       clientId: req.body.clientId,
+      taskId: req.body.taskId,
     };
     await planoGlobalCommentService.create( payload );
     await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).planoglobalcomments, payload );
@@ -1143,6 +1144,31 @@ function pipelineStage( type, planoId, floorId, filterByStatus, filterByApproval
     },
   };
 
+  let commandLookup = {
+    $lookup: {
+      from: 'planoglobalcomments',
+      let: { taskId: '$_id' },
+      pipeline: [
+        {
+          $match: {
+            $expr: {
+              $eq: [ '$taskId', '$$taskId' ],
+            },
+          },
+        },
+
+      ],
+      as: 'commentData',
+    },
+  };
+
+  let unwindCommenTask = {
+    $unwind: {
+      path: '$commentData',
+      preserveNullAndEmptyArrays: true,
+    },
+  };
+
 
   const commonLookups = type === 'layout' ? [] : [
     {
@@ -1287,6 +1313,7 @@ function pipelineStage( type, planoId, floorId, filterByStatus, filterByApproval
             ],
           },
         },
+        'comments': { $first: '$commentData' },
       },
     },
   ];
@@ -1294,6 +1321,8 @@ function pipelineStage( type, planoId, floorId, filterByStatus, filterByApproval
     ...matchStage,
     taskLookup,
     unwindTask,
+    commandLookup,
+    unwindCommenTask,
     ...commonLookups,
     ...vmStages,
     ...finalGrouping,

package/src/controllers/task.controller.js

@@ -135,6 +135,7 @@ export async function createTask( req, res ) {
           scheduleEndTime_iso: dayjs.utc( scheduleEndTime, 'hh:mm A' ).format(),
           date_string: dayjs().format( 'YYYY-MM-DD' ),
           date_iso: new Date( dayjs().format( 'YYYY-MM-DD' ) ),
+          refTaskId: req.body.taskId,
         },
       };
 
@@ -151,6 +152,7 @@ export async function createTask( req, res ) {
       // if ( !taskDetails.length ) {
       //   return res.sendError( 'No data found', 204 );
       // }
+      let response;
       let userDetails;
       let storeList;
       let endDate;
@@ -342,13 +344,13 @@ export async function createTask( req, res ) {
             // let currDate = dayjs().add( j, 'days' );
             // let time = j ? '12:00 AM' : currDate.format( 'hh:mm A' );
             let insertData = { ...taskData };
-            await processedService.updateOne( { store_id: insertData.store_id, userEmail: insertData.userEmail, planoId: insertData.planoId, planoType: taskData.planoType, ...( taskData?.floorId ) ? { floorId: taskData.floorId }:{}, ...( [ 'merchRollout', 'vmRollout' ].includes( taskData.planoType ) && { sourceCheckList_id: taskData.sourceCheckList_id } ) }, insertData );
+            response = await processedService.updateOne( { store_id: insertData.store_id, userEmail: insertData.userEmail, planoId: insertData.planoId, planoType: taskData.planoType, ...( taskData?.floorId ) ? { floorId: taskData.floorId }:{}, ...( [ 'merchRollout', 'vmRollout' ].includes( taskData.planoType ) && { sourceCheckList_id: taskData.sourceCheckList_id } ) }, insertData );
             // }
           }
         }
       } ) );
       // } ) );
-      return res.sendSuccess( 'Task created successfully' );
+      return res.sendSuccess( { message: 'Task created successfully', taskId: response?.upsertedId } );
     }
   } catch ( e ) {
     console.log( e );