tango-app-api-store-builder 1.0.0-beta-124 → 1.0.0-beta-126

package/package.json

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

package/src/controllers/managePlano.controller.js

@@ -53,6 +53,7 @@ export async function getplanoFeedback( req, res ) {
       },
 
     }, { $unwind: { path: '$taskData', preserveNullAndEmptyArrays: true } },
+    { $sort: { _id: -1 } },
     );
 
 
@@ -485,10 +486,22 @@ export async function updateFixtureStatus( req, res ) {
             [
               { '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 ) } );
+      console.log( '************', findoneplanoData.answers[0].issues );
+      let totalApproved= findoneplanoData.answers[0].issues.filter( ( data ) => data.status==='pending' );
+      console.log( '---------->', totalApproved.length );
+      if ( totalApproved.length===0 ) {
+        await planoTaskService.updateOne(
+            {
+              _id: new mongoose.Types.ObjectId( req.body._id ),
+            },
+            {
+              'status': 'complete',
+            },
+        );
+      }
     }
 
     if ( req.body.taskType==='layout' ) {
@@ -556,7 +569,7 @@ export async function updateStoreFixture( req, res ) {
       currentFixtureDoc = {
         ...currentFixtureDoc,
         ...newTemplate.toObject(),
-        fixtureConfigDoc: newTemplate.toObject()._id,
+        fixtureConfigId: newTemplate.toObject()._id,
         productBrandName: [ ...productBrandName ],
         productCategory: [ ...productCategory ],
         productSubCategory: [ ...productSubCategory ],
@@ -602,3 +615,40 @@ export async function updateStoreFixture( req, res ) {
   }
 }
 
+export async function updateredostatus( req, res ) {
+  try {
+    console.log( '------->', req.body );
+    if ( req.body.type==='layout' ) {
+      await planoTaskService.updateOne(
+          {
+            planoId: new mongoose.Types.ObjectId( req.body.planoId ),
+            floorId: new mongoose.Types.ObjectId( req.body.floorId ),
+            type: req.body.type,
+          },
+          {
+            'answers.$[].issues.$[].status': 'completed',
+            'answers.$[].issues.$[].Details.$[].status': 'agree',
+            'status': 'complete',
+          },
+      );
+    } else {
+      await planoTaskService.updateOne(
+          {
+            planoId: new mongoose.Types.ObjectId( req.body.planoId ),
+            floorId: new mongoose.Types.ObjectId( req.body.floorId ),
+            fixtureId: new mongoose.Types.ObjectId( req.body.fixtureId ),
+            type: req.body.type,
+          },
+          {
+            'answers.$[].issues.$[].status': 'completed',
+            'answers.$[].issues.$[].Details.$[].status': 'agree',
+            'status': 'complete',
+          },
+      );
+    }
+    res.sendSuccess( 'updated successfully' );
+  } catch ( e ) {
+    logger.error( { functionName: 'updateredostatus', error: e } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/controllers/planoLibrary.controller.js

@@ -1327,18 +1327,19 @@ export async function getVmDetails( req, res ) {
       return res.sendError( 'No data found', 204 );
     }
     getVmDetails = getVmDetails.toObject();
+    getVmDetails.templateCount = 0;
     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 } );
-    if ( fixtureDetails.length ) {
-      let planoList = fixtureDetails.map( ( ele ) => ele.planoId );
-      let planoDetails = await planoService.find( { _id: { $in: planoList } }, { status: 1 } );
-      planoDetails = planoDetails.map( ( ele ) => ele.status );
-      if ( planoDetails.includes( 'completed' ) ) {
-        getVmDetails.status = 'active';
+      let fixtureDetails = await storeFixtureService.find( { 'vmConfig.vmId': { $in: req.query.vmId } }, { planoId: 1 } );
+      if ( fixtureDetails.length ) {
+        let planoList = fixtureDetails.map( ( ele ) => ele.planoId );
+        let planoDetails = await planoService.find( { _id: { $in: planoList } }, { status: 1 } );
+        planoDetails = planoDetails.map( ( ele ) => ele.status );
+        if ( planoDetails.includes( 'completed' ) ) {
+          getVmDetails.status = 'active';
+        }
       }
     }
     return res.sendSuccess( getVmDetails );

package/src/controllers/storeBuilder.controller.js

@@ -3013,7 +3013,6 @@ export async function storeFixturesTaskv2( req, res ) {
                             const compliance = await planoTaskComplianceService.findOne( {
                               fixtureId: fixture._id,
                               type: req.body?.type ? req.body.type : 'fixture',
-                              date_string: req.body?.date,
                             }, { status: 1, answers: 1 } );
 
                             const shelves = await fixtureShelfService.findAndSort( { fixtureId: fixture._id }, { }, { shelfNumber: 1 } );
@@ -3044,9 +3043,14 @@ export async function storeFixturesTaskv2( req, res ) {
 
                             let disabled = true;
                             if ( compliance?.status && compliance.status == 'incomplete' ) {
-                              let issueDetails = compliance?.answers?.[0]?.issues.find( ( ele ) => ele.status == 'disagree' );
-                              if ( issueDetails ) {
-                                redoCount ++;
+                              const hasDisagree = compliance?.answers?.some( ( answer ) =>
+                                answer?.issues?.some( ( issue ) =>
+                                  issue?.Details?.some( ( detail ) => detail.status === 'disagree' ),
+                                ),
+                              );
+
+                              if ( hasDisagree ) {
+                                redoCount++;
                                 disabled = false;
                               }
                             }
@@ -3104,7 +3108,6 @@ export async function storeFixturesTaskv2( req, res ) {
                       const compliance = await planoTaskComplianceService.findOne( {
                         fixtureId: fixture._id,
                         type: req.body?.type ? req.body.type : 'fixture',
-                        date_string: req.body?.date,
                       }, { status: 1 } );
 
                       const shelves = await fixtureShelfService.findAndSort( { fixtureId: fixture._id }, { }, { shelfNumber: 1 } );
@@ -3134,8 +3137,13 @@ export async function storeFixturesTaskv2( req, res ) {
 
                       let disabled = true;
                       if ( compliance?.status && compliance.status == 'incomplete' ) {
-                        let issueDetails = compliance?.answers?.[0]?.issues.find( ( ele ) => ele.status == 'disagree' );
-                        if ( issueDetails ) {
+                        const hasDisagree = compliance?.answers?.some( ( answer ) =>
+                          answer?.issues?.some( ( issue ) =>
+                            issue?.Details?.some( ( detail ) => detail.status === 'disagree' ),
+                          ),
+                        );
+
+                        if ( hasDisagree ) {
                           redoCount++;
                           disabled = false;
                         }
@@ -3261,7 +3269,10 @@ export async function planoList( req, res ) {
                 $expr: {
                   $and: [
                     { $eq: [ '$planoId', '$$plano' ] },
-                    { isPlano: true },
+                    { $eq: [ '$isPlano', true ] },
+                    {
+                      $lte: [ '$date_iso', new Date( dayjs().format( 'YYYY-MM-DD' ) ) ],
+                    },
                   ],
                 },
               },
@@ -3274,19 +3285,27 @@ export async function planoList( req, res ) {
                 taskId: { $last: '$_id' },
               },
             },
+            {
+              $group: {
+                _id: null,
+                taskStatus: {
+                  $push: {
+                    type: '$_id',
+                    status: '$checklistStatus',
+                    date: '$dateString',
+                  },
+                },
+                taskIds: { $push: '$taskId' },
+              },
+            },
           ],
           as: 'planoTask',
         },
       },
       {
         $addFields: {
-          taskIds: {
-            $map: {
-              input: '$planoTask',
-              as: 'task',
-              in: '$$task.taskId',
-            },
-          },
+          taskIds: { $ifNull: [ { $arrayElemAt: [ '$planoTask.taskIds', 0 ] }, [] ] },
+          taskStatus: { $ifNull: [ { $arrayElemAt: [ '$planoTask.taskStatus', 0 ] }, [] ] },
         },
       },
       {
@@ -3618,12 +3637,34 @@ export async function planoList( req, res ) {
         },
       } );
     }
-    if ( inputData?.filter?.taskPending?.length ) {
+    if ( inputData?.filter?.taskPending?.length && inputData?.filter?.taskPending != 'all' ) {
+      let andQuery = [];
+
+      if ( inputData.filter.taskPending == 'layout' ) {
+        andQuery.push(
+            { 'planoTask.taskStatus.type': 'layout' },
+            { 'planoTask.taskStatus.status': 'submit' },
+            { 'taskDetails.layoutStatus': 'pending' },
+        );
+      }
+      if ( inputData.filter.taskPending == 'fixture' ) {
+        andQuery.push(
+            { 'planoTask.taskStatus.type': 'fixture' },
+            { 'planoTask.taskStatus.status': 'submit' },
+            { 'taskDetails.fixtureStatus': 'pending' },
+        );
+      }
+      if ( inputData.filter.taskPending == 'vm' ) {
+        andQuery.push(
+            { 'planoTask.taskStatus.type': 'vm' },
+            { 'taskDetails.vmStatus': 'pending' },
+            { 'planoTask.taskStatus.status': 'submit' },
+        );
+      }
+
       query.push( {
         $match: {
-          ...( inputData.filter.taskPending == 'layout' ) ? { 'taskDetails.layoutStatus': 'pending', 'planoTask._id': 'layout', 'planoTask.checklistStatus': 'submit' } :{},
-          ...( inputData.filter.taskPending == 'fixture' ) ? { 'taskDetails.fixtureStatus': 'pending', 'planoTask._id': 'fixture', 'planoTask.checklistStatus': 'submit' } :{},
-          ...( inputData.filter.taskPending == 'vm' ) ? { 'taskDetails.vmStatus': 'pending', 'planoTask._id': 'vm', 'planoTask.checklistStatus': 'submit' } :{},
+          $and: andQuery,
         },
       } );
     }
@@ -3669,6 +3710,8 @@ export async function planoList( req, res ) {
       },
     } );
 
+    console.log( JSON.stringify( query ) );
+
     let planoDetails = await planoService.aggregate( query );
 
     if ( !planoDetails[0].data.length ) {

package/src/controllers/task.controller.js

@@ -595,11 +595,16 @@ export async function updateAnswersv2( req, res ) {
       type: req.body.type,
       date_iso: new Date( dayjs().format( 'YYYY-MM-DD' ) ),
       taskId: req.body.taskId,
+      taskType: req.body.taskType,
       storeName: req.body?.storeName,
       storeId: req.body?.storeId,
     };
-    console.log( data );
-    await planoTaskService.updateOne( { planoId: req.body.planoId, floorId: req.body.floorId, fixtureId: req.body.fixtureId, type: req.body.type, date_string: dayjs().format( 'YYYY-MM-DD' ), ...( taskDetails?._id ) ? { taskId: taskDetails?._id } :{} }, data );
+    console.log( '111111', data );
+    if ( req.body.type==='layout' ) {
+      await planoTaskService.updateOne( { planoId: req.body.planoId, taskType: req.body.taskType, floorId: req.body.floorId, fixtureId: req.body.fixtureId, type: req.body.type, date_string: dayjs().format( 'YYYY-MM-DD' ), ...( taskDetails?._id ) ? { taskId: taskDetails?._id } :{} }, data );
+    } else {
+      await planoTaskService.updateOne( { planoId: req.body.planoId, floorId: req.body.floorId, fixtureId: req.body.fixtureId, type: req.body.type, date_string: dayjs().format( 'YYYY-MM-DD' ), ...( taskDetails?._id ) ? { taskId: taskDetails?._id } :{} }, data );
+    }
 
     return res.sendSuccess( 'Fixture details updated successfully' );
   } catch ( e ) {

package/src/routes/managePlano.routes.js

@@ -15,4 +15,4 @@ managePlanoRouter
     .get( '/fixtureVMList', managePlanoController.fixtureVMList )
     .post( '/updateFixtureStatus', isAllowedSessionHandler, managePlanoController.updateFixtureStatus )
     .post( '/updateStoreFixture', managePlanoController.updateStoreFixture )
-    .post( '/updateStoreFixture', managePlanoController.updateStoreFixture );
+    .post( '/updateredostatus', managePlanoController.updateredostatus );