tango-app-api-store-builder 1.0.0-beta-196 → 1.0.0-beta-197

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-196",
+    "version": "1.0.0-beta-197",
     "description": "storeBuilder",
     "main": "index.js",
     "type": "module",

package/src/controllers/fixtureTemplate.controller.js

@@ -999,11 +999,35 @@ export async function getMasterList( req, res ) {
     let page = req.body?.offset || 1;
     let skip = limit * ( page - 1 );
 
+    let searchMasterList = [];
+
+    if ( req.body?.searchValue ) {
+      let searchQuery = [
+        {
+          $match: {
+            clientId: req.body.clientId,
+            templateType: 'sub',
+            fixtureName: { $regex: req.body.searchValue, $options: 'i' },
+          },
+        },
+        {
+          $group: {
+            _id: '$masterTemplateId',
+          },
+        },
+      ];
+
+      let subTemplateDetails = await fixtureConfigService.aggregate( searchQuery );
+      if ( subTemplateDetails.length ) {
+        searchMasterList = subTemplateDetails.map( ( ele ) => ele._id );
+      }
+    }
+
     const matchStage = {
       clientId: req.body.clientId,
       templateType: 'master',
       ...( req.body?.searchValue ?
-        { fixtureName: { $regex: req.body.searchValue, $options: 'i' } } :
+        { $or: [ { fixtureName: { $regex: req.body.searchValue, $options: 'i' } }, { _id: { $in: searchMasterList } } ] } :
         {} ),
       ...( req.body?.filter?.brand?.length ?
         {
@@ -1181,6 +1205,9 @@ export async function getChildList( req, res ) {
       clientId: req.body.clientId,
       templateType: 'sub',
       masterTemplateId: new ObjectId( req.body.masterTemplateId ),
+      ...( req.body?.searchValue ?
+      { fixtureName: { $regex: req.body.searchValue, $options: 'i' } } :
+      {} ),
     };
 
     const query = [

package/src/controllers/script.controller.js

@@ -9548,3 +9548,58 @@ async function updateHeaders() {
     console.log( key );
   } );
 }
+
+
+export async function readExcel( req, res ) {
+  try {
+    const workbook = xlsx.read( req.files.file.data, { type: 'buffer' } );
+    const sheetName = 'Updated - 275';
+    const raw = xlsx.utils.sheet_to_json( workbook.Sheets[sheetName] );
+    // const sheetName1 = 'Zone Level Allocation with No o';
+    const sheetName1 = 'Zone Level Allocation with > 1 ';
+    const rawZone = xlsx.utils.sheet_to_json( workbook.Sheets[sheetName1] );
+    console.log( rawZone );
+    let data = [];
+    function cleanFixtures( obj ) {
+      const cleaned = {};
+      for ( const key in obj ) {
+        // Skip keys that match pattern "Fixture number_number"
+        if ( /^Fixture \d+_\d+$/.test( key ) ) continue;
+        cleaned[key] = obj[key];
+      }
+      return cleaned;
+    }
+    raw.forEach( ( ele ) => {
+      ele = cleanFixtures( ele );
+      let keys = Object.keys( ele );
+      let category = ele['Category'];
+      let fixture = [];
+      keys.splice( 0, 1 );
+      keys.forEach( ( key ) => {
+        let topValue = rawZone.find( ( zone ) => zone.Category == category && zone.r == keys.length && zone.Category_1 == 'Top' );
+        let midValue = rawZone.find( ( zone ) => zone.Category == category && zone.r == keys.length && zone.Category_1 == 'Mid' );
+        let midValue1 = rawZone.find( ( zone ) => zone.Category == category && zone.r == keys.length && zone.Category_1 == 'Mid 2' || zone.Category_1 == 'Mid _2' );
+        let bottomValue = rawZone.find( ( zone ) => zone.Category == category && zone.r == keys.length && zone.Category_1 == 'Bottom' );
+        if ( midValue1 && midValue1[key] != '-' ) {
+          midValue[key] = midValue[key] + ' + ' + midValue1[key];
+        }
+        fixture.push( {
+          header: ele[key],
+          top: topValue[key],
+          mid: midValue[key],
+          bottom: bottomValue[key],
+        } );
+      } );
+      data.push( {
+        category: category,
+        fixtureCount: fixture.length,
+        fixtures: fixture,
+      } );
+    } );
+    return res.sendSuccess( data );
+  } catch ( e ) {
+    console.log( e );
+    logger.error( { functionName: 'readExcel', error: e } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/routes/script.routes.js

@@ -32,4 +32,5 @@ scriptRouter
     .post( '/recorrectTaskData', scriptController.recorrectTaskData )
     .post( '/migrateCrest', scriptController.migrateCrestv1 )
     .post( '/updatePlanoMappings', scriptController.updatePlanoMappings )
+    .post( '/readExcel', scriptController.readExcel )
 ;