tango-app-api-store-builder 1.0.0-beta-146 → 1.0.0-beta-148

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-146",
+    "version": "1.0.0-beta-148",
     "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.2.190",
+        "tango-api-schema": "^2.2.191",
         "tango-app-api-middleware": "3.1.48",
         "url": "^0.11.4",
         "winston": "^3.17.0",

package/src/controllers/managePlano.controller.js

@@ -1,5 +1,5 @@
 import * as floorService from '../service/storeBuilder.service.js';
-import { logger } from 'tango-app-api-middleware';
+import { logger, insertOpenSearchData } from 'tango-app-api-middleware';
 // import * as storeService from '../service/store.service.js';
 import * as planoService from '../service/planogram.service.js';
 import * as storeFixtureService from '../service/storeFixture.service.js';
@@ -302,8 +302,6 @@ function buildPipelineByType( type, planoId, floorId, filterByStatus, filterByAp
               },
             },
           },
-
-
       );
     } else {
       pipeline.push(
@@ -679,12 +677,7 @@ export async function updateFixtureStatus( req, res ) {
     if ( vmTask.length>0 ) {
       let allTaskDone = vmTask.filter( ( data ) => data.status === 'incomplete' );
       if ( allTaskDone.length === 0 ) {
-        await planoService.updateOne(
-            {
-              _id: new mongoose.Types.ObjectId( req.body.planoId ),
-            },
-            { $set: { planoProgress: 100 } },
-        );
+        await floorService.updateOne( { _id: taskData?.floorId }, { planoProgress: 100 } );
       }
     }
     res.sendSuccess( 'updated successfully' );
@@ -814,7 +807,7 @@ export async function updateredostatus( req, res ) {
 
 export async function updateGlobalComment( req, res ) {
   try {
-    await planoGlobalCommentService.create( {
+    let payload ={
       userId: req.user._id,
       userName: req.user.userName,
       comment: req.body.comment,
@@ -823,7 +816,9 @@ export async function updateGlobalComment( req, res ) {
       floorId: new mongoose.Types.ObjectId( req.body.floorId ),
       taskType: req.body.taskType,
       clientId: req.body.clientId,
-    } );
+    };
+    await planoGlobalCommentService.create( payload );
+    await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).planoglobalcomments, payload );
 
     res.sendSuccess( 'updated successfully' );
   } catch ( e ) {
@@ -838,6 +833,8 @@ export async function getGlobalComment( req, res ) {
       floorId: new mongoose.Types.ObjectId( req.body.floorId ),
       taskType: req.body.taskType,
     } );
+
+
     res.sendSuccess( layoutComment );
   } catch ( e ) {
     logger.error( { functionName: 'getGlobalComment', error: e } );

package/src/controllers/storeBuilder.controller.js

@@ -2645,7 +2645,7 @@ export async function storeFixturesv2( req, res ) {
             { storeId: { $in: req.body.id } },
           ],
         },
-        { storeId: 1, storeName: 1, planoId: '$_id', productResolutionLevel: 1, scanType: 1, clientId: 1, validateShelfSections: 1, planoProgress: 1 },
+        { storeId: 1, storeName: 1, planoId: '$_id', productResolutionLevel: 1, scanType: 1, clientId: 1, validateShelfSections: 1 },
     );
 
     if ( !planograms?.length ) return res.sendError( 'No data found', 204 );
@@ -3267,12 +3267,12 @@ export async function planoList( req, res ) {
       {
         $lookup: {
           from: 'storefixtures',
-          let: { plano: '$_id' },
+          let: { floor: '$layout.id' },
           pipeline: [
             {
               $match: {
                 $expr: {
-                  $eq: [ '$planoId', '$$plano' ],
+                  $eq: [ '$floorId', '$$floor' ],
                 },
               },
             },
@@ -3367,19 +3367,6 @@ export async function planoList( req, res ) {
               },
             },
             { $sort: { _id: -1 } },
-            {
-              $group: {
-                _id: { floorId: '$floorId', type: '$type' },
-                doc: { $first: '$$ROOT' },
-              },
-            },
-            {
-              $project: {
-                type: '$_id.type',
-                floorId: '$_id.floorId',
-                answers: '$doc.answers',
-              },
-            },
             {
               $set: {
                 hasPendingIssues: {
@@ -3952,7 +3939,6 @@ export async function planoList( req, res ) {
     ];
 
     let pendingDetails = await planotaskService.aggregate( taskQuery );
-
     taskQuery = [
       {
         $match: {
@@ -4074,6 +4060,7 @@ export async function planoList( req, res ) {
     ];
 
     pendingDetails = await planoTaskComplianceService.aggregate( taskQuery );
+    // console.log( JSON.stringify( pendingDetails ) );
     let result = {
       data: planoDetails[0].data,
       count: planoDetails?.[0]?.count?.[0]?.total || 0,
@@ -4541,11 +4528,11 @@ export async function getTaskDetails( req, res ) {
 
     let taskInfo = await planotaskService.aggregate( query );
     let disabledInfo = [];
-    let floorDetails = await layoutService.findOne( { _id: req.query.floorId }, { isEdited: 1 } );
+    let floorDetails = await layoutService.findOne( { _id: req.query.floorId }, { isEdited: 1, planoProgress: 1 } );
     if ( floorDetails && !floorDetails?.isEdited ) {
       disabledInfo = taskInfo?.[0]?.taskStatus?.filter( ( ele ) => ( ( ele.feedbackStatus && ![ 'complete', 'disagree' ].includes( ele.feedbackStatus ) ) || ele.status != 'submit' ) && !ele?.breach );
     }
-    return res.sendSuccess( { taskDetails: taskInfo?.[0]?.taskStatus, disabled: disabledInfo?.length ? true : false } );
+    return res.sendSuccess( { taskDetails: taskInfo?.[0]?.taskStatus, disabled: disabledInfo?.length ? true : false, planoProgress: floorDetails?.planoProgress ?? 25 } );
   } catch ( e ) {
     logger.error( { functionName: 'getTaskDetails', error: e } );
     return res.sendError( e, 500 );

package/src/controllers/task.controller.js

@@ -306,7 +306,7 @@ export async function createTask( req, res ) {
                 let type = req.body.checkListName == 'Fixture Verification' ? 'fixture' :'vm';
                 await planoTaskService.deleteMany( { planoId: planoDetails?._id, floorId: taskData?.floorId, type: type } );
               }
-              await planoService.updateOne( { _id: planoDetails?._id }, { $set: { planoProgress } } );
+              await floorService.updateOne( { _id: taskData?.floorId }, { planoProgress } );
               for ( let j=0; j<req.body.days; j++ ) {
                 let currDate = dayjs().add( j, 'day' );
                 let time = '12:00 AM';
@@ -632,7 +632,20 @@ export async function updateAnswersv2( req, res ) {
     }
 
     await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).planotaskcompliances, data );
+    let vmTask = await planoTaskService.find(
+        {
+          planoId: new mongoose.Types.ObjectId( req.body.planoId ),
+          floorId: new mongoose.Types.ObjectId( req.body.floorId ),
+          type: 'vm',
+        },
 
+    );
+    if ( vmTask.length>0 ) {
+      let allTaskDone = vmTask.filter( ( data ) => data.status === 'incomplete' );
+      if ( allTaskDone.length === 0 ) {
+        await floorService.updateOne( { _id: taskData?.floorId }, { planoProgress: 100 } );
+      }
+    }
     return res.sendSuccess( 'Fixture details updated successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'updateAnswers', error: e } );