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

package/package.json

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

package/src/controllers/managePlano.controller.js

@@ -125,7 +125,6 @@ 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;
           }
@@ -787,6 +786,7 @@ export async function updateStorePlano( req, res ) {
         { _id: new mongoose.Types.ObjectId( floorId ) },
         {
           layoutPolygon: layoutPolygon,
+          cadLayout:false,
           ...( req.body?.editMode === true && { isEdited: true } ),
         },
     );
@@ -1782,7 +1782,6 @@ 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 );
   }
@@ -2370,15 +2369,15 @@ export async function createPlanoFromCAD(req, res) {
     const file = req.files.file;
     const { storeId, floorNumber } = req.body;
 
-    if (!req?.files?.file) return res.sendError('File is required', 400);
+    if (!req?.files?.file) return res.sendError({ errMsg: 'File is required' }, 400);
 
-    if (!storeId || !floorNumber) return res.sendError('storeId and floorNumber are required', 400);
+    if (!storeId || !floorNumber) return res.sendError({ errMsg: 'storeId and floorNumber are required' }, 400);
 
-    if (!file.name.endsWith('.dxf')) return res.sendError('Only DXF files are allowed', 400);
+    if (!file.name.endsWith('.dxf')) return res.sendError({ errMsg: 'Only DXF files are allowed' }, 400);
 
 
     // if (file.size > 20 * 1024 * 1024) {
-    //   return res.sendError('File size exceeds 20MB limit', 400);
+    //   return res.sendError({errMsg:'File size exceeds 20MB limit'}, 400);
     // }
 
     // File Upload
@@ -2392,7 +2391,7 @@ export async function createPlanoFromCAD(req, res) {
 
     const fileRes = await fileUpload(fileUploadPayload);
 
-    if (!fileRes?.Key) return res.sendError('Failed to upload file to storage', 502);
+    if (!fileRes?.Key) return res.sendError({ errMsg: 'Failed to upload file to storage' }, 502);
 
     // CAD Extraction
     const dataExtractPayload = {
@@ -2412,7 +2411,7 @@ export async function createPlanoFromCAD(req, res) {
     if (!cadRes.ok) {
       const errorText = await cadRes.text();
       logger.error({ cadLambdaError: errorText });
-      return res.sendError('CAD extraction service failed', 502);
+      return res.sendError({ errMsg: 'CAD extraction service failed' }, 502);
     }
 
     const cadData = await cadRes.json();
@@ -2426,7 +2425,11 @@ export async function createPlanoFromCAD(req, res) {
       cadData?.status !== 'success' ||
       !cadData?.data?.layoutPolygon
     ) {
-      return res.sendError('Invalid CAD layout data', 502);
+      return res.sendError(
+        {
+          errMsg: 'Invalid CAD layout data',
+          errInfo: { cadData, input: dataExtractPayload }
+        }, 502);
     }
 
     const userMeta = {
@@ -2440,7 +2443,7 @@ export async function createPlanoFromCAD(req, res) {
 
     if (!planoData) {
       const storeData = await storeService.findOne({ storeId }, { clientId: 1, storeName: 1 });
-      if (!storeData) return res.sendError('Unable to find the store to create planogram', 400);
+      if (!storeData) return res.sendError({ errMsg: 'Unable to find the store to create planogram' }, 400);
 
       const newPlano = {
         clientId: storeData.clientId,
@@ -2456,7 +2459,7 @@ export async function createPlanoFromCAD(req, res) {
       };
 
       planoData = await planoService.create(newPlano);
-      if (!planoData) return res.sendError('Failed to create new planogram', 400);
+      if (!planoData) return res.sendError({ errMsg: 'Failed to create new planogram' }, 400);
     }
 
     const floorPayload = {
@@ -2484,7 +2487,7 @@ export async function createPlanoFromCAD(req, res) {
       };
 
       floorData = await floorService.create(newFloor);
-      if (!floorData) return res.sendError('Failed to create new floor layout', 400);
+      if (!floorData) return res.sendError({ errMsg: 'Failed to create new floor layout' }, 400);
     }
 
     const meta = {
@@ -2497,13 +2500,17 @@ 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];
-        await storeFixtureService.create(fix);
+        const fixRes = await storeFixtureService.create(fix);
+        if (fixRes) {
+          const fixture = fixRes.toObject();
+          storeFixtures.push({ ...fixture, shelfConfig: fix.shelfConfig });
+        }
       }
     } catch (e) {
       logger.error({
@@ -2512,6 +2519,18 @@ 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) {
@@ -2520,7 +2539,7 @@ export async function createPlanoFromCAD(req, res) {
       error,
     });
 
-    return res.sendError('Failed to create planogram.', 500);
+    return res.sendError({ errMsg: 'Failed to create planogram.' }, 500);
   }
 }
 
@@ -2598,11 +2617,13 @@ 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',
@@ -2620,4 +2641,114 @@ 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/storeBuilder.controller.js

@@ -9055,7 +9055,7 @@ async function convertFixtureStructure( req ) {
                   centerFixture: centerFixturesWithStatus,
                   otherElements: otherElements,
                   lastUpdate: dayjs( floor?.updatedAt ).format( 'Do MMMM YYYY hh:mm A' ),
-                  ...( floors.length > 1 ) ? { floorNum: `Floor ${index + 1}/${floors.length}` } : { floorNum: 'Floor 1' },
+                  ...( floors.length > 1 ) ? { floorNum: `Floor ${floor?.floorNumber ?? index + 1}/${floors.length}` } : { floorNum: `Floor ${floor?.floorNumber ?? 1}` },
                 };
 
                 let planoProductCount = 0;