tango-app-api-store-builder 1.0.0-beta-112 → 1.0.0-beta-114

package/src/controllers/managePlano.controller.js

@@ -64,7 +64,7 @@ export async function getplanoFeedback( req, res ) {
       $match: {
         planoId: new mongoose.Types.ObjectId( req.body.planoId ),
         floorId: new mongoose.Types.ObjectId( req.body.floorId ),
-        type: { $ne: 'layout' },
+        type: 'fixture',
       },
     },
     {
@@ -96,7 +96,7 @@ export async function getplanoFeedback( req, res ) {
     }, { $unwind: { path: '$taskData', preserveNullAndEmptyArrays: true } },
     {
       $lookup: {
-        from: 'fixtureconfigs',
+        from: 'storefixtures',
         let: { 'fixtureId': '$fixtureId' },
         pipeline: [
           {
@@ -109,6 +109,27 @@ export async function getplanoFeedback( req, res ) {
             },
           },
         ],
+        as: 'storeFixtureData',
+      },
+    },
+    {
+      $unwind: { path: '$storeFixtureData', preserveNullAndEmptyArrays: true },
+    },
+    {
+      $lookup: {
+        from: 'fixtureconfigs',
+        let: { 'fixtureConfigId': '$storeFixtureData.fixtureConfigId' },
+        pipeline: [
+          {
+            $match: {
+              $expr: {
+                $and: [
+                  { $eq: [ '$_id', '$$fixtureConfigId' ] },
+                ],
+              },
+            },
+          },
+        ],
         as: 'FixtureData',
       },
     },
@@ -119,8 +140,91 @@ export async function getplanoFeedback( req, res ) {
 
 
     let findfixtureCompliance = await planoTaskService.aggregate( queryfixture );
-    console.log( findfixtureCompliance );
-    res.sendSuccess( { count: findfixtureCompliance.length, layoutData: findPlanoCompliance, fixtureData: findfixtureCompliance } );
+    let queryVm = [];
+
+
+    queryVm.push( {
+      $match: {
+        planoId: new mongoose.Types.ObjectId( req.body.planoId ),
+        floorId: new mongoose.Types.ObjectId( req.body.floorId ),
+        type: 'vm',
+      },
+    },
+    {
+      $lookup: {
+        from: 'processedtasks',
+        let: { 'taskId': '$taskId' },
+        pipeline: [
+          {
+            $match: {
+              $expr: {
+                $and: [
+                  { $eq: [ '$_id', '$$taskId' ] },
+                ],
+              },
+            },
+          },
+          {
+            $project: {
+              'userName': 1,
+              'createdAt': 1,
+              'createdByName': 1,
+              'submitTime_string': 1,
+            },
+          },
+        ],
+        as: 'taskData',
+      },
+
+    }, { $unwind: { path: '$taskData', preserveNullAndEmptyArrays: true } },
+    {
+      $lookup: {
+        from: 'storefixtures',
+        let: { 'fixtureId': '$fixtureId' },
+        pipeline: [
+          {
+            $match: {
+              $expr: {
+                $and: [
+                  { $eq: [ '$_id', '$$fixtureId' ] },
+                ],
+              },
+            },
+          },
+        ],
+        as: 'storeFixtureData',
+      },
+    },
+    {
+      $unwind: { path: '$storeFixtureData', preserveNullAndEmptyArrays: true },
+    },
+    {
+      $lookup: {
+        from: 'fixtureconfigs',
+        let: { 'fixtureConfigId': '$storeFixtureData.fixtureConfigId' },
+        pipeline: [
+          {
+            $match: {
+              $expr: {
+                $and: [
+                  { $eq: [ '$_id', '$$fixtureConfigId' ] },
+                ],
+              },
+            },
+          },
+        ],
+        as: 'FixtureData',
+      },
+    },
+    {
+      $unwind: { path: '$FixtureData', preserveNullAndEmptyArrays: true },
+    },
+    );
+
+
+    let findvmCompliance = await planoTaskService.aggregate( queryVm );
+    console.log( findvmCompliance );
+    res.sendSuccess( { count: findfixtureCompliance.length, layoutData: findPlanoCompliance, fixtureData: findfixtureCompliance, VmData: findvmCompliance } );
   } catch ( e ) {
     logger.error( { functionName: 'getplanoFeedback', error: e, message: req.body } );
     return res.sendError( e, 500 );
@@ -384,3 +488,23 @@ export async function updateFixtureStatus( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+
+export async function updateStoreFixture( req, res ) {
+  try {
+    const { fixtureId, data } = req.body;
+
+    const update = await storeFixtureService.updateOne( { _id: new mongoose.Types.ObjectId( fixtureId ) }, data );
+
+    console.log( update );
+
+    data.shelfConfig.forEach( async ( shelf ) => {
+      await fixtureShelfService.updateOne( { _id: new mongoose.Types.ObjectId( shelf._id ) }, shelf );
+    } );
+
+
+    res.sendSuccess( 'Updated Successfully' );
+  } catch ( e ) {
+    logger.error( { functionName: 'updateStoreFixture', error: e } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/controllers/planoLibrary.controller.js

@@ -143,6 +143,14 @@ export async function createFixture( req, res ) {
       fixtureCategory: req.body.fixtureCategory,
       fixtureType: req.body.fixtureType,
       fixtureLibCode: FixLibCode,
+      fixtureStaticLength: {
+        'value': 1524,
+        'unit': 'mm',
+      },
+      fixtureStaticWidth: {
+        'value': 1220,
+        'unit': 'mm',
+      },
     };
     let fixtLibraryDetails = await planoLibraryService.create( data );
     return res.sendSuccess( fixtLibraryDetails );
@@ -412,6 +420,10 @@ export async function FixtureLibraryList( req, res ) {
         },
       },
       );
+    } else {
+      query.push( {
+        $sort: { _id: -1 },
+      } );
     }
     query.push(
         {
@@ -834,22 +846,25 @@ export async function uploadBrandList( req, res ) {
     let inputData = req.body;
 
     let brandData = inputData.brandData.reduce( ( acc, ele ) => {
+      console.log( ele?.category, ele );
       if ( !acc[ele.brandName] ) {
         acc[ele.brandName] = {
           brandName: ele.brandName,
           clientId: inputData.clientId,
-          category: [ ...new Set( ele.category ) ],
-          subCategory: [ ...new Set( ele.subCategory ) ],
+          category: [ ...new Set( ele?.category?.map( ( ele ) => ele ) ) ],
+          subCategory: [ ...new Set( ele?.subCategory?.map( ( ele ) => ele ) ) ],
         };
       } else {
         acc[ele.brandName].category.push( ...ele.category );
-        acc[ele.brandName].subCategory.push( ...ele.subCategory );
+        if ( ele?.subCategory.length ) {
+          acc[ele.brandName].subCategory.push( ...ele?.subCategory );
+        }
       }
       return acc;
     }, {} );
 
     await planoProductService.deleteMany( { clientId: inputData.clientId, _id: { $nin: inputData.brandUsedList } } );
-    await planoProductService.insertMany( brandData );
+    await planoProductService.insertMany( Object.values( brandData ) );
     // await Promise.all( Object.keys( brandData ).map( async ( ele ) => {
     //   await planoProductService.updateOne( { brandName: { $regex: brandData[ele].brandName, $options: 'i' }, clientId: req.body.clientId }, brandData[ele] );
     // } ) );
@@ -1117,6 +1132,10 @@ export async function getVmLibList( req, res ) {
         },
       },
       );
+    } else {
+      query.push( {
+        $sort: { _id: -1 },
+      } );
     }
     query.push(
         {