tango-app-api-store-builder 1.0.47 → 1.0.49

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.47",
+    "version": "1.0.49",
     "description": "storeBuilder",
     "main": "index.js",
     "type": "module",
@@ -33,7 +33,7 @@
         "path": "^0.12.7",
         "selenium-webdriver": "^4.31.0",
         "sharp": "^0.34.1",
-        "tango-api-schema": "^2.5.34",
+        "tango-api-schema": "^2.5.35",
         "tango-app-api-middleware": "3.1.48",
         "url": "^0.11.4",
         "winston": "^3.17.0",

package/src/controllers/managePlano.controller.js

@@ -2475,6 +2475,7 @@ export async function createPlanoFromCAD( req, res ) {
       floorName: `Floor ${floorNumber}`,
       isEdited: false,
       cadLayout: true,
+      isPlanoApproved: false,
     };
 
     let floorData = await floorService.findOne( { planoId: planoData._id, floorNumber }, { _id: 1, clientId: 1, storeName: 1, storeId: 1, planoId: 1 } );
@@ -2556,14 +2557,14 @@ export async function createPlanoFromCAD( req, res ) {
       } );
     }
 
-    return res.sendSuccess( meta );
-  } catch ( error ) {
-    logger.error( {
+    return res.sendSuccess(meta);
+  } catch (error) {
+    logger.error({
       functionName: 'createPlanoFromCAD',
       error,
-    } );
+    });
 
-    return res.sendError( { errMsg: 'Failed to create planogram.' }, 500 );
+    return res.sendError({ errMsg: 'Failed to create planogram.', errInfo: error }, 500);
   }
 }
 
@@ -2779,3 +2780,22 @@ async function processFixtureTemplates( data ) {
 
   return updateStoreFixtures;
 }
+
+
+export async function approvePlanoLayout(req, res) {
+  try {
+
+    const { floorId } = req.body;
+
+    await floorService.updateOne(
+      { _id: new mongoose.Types.ObjectId(floorId) },
+      {
+        isPlanoApproved: true,
+      },
+    );
+    res.sendSuccess(true);
+  } catch (error) {
+    logger.error({ functionName: 'approvePlanoLayout', error: e });
+    res.sendError('Failed to approve planogram', 500);
+  }
+}

package/src/controllers/script.controller.js

@@ -1,7 +1,7 @@
 /* eslint-disable quotes */
 // import { writeFileSync } from 'fs';
 import xlsx from 'xlsx';
-import { logger, fileUpload, download, insertOpenSearchData, getOpenSearchData } from 'tango-app-api-middleware';
+import { logger, fileUpload, download } from 'tango-app-api-middleware';
 import * as storeBuilderService from '../service/storeBuilder.service.js';
 import * as storeService from '../service/store.service.js';
 import * as planoService from '../service/planogram.service.js';
@@ -20,6 +20,9 @@ import * as fixtureConfigService from '../service/fixtureConfig.service.js';
 import * as fixtureLibraryService from '../service/planoLibrary.service.js';
 import * as userService from '../service/user.service.js';
 import * as staticService from '../service/planoStaticData.service.js';
+import * as planoRevisionService from '../service/planoRevision.service.js';
+
+
 import mongoose from 'mongoose';
 import JSZip from 'jszip';
 import { signedUrl } from 'tango-app-api-middleware';
@@ -27,6 +30,8 @@ import fs from 'fs';
 import os from 'os';
 import { fileURLToPath } from 'url';
 import path from 'path';
+import FormData from 'form-data';
+
 const ObjectId=mongoose.Types.ObjectId;
 
 const __filename = fileURLToPath( import.meta.url );
@@ -15779,14 +15784,11 @@ export async function insertAntennaMappingData( req, res ) {
               shelfNumber: shelfNumber,
             } );
 
-            console.log( shelf );
-
             if ( shelf ) {
-              let data = await fixtureShelfService.updateOne(
+              await fixtureShelfService.updateOne(
                   { _id: shelf._id },
                   { antennaNo: antennaNo },
               );
-              console.log( data );
               console.log( `Updated fixture ${fixtureNumber}, shelf ${shelfNumber} with antennaNo:`, antennaNo );
             } else {
               const errorMsg = `Shelf not found for fixture ${fixtureNumber}, shelfNumber: ${shelfNumber}`;
@@ -15869,68 +15871,169 @@ export async function get4487FixtureDetails( req, res ) {
   }
 }
 
-export async function getstoreMBQFixtureExcel( req, res ) {
+export async function getstoreMBQFixtureExcel(req, res) {
   try {
-    if ( !req.body?.storeName ) {
-      return res.sendError( 'storeName is required', 400 );
-    }
-    let getStoreDetails = await storeService.find( { storeName: { $in: req.body.storeName }, status: 'active', clientId: '11' }, { storeProfile: 1, storeName: 1 } );
-    if ( !getStoreDetails.length ) {
-      return res.sendError( 'No data found', 204 );
-    }
+    const fromDate = new Date(dayjs().subtract(1, 'day').format('YYYY-MM-DD'));
+    let toDate = new Date(dayjs().subtract(1, 'day').format('YYYY-MM-DD'));
+    const userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    toDate = new Date(toDate.getTime() - userTimezoneOffset);
+    toDate.setUTCHours(23, 59, 59, 59);
+
+    let query = [
+      {
+        $match: {
+          createdAt: { $gte: fromDate, $lte: toDate },
+        },
+      },
+      {
+        $sort: {
+          createdAt: -1,
+        },
+      },
+      {
+        $group: {
+          _id: { store: '$storeName', floorId: '$floorId' },
+          data: { $first: '$$ROOT' },
+        },
+      },
+    ];
+
+    let planorevisions = await planoRevisionService.aggregate(query);
     let data = [];
-    let sortOrder = [ 5, 1, 2, 3, 4 ];
-    await Promise.all( getStoreDetails.map( async ( store ) => {
-      let storeFixturesList = await storeFixtureService.findAndSort( { storeName: store.storeName }, {}, { fixtureNumber: 1, associatedElementNumber: 1, associatedElementFixtureNumber: 1 } );
-      storeFixturesList.sort( ( a, b ) => {
-        const floorDiff = b.floorId.toString().localeCompare( a.floorId.toString() );
-        if ( floorDiff !== 0 ) return floorDiff;
+    let sortOrder = [5, 1, 2, 3, 4];
 
-        if ( a.fixtureType !== b.fixtureType ) {
+    await Promise.all(planorevisions.map(async (revision) => {
+      let wallFixtures = revision?.data?.floorData?.layoutPolygon.flatMap((ele) => ele.fixtures);
+      let centerFixtures = revision?.data?.floorData?.centerFixture;
+      let storeFixturesList = [...wallFixtures, ...centerFixtures];
+
+      storeFixturesList.sort((a, b) => {
+        const floorDiff = b.floorId.toString().localeCompare(a.floorId.toString());
+        if (floorDiff !== 0) return floorDiff;
+
+        if (a.fixtureType !== b.fixtureType) {
           return a.fixtureType === "wall" ? -1 : 1;
         }
 
-        if ( a.fixtureType === "wall" ) {
+        if (a.fixtureType === "wall") {
           const orderDiff =
-      sortOrder.indexOf( a.associatedElementNumber ) -
-      sortOrder.indexOf( b.associatedElementNumber );
+            sortOrder.indexOf(a.associatedElementNumber) -
+            sortOrder.indexOf(b.associatedElementNumber);
 
-          if ( orderDiff !== 0 ) return orderDiff;
+          if (orderDiff !== 0) return orderDiff;
 
           return (
-            ( a.associatedElementFixtureNumber || 0 ) -
-            ( b.associatedElementFixtureNumber || 0 )
+            (a.associatedElementFixtureNumber || 0) -
+            (b.associatedElementFixtureNumber || 0)
           );
         }
 
         return 0;
-      } );
+      });
 
 
       let storeFixtureDetails = [];
-      for ( let ele of storeFixturesList ) {
-        let shelfDetails = await fixtureShelfService.findAndSort( { fixtureId: ele._id }, {}, { shelfNumber: 1 } );
+      for (let ele of storeFixturesList) {
+        let shelfDetails = await fixtureShelfService.findAndSort({ fixtureId: ele._id }, {}, { shelfNumber: 1 });
 
-        storeFixtureDetails.push( {
+        storeFixtureDetails.push({
           "Store Code": ele.storeName,
           "Wall": ele?.associatedElementNumber ?? 'floor',
           "Unique Fixture Number": 'FX - ' + ele.fixtureNumber,
           "Brand-Category": ele.header?.label,
           "Fixture Type": ele.fixtureCategory,
-          "Fixture Size": ele.fixtureWidth.value +' '+ ele.fixtureWidth.unit,
+          "Fixture Size": ele.fixtureWidth.value + ' ' + ele.fixtureWidth.unit,
           "Shelves/ Rods/ Space per Fixture": shelfDetails.length,
           'Display per Shelf/ Rod/ Space': shelfDetails?.[0]?.productPerShelf,
           'Fixture Capacity': ele?.fixtureCapacity,
         },
         );
       }
-      data.push( ...storeFixtureDetails );
-    } ) );
-    // for ( let store of getStoreDetails ) {
-    // }
-    await download( data, res );
-  } catch ( e ) {
-    console.log( e );
-    return res.sendError( e, 500 );
+      data.push(...storeFixtureDetails);
+    }));
+
+
+    //  ------------------------------------------------
+    const originalSend = res.send.bind(res);
+
+    res.send = async (buffer) => {
+      const uploadDate = dayjs().format('DD-MM-YYYY');
+      const uploadTime = dayjs().format('HH-mm-ss');
+      const fileName = `mbq_${uploadTime}.xlsx`;
+
+      const tempFilePath = path.join(os.tmpdir(), fileName);
+
+      try {
+        // 1️⃣ Write buffer to temp file
+        fs.writeFileSync(tempFilePath, buffer);
+
+        // 2️⃣ Create multipart form with REAL FILE
+        const formData = new FormData();
+        formData.append(
+          'file',
+          fs.createReadStream(tempFilePath),
+          fileName
+        );
+
+        // 3️⃣ Upload using node-fetch
+        const response = await fetch(
+          `${JSON.parse(process.env.LAMBDAURL).mbqFileUpload}` +
+          `?date=${uploadDate}&filename=${encodeURIComponent(fileName)}`,
+          {
+            method: 'POST',
+            body: formData,
+            headers: formData.getHeaders()
+          }
+        );
+
+        const resultText = await response.text();
+
+        if (response.ok) {
+          logger.info({
+            functionName: 'MBQUploadSuccess',
+            fileName,
+            uploadDate,
+            result: resultText
+          });
+        } else {
+          logger.error({
+            functionName: 'MBQUploadFailed',
+            status: response.status,
+            fileName,
+            uploadDate,
+            result: resultText
+          });
+        }
+
+      } catch (err) {
+        logger.error({
+          functionName: 'MBQUploadError',
+          fileName,
+          uploadDate,
+          error: err
+        });
+      } finally {
+        // 4️⃣ Cleanup temp file
+        if (fs.existsSync(tempFilePath)) {
+          fs.unlinkSync(tempFilePath);
+        }
+      }
+
+      // 5️⃣ Continue normal download
+      return originalSend(buffer);
+    };
+
+
+    //  ------------------------------------------------
+
+    if (!data.length) {
+      return res.sendError('No data available for export', 204);
+    }
+
+    await download(data, res);
+  } catch (e) {
+    logger.error({ functionName: "getstoreMBQFixtureExcel", error: e });
+    return res.sendError(e, 500);
   }
 }
+

package/src/controllers/storeBuilder.controller.js

@@ -27,8 +27,8 @@ import * as fixtureConfigDuplicateService from '../service/fixtureConfigDuplicat
 import * as planoVmDuplicateService from '../service/planoVmDuplicate.service.js';
 import advancedFormat from 'dayjs/plugin/advancedFormat.js';
 import * as planoRevisionService from '../service/planoRevision.service.js';
-import xlsx from 'xlsx';
-import fs from 'fs';
+// import xlsx from 'xlsx';
+// import fs from 'fs';
 
 dayjs.extend( advancedFormat );
 dayjs.extend( utc );
@@ -2794,7 +2794,7 @@ export async function storeFixturesv2( req, res ) {
         planograms.map( async ( planogram ) => {
           const floors = await storeBuilderService.find(
               { planoId: planogram._id, ...( req.body?.floorId && { _id: req.body.floorId } ) },
-              { floorName: 1, layoutPolygon: 1, planoId: 1, isEdited: 1, planoProgress: 1, updatedAt: 1, verificationStatus: 1, merchRolloutStatus: 1, vmRolloutStatus: 1, cadLayout: 1 },
+              { floorName: 1, layoutPolygon: 1, planoId: 1, isEdited: 1, planoProgress: 1, updatedAt: 1, verificationStatus: 1, merchRolloutStatus: 1, vmRolloutStatus: 1, cadLayout: 1,isPlanoApproved:1 },
           );
 
           const floorsWithFixtures = await Promise.all(
@@ -5732,6 +5732,7 @@ export async function planoList( req, res ) {
           planoTask: { $ifNull: [ '$planoTask', [] ] },
           layoutCount: 1,
           layoutStatus: 1,
+          planoStrategy: 1,
           taskDetails: {
             $let: {
               vars: {
@@ -6132,6 +6133,7 @@ export async function planoList( req, res ) {
           'Store Capacity': ele?.fixtureCapacity ?? 0,
           'Last update': ele?.lastUpdate ? dayjs( ele.lastUpdate ).format( 'MMM DD, YYYY' ) : '--',
           'Planogram Status': ( ele?.taskDetails.fixtureStatus == 'complete' && ele?.taskDetails.layoutStatus == 'complete' && ele.layoutStatus.includes( false ) ) ? 'Yet to Publish' : !ele.layoutStatus.includes( false ) ? 'Published' : fixtureStatus,
+          'Store Type': ele?.planoStrategy,
         } );
       } );
       return await download( exportData, res );

package/src/controllers/task.controller.js

@@ -13,8 +13,6 @@ import mongoose from 'mongoose';
 const ObjectId = mongoose.Types.ObjectId;
 import * as floorService from '../service/storeBuilder.service.js';
 import * as planoStaticService from '../service/planoStaticData.service.js';
-import * as assignService from '../service/assignService.service.js';
-import * as taskAssignService from '../service/assignService.service.js';
 import * as storeBuilderService from '../service/storeBuilder.service.js';
 import * as storeFixtureService from '../service/storeFixture.service.js';
 import * as fixtureShelfService from '../service/fixtureShelf.service.js';
@@ -179,7 +177,7 @@ export async function createTask( req, res ) {
       endDate = dayjs().add( days, 'day' ).format( 'YYYY-MM-DD' );
       endDate = `${endDate} ${scheduleEndTime}`;
       if ( !req.body?.stores?.length ) {
-        let assignQuery = [
+        let storeQuery = [
           {
             $addFields: {
               store: { $toLower: '$storeName' },
@@ -187,53 +185,26 @@ export async function createTask( req, res ) {
           },
           {
             $match: {
-              client_id: req.body.clientId,
+              clientId: req.body.clientId,
               store: req.body.store.toLowerCase(),
             },
           },
           {
-            $sort: {
-              _id: -1,
+            $project: {
+              spocDetails: 1,
             },
           },
-          {
-            $limit: 1,
-          },
         ];
-        let getUserDetails = await assignService.aggregate( assignQuery );
-        if ( !getUserDetails.length ) {
-          getUserDetails = await taskAssignService.taskAggregate( assignQuery );
-          if ( !getUserDetails.length ) {
-            let storeQuery = [
-              {
-                $addFields: {
-                  store: { $toLower: '$storeName' },
-                },
-              },
-              {
-                $match: {
-                  clientId: req.body.clientId,
-                  store: req.body.store.toLowerCase(),
-                },
-              },
-              {
-                $project: {
-                  spocDetails: 1,
-                },
-              },
-            ];
-            let getEmail = await storeService.aggregate( storeQuery );
-            if ( getEmail.length ) {
-              getUserDetails = [ { storeName: req.body.store, userEmail: getEmail?.[0]?.spocDetails?.[0]?.email } ];
-            }
-          }
+        let getEmail = await storeService.aggregate( storeQuery );
+        if ( getEmail.length ) {
+          let getUserDetails = [ { storeName: req.body.store, userEmail: getEmail?.[0]?.spocDetails?.[0]?.email } ];
+          req.body.stores = [
+            {
+              store: getUserDetails[0].storeName,
+              email: req.body?.email ? req.body.email : getUserDetails[0].userEmail,
+            },
+          ];
         }
-        req.body.stores = [
-          {
-            store: getUserDetails[0].storeName,
-            email: req.body?.email ? req.body.email : getUserDetails[0].userEmail,
-          },
-        ];
       }
       storeList = req.body.stores.map( ( ele ) => ele.store.toLowerCase() );
       let userEmailList = [ ...new Set( req.body.stores.map( ( ele ) => ele.email ) ) ];

package/src/routes/managePlano.routes.js

@@ -28,4 +28,5 @@ managePlanoRouter
     .post('/getRolloutFeedbackv2', isAllowedSessionHandler, managePlanoController.getRolloutFeedbackv2)
     .post('/updateRolloutStatus', isAllowedSessionHandler, managePlanoController.updateRolloutStatus)
     .post('/getPlanoStoreVideoParams', isAllowedSessionHandler, managePlanoController.getPlanoStoreVideoPageParams)
+    .post('/approvePlanoLayout', isAllowedSessionHandler, managePlanoController.approvePlanoLayout)
     .post('/createPlanoFromCAD', isAllowedSessionHandler, managePlanoController.createPlanoFromCAD);