tango-app-api-store-builder 1.0.35 → 1.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.35",
+    "version": "1.0.37",
     "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.5.26",
+        "tango-api-schema": "^2.5.23",
         "tango-app-api-middleware": "3.1.48",
         "url": "^0.11.4",
         "winston": "^3.17.0",

package/src/controllers/managePlano.controller.js

@@ -125,6 +125,7 @@ export async function getplanoFeedback( req, res ) {
           let data = {};
           if ( aiDetails?.body?.hits?.hits.length ) {
             data = aiDetails?.body?.hits?.hits?.[0]?._source;
+            console.log( data, 'data' );
             delete data.isEmpty;
             delete data.fixtureFound;
           }
@@ -786,7 +787,6 @@ export async function updateStorePlano( req, res ) {
         { _id: new mongoose.Types.ObjectId( floorId ) },
         {
           layoutPolygon: layoutPolygon,
-          cadLayout:false,
           ...( req.body?.editMode === true && { isEdited: true } ),
         },
     );
@@ -1782,6 +1782,7 @@ export async function getAllPlanoRevisions( req, res ) {
 
     res.sendSuccess( revisions );
   } catch ( e ) {
+    console.log( e );
     logger.error( { functionName: 'getAllPlanoRevisions', error: e } );
     res.sendError( 'Failed to fetch plano revisions', 500 );
   }
@@ -2369,15 +2370,15 @@ export async function createPlanoFromCAD(req, res) {
     const file = req.files.file;
     const { storeId, floorNumber } = req.body;
 
-    if (!req?.files?.file) return res.sendError({ errMsg: 'File is required' }, 400);
+    if (!req?.files?.file) return res.sendError('File is required', 400);
 
-    if (!storeId || !floorNumber) return res.sendError({ errMsg: 'storeId and floorNumber are required' }, 400);
+    if (!storeId || !floorNumber) return res.sendError('storeId and floorNumber are required', 400);
 
-    if (!file.name.endsWith('.dxf')) return res.sendError({ errMsg: 'Only DXF files are allowed' }, 400);
+    if (!file.name.endsWith('.dxf')) return res.sendError('Only DXF files are allowed', 400);
 
 
     // if (file.size > 20 * 1024 * 1024) {
-    //   return res.sendError({errMsg:'File size exceeds 20MB limit'}, 400);
+    //   return res.sendError('File size exceeds 20MB limit', 400);
     // }
 
     // File Upload
@@ -2391,7 +2392,7 @@ export async function createPlanoFromCAD(req, res) {
 
     const fileRes = await fileUpload(fileUploadPayload);
 
-    if (!fileRes?.Key) return res.sendError({ errMsg: 'Failed to upload file to storage' }, 502);
+    if (!fileRes?.Key) return res.sendError('Failed to upload file to storage', 502);
 
     // CAD Extraction
     const dataExtractPayload = {
@@ -2411,7 +2412,7 @@ export async function createPlanoFromCAD(req, res) {
     if (!cadRes.ok) {
       const errorText = await cadRes.text();
       logger.error({ cadLambdaError: errorText });
-      return res.sendError({ errMsg: 'CAD extraction service failed' }, 502);
+      return res.sendError('CAD extraction service failed', 502);
     }
 
     const cadData = await cadRes.json();
@@ -2425,11 +2426,7 @@ export async function createPlanoFromCAD(req, res) {
       cadData?.status !== 'success' ||
       !cadData?.data?.layoutPolygon
     ) {
-      return res.sendError(
-        {
-          errMsg: 'Invalid CAD layout data',
-          errInfo: { cadData, input: dataExtractPayload }
-        }, 502);
+      return res.sendError('Invalid CAD layout data', 502);
     }
 
     const userMeta = {
@@ -2443,7 +2440,7 @@ export async function createPlanoFromCAD(req, res) {
 
     if (!planoData) {
       const storeData = await storeService.findOne({ storeId }, { clientId: 1, storeName: 1 });
-      if (!storeData) return res.sendError({ errMsg: 'Unable to find the store to create planogram' }, 400);
+      if (!storeData) return res.sendError('Unable to find the store to create planogram', 400);
 
       const newPlano = {
         clientId: storeData.clientId,
@@ -2459,7 +2456,7 @@ export async function createPlanoFromCAD(req, res) {
       };
 
       planoData = await planoService.create(newPlano);
-      if (!planoData) return res.sendError({ errMsg: 'Failed to create new planogram' }, 400);
+      if (!planoData) return res.sendError('Failed to create new planogram', 400);
     }
 
     const floorPayload = {
@@ -2487,7 +2484,7 @@ export async function createPlanoFromCAD(req, res) {
       };
 
       floorData = await floorService.create(newFloor);
-      if (!floorData) return res.sendError({ errMsg: 'Failed to create new floor layout' }, 400);
+      if (!floorData) return res.sendError('Failed to create new floor layout', 400);
     }
 
     const meta = {
@@ -2500,17 +2497,13 @@ export async function createPlanoFromCAD(req, res) {
 
     // Create Fixtures
     const processedFixtures = createStoreFixtures(cadData.data, meta);
-    const storeFixtures = []
+
     try {
       await storeFixtureService.deleteMany({ floorId: meta.floorId });
       await fixtureShelfService.deleteMany({ floorId: meta.floorId });
       for (let i = 0; i < processedFixtures.length; i++) {
         const fix = processedFixtures[i];
-        const fixRes = await storeFixtureService.create(fix);
-        if (fixRes) {
-          const fixture = fixRes.toObject();
-          storeFixtures.push({ ...fixture, shelfConfig: fix.shelfConfig });
-        }
+        await storeFixtureService.create(fix);
       }
     } catch (e) {
       logger.error({
@@ -2519,18 +2512,6 @@ export async function createPlanoFromCAD(req, res) {
       });
     }
 
-
-    try {
-      const updateStoreFixtures = await processFixtureTemplates({ fixtures: storeFixtures });
-
-      if (updateStoreFixtures.length) await storeFixtureService.bulkUpsert(updateStoreFixtures);
-    } catch (e) {
-      logger.error({
-        functionName: 'createPlanoFromCAD [Update Fixtures]',
-        error: e,
-      });
-    }
-
     return res.sendSuccess(meta);
 
   } catch (error) {
@@ -2539,7 +2520,7 @@ export async function createPlanoFromCAD(req, res) {
       error,
     });
 
-    return res.sendError({ errMsg: 'Failed to create planogram.' }, 500);
+    return res.sendError('Failed to create planogram.', 500);
   }
 }
 
@@ -2617,13 +2598,11 @@ function processFixtureData(data) {
     fixtureWidth: f?.fixtureWidth,
     fixtureLength: f?.fixtureLength,
     fixtureNumber: f?.fixtureNumber,
-    templateGroupName: f?.templateGroupName ?? f?.header?.label,
-    fixtureCategory: f?.fixtureCategory,
     associatedElementNumber: data?.wallNumber,
     associatedElementFixtureNumber: data.fixtureNumber,
     associatedElementType: f?.associatedElementType === 'wall' ? 'wall' : undefined,
     productBrandName: Array.isArray(f?.productBrandName) ? f?.productBrandName?.map(normalizeCadText) : normalizeCadText(f?.productBrandName),
-    shelfConfig: f?.shelfConfig ?? [],
+
     fixtureHeight: {
       value: 0,
       unit: 'mm',
@@ -2641,114 +2620,4 @@ function processFixtureData(data) {
     isMerchEdited: false,
     isVmEdited: false,
   };
-}
-
-async function processFixtureTemplates(data) {
-  const updateStoreFixtures = [];
-  const newFixtureTemplates = [];
-
-  for (let i = 0; i < data.fixtures.length; i++) {
-    let fixture = data.fixtures[i];
-    const mapKey = `${fixture.fixtureCategory}${fixture.fixtureWidth.value}${fixture.fixtureWidth.unit}${fixture.header.label}`;
-
-    const subTemplateQuery = [
-      {
-        $addFields: {
-          crestMapKey: { $toLower: '$crestMapKey' },
-        },
-      },
-      {
-        $match: {
-          crestMapKey: mapKey.toLowerCase(),
-          templateType: 'sub',
-        },
-      },
-    ];
-
-    const masterTemplateQuery = [
-      {
-        $addFields: {
-          crestMapKey: { $toLower: '$crestMapKey' },
-        },
-      },
-      {
-        $match: {
-          crestMapKey: mapKey.toLowerCase(),
-          templateType: 'master',
-        },
-      },
-    ];
-
-    let [subTemplate, masterTemplate] = await Promise.all([
-      await fixtureConfigService.aggregate(subTemplateQuery),
-      await fixtureConfigService.aggregate(masterTemplateQuery),
-    ]);
-
-
-    if (!subTemplate?.length) {
-      const templateGroupName = fixture.header.label;
-      let templateIndex = 1;
-
-      let newTemplateData = {
-        ...fixture,
-        templateGroupName: templateGroupName,
-        status: 'complete',
-        templateIndex: masterTemplate.length ? masterTemplate.length + 1 : 1,
-        crestMapKey: mapKey,
-      }
-
-      delete newTemplateData._id;
-
-      if (!masterTemplate.length) {
-        const newMasterTemplate = {
-          ...newTemplateData,
-          fixtureName: `${newTemplateData?.header?.label}-${newTemplateData?.fixtureCategory}`,
-          templateType: 'master',
-          crestMapKey: mapKey,
-        }
-        masterTemplate = await fixtureConfigService.create(newMasterTemplate);
-      } else {
-        masterTemplate = masterTemplate[0];
-
-        const masterTempIndexQuery = [
-          {
-            $match: {
-              masterTemplateId: new mongoose.Types.ObjectId(masterTemplate._id),
-            },
-          }, {
-            $group: {
-              _id: '',
-              tempId: { $max: '$templateIndex' },
-            },
-          },
-        ];
-
-        const getMaxTempIndex = await fixtureConfigService.aggregate(masterTempIndexQuery);
-        templateIndex = getMaxTempIndex?.[0]?.tempId + 1;
-      }
-
-      newTemplateData.fixtureName = `${fixture?.header?.label}-${fixture?.fixtureCategory}-${fixture?.fixtureWidth?.value}-${fixture?.fixtureWidth?.unit}-variant-${templateIndex}`;
-      newTemplateData.templateType = 'sub';
-      newTemplateData.masterTemplateId = masterTemplate._id;
-      newTemplateData.templateIndex = templateIndex;
-      newTemplateData.createdAt = new Date();
-      newTemplateData.updatedAt = new Date();
-
-      subTemplate = await fixtureConfigService.create(newTemplateData);
-
-      fixture.fixtureConfigId = subTemplate._id;
-      fixture.masterTemplateId = masterTemplate._id;
-      fixture.fixtureName = newTemplateData.fixtureName;
-    } else {
-      const sub = subTemplate?.[0];
-      fixture.fixtureName = sub.fixtureName;
-      fixture.fixtureConfigId = sub?._id;
-      fixture.masterTemplateId = sub?.masterTemplateId;
-    }
-
-    newFixtureTemplates.push(subTemplate);
-    updateStoreFixtures.push(fixture);
-  }
-
-  return updateStoreFixtures;
 }

package/src/controllers/script.controller.js

@@ -18687,3 +18687,47 @@ export async function getFxCode( req, res ) {
   }
 }
 
+export async function getFixtureDetails( req, res ) {
+  try {
+    if ( !req.body?.storeName ) {
+      return res.sendError( 'StoreName is required', 400 );
+    }
+
+    let query = [
+      {
+        $match: {
+          storeName: req.body?.storeName,
+          fixtureType: { $ne: 'other' },
+        },
+      },
+      {
+        $sort: {
+          fixtureNumber: 1,
+        },
+      },
+      {
+        $group: {
+          _id: '',
+          fixtureData: { $push: {
+            k: { $concat: [ 'Fixture', ' ', { $toString: '$fixtureNumber' } ] },
+            v: '$header.label',
+          },
+          },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          fixtureData: {
+            $arrayToObject: '$fixtureData',
+          },
+        },
+      },
+    ];
+    let fixtureDetails = await storeFixtureService.aggregate( query );
+    return res.sendSuccess( fixtureDetails?.[0]?.fixtureData ?? {} );
+  } catch ( e ) {
+    logger.error( { functionName: "getFixtureDetails", error: e } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/routes/script.routes.js

@@ -2,6 +2,8 @@ import express from 'express';
 
 import * as scriptController from '../controllers/script.controller.js';
 
+import { isAllowedInternalAPIHandler } from 'tango-app-api-middleware';
+
 export const scriptRouter = express.Router();
 
 scriptRouter
@@ -45,4 +47,5 @@ scriptRouter
     .post( '/getmisMatchedGroup', scriptController.getmisMatchedGroup )
     .post( '/updateProduct', scriptController.updateProduct )
     .post( '/getFxCode', scriptController.getFxCode )
+    .post( '/getFixtureDetails', isAllowedInternalAPIHandler, scriptController.getFixtureDetails )
 ;