tango-app-api-store-builder 1.0.0-beta-167 → 1.0.0-beta-169

package/package.json

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

package/src/controllers/fixtureTemplate.controller.js

@@ -22,10 +22,6 @@ export async function createTemplate( req, res ) {
     if ( !getLibDetails ) {
       return res.sendError( 'Fixture library id is wrong', 400 );
     }
-    let fixtureCapacity = getLibDetails.shelfConfig.reduce(
-        ( acc, ele ) => ele.trayRows ? acc + ( ele.trayRows * ele.productPerShelf ) : ( acc + ele.productPerShelf ),
-        0,
-    );
     let templateId = await getTemplateId( getLibDetails.fixtureCategory, getLibDetails.fixtureWidth );
     let templateData = {
       clientId: inputData.clientId,
@@ -40,7 +36,7 @@ export async function createTemplate( req, res ) {
       header: getLibDetails.header,
       footer: getLibDetails.footer,
       isBodyEnabled: getLibDetails.isBodyEnabled,
-      fixtureCapacity: fixtureCapacity,
+      fixtureCapacity: getLibDetails.fixtureCapacity,
       fixtureStaticLength: {
         value: 1524,
         unit: 'mm',
@@ -84,21 +80,12 @@ export async function updateTemplate( req, res ) {
         let templateData = { ...templateDetails, ...inputData };
         newFixture = await fixtureConfigService.create( templateData );
       }
-      let fixtureCapacity = inputData.shelfConfig.reduce( ( acc, ele ) => {
-        if ( ele.shelfType == 'tray' ) {
-          ele.productPerShelf = ele.trayRows * ele.productPerShelf;
-        }
-        acc = acc + ele.productPerShelf;
-        return acc;
-      },
-      0 );
 
       let storeFixtureDetails = await storeFixtureService.find( { fixtureConfigId: req.params.templateId } );
       if ( storeFixtureDetails.length ) {
         let fixtureList = storeFixtureDetails.map( ( ele ) => ele._id );
         let fixtureData = {
           ...inputData,
-          fixtureCapacity: fixtureCapacity,
           fixtureConfigId: newFixture ? newFixture._id : req.params.templateId,
         };
         delete fixtureData._id;
@@ -109,8 +96,8 @@ export async function updateTemplate( req, res ) {
           let shelfData = [];
           inputData.shelfConfig.forEach( ( ele, index ) => {
             shelfData.push( {
-              productCategory: inputData.productCategory,
-              productSubCategory: inputData.productCategory,
+              productCategory: ele.productCategory,
+              productSubCategory: ele.productSubCategory,
               shelfType: ele.shelfType,
               trayRows: ele.trayRows,
               shelfNumber: index + 1,
@@ -533,7 +520,42 @@ export async function getAllTemplates( req, res ) {
       return res.sendError( 'Client Id is required', 400 );
     }
 
-    const fixtureTemplates = await fixtureConfigService.find( { clientId: req.body.clientId }, { fixtureName: 1, fixtureWidth: 1, productBrandName: 1 } );
+    const query = [
+      {
+        $match: {
+          clientId: req.body.clientId,
+        },
+      },
+      {
+        $project: {
+          'fixtureName': 1,
+          'fixtureWidth': 1,
+          'productBrandName': {
+            $cond: {
+              if: { $eq: [ '$productResolutionLevel', 'L1' ] },
+              then: '$productBrandName',
+              else: {
+                $reduce: {
+                  input: {
+                    $map: {
+                      input: '$shelfConfig',
+                      as: 'shelf',
+                      in: '$$shelf.productBrandName',
+                    },
+                  },
+                  initialValue: [],
+                  in: {
+                    $setUnion: [ '$$value', '$$this' ],
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    ];
+
+    const fixtureTemplates = await fixtureConfigService.aggregate( query );
 
     res.sendSuccess( fixtureTemplates );
   } catch ( e ) {

package/src/controllers/managePlano.controller.js

@@ -145,26 +145,29 @@ function buildPipelineByType( type, planoId, floorId, filterByStatus, filterByAp
             $match: { $expr: { $eq: [ '$_id', '$$fixtureId' ] } },
           },
         ],
-        as: 'storeFixtureData',
+        as: 'FixtureData',
       },
     },
     {
-      $unwind: { path: '$storeFixtureData', preserveNullAndEmptyArrays: true },
+      $unwind: { path: '$FixtureData', preserveNullAndEmptyArrays: true },
     },
     {
       $lookup: {
-        from: 'fixtureconfigs',
-        let: { fixtureConfigId: '$storeFixtureData.fixtureConfigId' },
+        from: 'fixtureshelves',
+        let: { fixtureId: '$FixtureData._id' },
         pipeline: [
           {
-            $match: { $expr: { $eq: [ '$_id', '$$fixtureConfigId' ] } },
+            $match: { $expr: { $eq: [ '$fixtureId', '$$fixtureId' ] } },
           },
         ],
-        as: 'FixtureData',
+        as: 'Fixtureshelves',
       },
     },
+
     {
-      $unwind: { path: '$FixtureData', preserveNullAndEmptyArrays: true },
+      $set: {
+        'FixtureData.shelfConfig': '$Fixtureshelves',
+      },
     },
   ];
 

package/src/controllers/storeBuilder.controller.js

@@ -2658,7 +2658,7 @@ export async function storeFixturesv2( req, res ) {
         planograms.map( async ( planogram ) => {
           const floors = await storeBuilderService.find(
               { planoId: planogram._id },
-              { floorName: 1, layoutPolygon: 1, planoId: 1, isEdited: 1 },
+              { floorName: 1, layoutPolygon: 1, planoId: 1, isEdited: 1, planoProgress:1, },
           );
 
           const floorsWithFixtures = await Promise.all(
@@ -3308,6 +3308,7 @@ export async function planoList( req, res ) {
                     {
                       $lte: [ '$date_iso', new Date( dayjs().format( 'YYYY-MM-DD' ) ) ],
                     },
+                    { $in: [ '$planoType', [ 'layout', 'fixture', 'vm' ] ] },
                   ],
                 },
               },
@@ -3362,6 +3363,7 @@ export async function planoList( req, res ) {
                   $and: [
                     { $eq: [ '$floorId', '$$floor' ] },
                     { $eq: [ '$status', 'incomplete' ] },
+                    { $in: [ '$type', [ 'layout', 'fixture', 'vm' ] ] },
                   ],
                 },
               },
@@ -3810,7 +3812,22 @@ export async function planoList( req, res ) {
         } );
       }
       if ( inputData.filter.status.includes( 'completed' ) ) {
-        orQuery.push( { $and: [ { 'taskDetails.layoutStatus': '' }, { 'taskDetails.fixtureStatus': '' }, { 'taskDetails.vmStatus': '' } ] } );
+        let taskType= [ 'layout', 'fixture', 'vm' ];
+        let andCondition = [];
+        taskType.forEach( ( type ) => {
+          andCondition.push(
+              { 'planoTask.taskStatus': {
+                $elemMatch: {
+                  type,
+                  status: 'submit',
+                },
+              } },
+              {
+                [`taskDetails.${type}Status`]: '',
+              },
+          );
+        } );
+        orQuery.push( { $and: andCondition } );
       }
       if ( inputData.filter.status.includes( 'yetToAssign' ) ) {
         orQuery.push( { $expr: { $eq: [ { $size: '$planoTask' }, 0 ] } } );
@@ -3871,6 +3888,7 @@ export async function planoList( req, res ) {
           planoId: { $in: planoIdList.map( ( ele ) => ele._id ) },
           isPlano: true,
           date_iso: { $lte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) },
+          planoType: { $in: [ 'layout', 'fixture', 'vm' ] },
         },
       },
       {
@@ -4523,7 +4541,6 @@ export async function getRolloutDetails( req, res ) {
       {
         $match: {
           clientId: req.body.clientId,
-          planoProgress: 100,
           storeId: { $in: storeDetails },
         },
       },
@@ -4808,7 +4825,11 @@ export async function getRolloutDetails( req, res ) {
       },
     ];
 
-    let extraCondition = [];
+    let extraCondition = [ {
+      $match: {
+        planoProgress: 100,
+      },
+    } ];
 
     if ( req.body?.filter?.type == 'rollout' ) {
       extraCondition.push( {
@@ -5079,6 +5100,10 @@ export async function getRolloutTaskDetails( req, res ) {
         $group: {
           _id: { type: '$planoType', floorId: '$floorId' },
           dateString: { $last: '$date_string' },
+          createdByName: { $last: '$createdByName' },
+          userName: { $last: '$userName' },
+          createdAt: { $last: '$createdAt' },
+          submitTime_string: { $last: '$submitTime_string' },
           checklistStatus: { $last: '$checklistStatus' },
           taskId: { $last: '$_id' },
           redoStatus: { $last: '$redoStatus' },
@@ -5097,6 +5122,10 @@ export async function getRolloutTaskDetails( req, res ) {
               floorId: '$_id.floorId',
               redoStatus: '$redoStatus',
               endTime: '$scheduleEndTime_iso',
+              createdByName: '$createdByName',
+              userName: '$userName',
+              createdAt: '$createdAt',
+              submitTime_string: '$submitTime_string',
               id: '$taskId',
               breach: {
                 $cond: {
@@ -5369,6 +5398,10 @@ export async function getRolloutTaskDetails( req, res ) {
                 endTime: '$$task.endTime',
                 breach: '$$task.breach',
                 taskId: '$$task.id',
+                createdByName: '$$task.createdByName',
+                createdAt: '$$task.createdAt',
+                userName: '$$task.userName',
+                submitTime_string: '$$task.submitTime_string',
                 feedbackStatus: {
                   $switch: {
                     branches: [

package/src/controllers/task.controller.js

@@ -666,9 +666,9 @@ export async function updateAnswersv2( req, res ) {
     console.log( '111111', data.answers[0] );
     console.log( '111111', data.answers[0].issues[0] );
     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 );
+      await planoTaskService.updateOne( { planoId: req.body.planoId, taskType: req.body.taskType, floorId: req.body.floorId, fixtureId: req.body.fixtureId, type: req.body.type, ...( 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 );
+      await planoTaskService.updateOne( { planoId: req.body.planoId, floorId: req.body.floorId, fixtureId: req.body.fixtureId, type: req.body.type, ...( taskDetails?._id ) ? { taskId: taskDetails?._id } :{} }, data );
     }
 
     await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).planotaskcompliances, data );
@@ -1047,10 +1047,13 @@ 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.planoId ) {
+      return res.sendError( 'plano id  is required', 400 );
+    }
+    if ( !req.body.floorId ) {
+      return res.sendError( 'floor id is required', 400 );
     }
-    await processedService.deleteMany( { _id: req.body.taskId } );
+    await processedService.deleteMany( { planoId: req.body.planoId, floorId: req.body.floorId, checklistStatus: { $ne: 'submit' }, date_iso: { $gte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) } } );
     return res.sendSuccess( 'Task revoked successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'revokeTask', error: e } );