tango-app-api-store-builder 1.0.0-beta-177 → 1.0.0-beta-179

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-177",
+    "version": "1.0.0-beta-179",
     "description": "storeBuilder",
     "main": "index.js",
     "type": "module",
@@ -32,8 +32,8 @@
         "path": "^0.12.7",
         "selenium-webdriver": "^4.31.0",
         "sharp": "^0.34.1",
-        "tango-api-schema": "^2.2.204",
-        "tango-app-api-middleware": "3.1.48",
+        "tango-api-schema": "^2.2.152",
+        "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/fixtureTemplate.controller.js

@@ -542,42 +542,7 @@ export async function getAllTemplates( req, res ) {
       return res.sendError( 'Client Id is required', 400 );
     }
 
-    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 );
+    const fixtureTemplates = await fixtureConfigService.find( { clientId: req.body.clientId }, { fixtureName: 1, fixtureWidth: 1, productBrandName: 1 } );
 
     res.sendSuccess( fixtureTemplates );
   } catch ( e ) {

package/src/controllers/managePlano.controller.js

@@ -73,14 +73,13 @@ export async function getplanoFeedback( req, res ) {
     return res.sendError( e, 500 );
   }
 }
-function buildPipelineByType( type, planoId, floorId, filterByStatus, filterByApprovalStatus, showtask, taskId=0 ) {
+function buildPipelineByType( type, planoId, floorId, filterByStatus, filterByApprovalStatus, showtask ) {
   console.log( type, planoId, floorId, filterByStatus );
   const matchStage = {
     $match: {
       planoId: new mongoose.Types.ObjectId( planoId ),
       floorId: new mongoose.Types.ObjectId( floorId ),
       type: type,
-      ...( taskId && { taskId: new mongoose.Types.ObjectId( taskId ) } ),
       ...( filterByStatus?.length ? { status: { $in: filterByStatus } } : {} ),
     },
   };
@@ -145,33 +144,30 @@ function buildPipelineByType( type, planoId, floorId, filterByStatus, filterByAp
             $match: { $expr: { $eq: [ '$_id', '$$fixtureId' ] } },
           },
         ],
-        as: 'FixtureData',
+        as: 'storeFixtureData',
       },
     },
     {
-      $unwind: { path: '$FixtureData', preserveNullAndEmptyArrays: true },
+      $unwind: { path: '$storeFixtureData', preserveNullAndEmptyArrays: true },
     },
     {
       $lookup: {
-        from: 'fixtureshelves',
-        let: { fixtureId: '$FixtureData._id' },
+        from: 'fixtureconfigs',
+        let: { fixtureConfigId: '$storeFixtureData.fixtureConfigId' },
         pipeline: [
           {
-            $match: { $expr: { $eq: [ '$fixtureId', '$$fixtureId' ] } },
+            $match: { $expr: { $eq: [ '$_id', '$$fixtureConfigId' ] } },
           },
         ],
-        as: 'Fixtureshelves',
+        as: 'FixtureData',
       },
     },
-
     {
-      $set: {
-        'FixtureData.shelfConfig': '$Fixtureshelves',
-      },
+      $unwind: { path: '$FixtureData', preserveNullAndEmptyArrays: true },
     },
   ];
 
-  const vmStages = [ 'vm', 'vmRollout' ].includes( type ) ? [
+  const vmStages = type === 'vm' ? [
     {
       $unwind: { path: '$FixtureData.vmConfig', preserveNullAndEmptyArrays: true },
     },
@@ -184,7 +180,7 @@ function buildPipelineByType( type, planoId, floorId, filterByStatus, filterByAp
             $match: { $expr: { $eq: [ '$_id', '$$vmId' ] } },
           },
           {
-            $project: { vmName: 1, vmType: 1 },
+            $project: { vmName: 1 },
           },
         ],
         as: 'vmDetails',
@@ -196,7 +192,6 @@ function buildPipelineByType( type, planoId, floorId, filterByStatus, filterByAp
     {
       $set: {
         'FixtureData.vmConfig.vmName': '$vmDetails.vmName',
-        'FixtureData.vmConfig.vmType': '$vmDetails.vmType',
       },
     },
     {
@@ -312,7 +307,7 @@ function buildPipelineByType( type, planoId, floorId, filterByStatus, filterByAp
     pipeline.push( { $sort: { _id: -1 } } );
   }
 
-  console.log( pipeline );
+
   return pipeline;
 }
 
@@ -652,78 +647,6 @@ export async function updateFixtureStatus( req, res ) {
   }
 }
 
-export async function updateRolloutStatus( req, res ) {
-  try {
-    let comments = {
-      userId: req.user._id,
-      userName: req.user.userName,
-      role: req.user.role,
-      responsetype: req.body.type,
-      comment: req.body.comments,
-    };
-
-    let updateResponse = await planoTaskService.updateOnefilters(
-        { _id: new mongoose.Types.ObjectId( req.body._id ) },
-        {
-          $set: { 'answers.$[ans].issues.$[iss].Details.$[det].status': req.body.type },
-        },
-        [
-          { 'ans._id': new mongoose.Types.ObjectId( req.body.answerId ) },
-          { 'iss._id': new mongoose.Types.ObjectId( req.body.issueId ) },
-          { 'det._id': new mongoose.Types.ObjectId( req.body.DetailsId ) },
-
-        ] );
-    if ( updateResponse && updateResponse.answers.length > 0 ) {
-      let findissuse = updateResponse.answers[0].issues.filter( ( data ) => data._id == req.body.issueId );
-      let findDetails = findissuse[0].Details.filter( ( det ) => det.status === 'agree' );
-      if ( findissuse[0].Details.length === findDetails.length ) {
-        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 ) },
-            ] );
-      }
-      let findoneplanoData = await planoTaskService.findOne( { _id: new mongoose.Types.ObjectId( req.body._id ) } );
-      let totalApproved = findoneplanoData.answers[0].issues.filter( ( data ) => data.status === 'pending' );
-      if ( totalApproved.length === 0 ) {
-        await planoTaskService.updateOne(
-            {
-              _id: new mongoose.Types.ObjectId( req.body._id ),
-            },
-            {
-              'status': 'complete',
-            },
-        );
-        let data = {};
-        if ( req.body.taskType == 'vmRollout' ) {
-          data['isVmEdited'] = false;
-        } else {
-          data['isMerchEdited'] = false;
-        }
-        await storeFixtureService.updateOne( { _id: updateResponse.fixtureId }, data );
-      }
-    }
-    await planoTaskService.updateOnefilters(
-        { _id: new mongoose.Types.ObjectId( req.body._id ) },
-        {
-          $push: { 'answers.$[ans].issues.$[iss].comments': comments },
-        },
-        [
-          { 'ans._id': new mongoose.Types.ObjectId( req.body.answerId ) },
-          { 'iss._id': new mongoose.Types.ObjectId( req.body.issueId ) },
-        ] );
-    res.sendSuccess( 'updated successfully' );
-  } catch ( e ) {
-    logger.error( { functionName: 'updateFixtureStatus', error: e } );
-    return res.sendError( e, 500 );
-  }
-}
-
-
 export async function updateStoreFixture( req, res ) {
   try {
     const { fixtureId, data } = req.body;
@@ -967,60 +890,5 @@ export async function getPlanoRevisionById( req, res ) {
     res.sendError( 'Failed to fetch plano revision', 500 );
   }
 }
-export async function getRolloutFeedback( req, res ) {
-  try {
-    const taskTypes = req.body.filterByTask && req.body.filterByTask.length > 0 ? req.body.filterByTask : [ 'merchRollout', 'vmRollout' ];
-    const filterByStatus = req.body.filterByStatus || [];
-    const filterByApprovalStatus = req.body.filterByApprovalStatus || '';
-    const resultMap = {};
-    const commentMap = {};
-    await Promise.all(
-        taskTypes.map( async ( type, index ) => {
-          console.log( type );
-          const pipeline = buildPipelineByType( type, req.body.planoId, req.body.floorId, filterByStatus, filterByApprovalStatus, req.body.showtask, req.body.taskId );
-
-          let data = await planoTaskService.aggregate( pipeline );
-          console.log( data );
-          if ( filterByApprovalStatus && filterByApprovalStatus !== '' ) {
-            console.log( '-------------1', filterByApprovalStatus );
-            data.forEach( ( element ) => {
-              element.answers?.forEach( ( ans ) => {
-                ans.issues = ans.issues?.filter(
-                    ( issue ) => issue.Details && issue.Details.length > 0,
-                );
-              } );
-              element.answers = element.answers?.filter(
-                  ( ans ) => ans.issues && ans.issues.length > 0,
-              );
-            } );
-            data = data.filter(
-                ( element ) => element.answers && element.answers.length > 0,
-            );
-          }
-
-
-          resultMap[type] = data;
-
-          const comments = await planoGlobalCommentService.find( {
-            planoId: new mongoose.Types.ObjectId( req.body.planoId ),
-            floorId: new mongoose.Types.ObjectId( req.body.floorId ),
-            taskType: type,
-          } );
-          commentMap[type] = comments;
-        } ),
-    );
-    const response = {
-      merchRolloutData: resultMap['merchRollout'] || [],
-      vmRolloutData: resultMap['vmRollout'] || [],
-      merchRolloutComment: commentMap['merchRollout'] || [],
-      vmRolloutComment: commentMap['vmRollout'] || [],
-    };
-
-    res.sendSuccess( response );
-  } catch ( e ) {
-    logger.error( { functionName: 'getRolloutFeedback', error: e } );
-    return res.sendError( e, 500 );
-  }
-}
 
 

package/src/controllers/planoLibrary.controller.js

@@ -123,6 +123,24 @@ async function getMaxFixtureLibCode() {
 export async function createFixture( req, res ) {
   try {
     let FixLibCode = await getMaxFixtureLibCode();
+    let query = [
+      {
+        $addFields: {
+          fixtureCategoryLower: { $toLower: '$fixtureCategory' },
+        },
+      },
+      {
+        $match: {
+          'clientId': req.body.clientId,
+          'fixtureCategoryLower': req.body.fixtureCategory.toLowerCase(),
+          'fixtureWidth.value': 10,
+        },
+      },
+    ];
+    let fixLibDetails = await planoLibraryService.aggregate( query );
+    if ( fixLibDetails.length ) {
+      return res.sendError( `Fixture Name ${req.body.fixtureCategory} already Exists`, 400 );
+    }
     let data ={
       clientId: req.body.clientId,
       fixtureCategory: req.body.fixtureCategory,
@@ -166,7 +184,7 @@ export async function updateFixture( req, res ) {
           'clientId': req.body.clientId,
           'fixtureCategoryLower': req.body.fixtureCategory.toLowerCase(),
           'fixtureWidth.value': req.body.fixtureWidth.value,
-          '_id': { $ne: new ObjectId( req.params.fixtureId ) },
+          '_id': { $ne: req.params.fixtureId },
         },
       },
     ];

package/src/controllers/script.controller.js

@@ -7400,7 +7400,7 @@ export async function migrateCrestv1( req, res ) {
       clientId: '11',
       $and: [
         { storeName: req.body.storeName },
-        // { storeName: { $in: [ 'LKST1324', 'LKST495' ] } },
+        // { storeName: { $in: ['LKST98', 'LKST682', 'ST185', 'ST36', 'LKST1193'] } },
         // { storeName: { $nin: [ 'LKST98', 'LKST1193' ] } },
       ],
     };