tango-app-api-store-builder 1.0.0-beta-132 → 1.0.0-beta-134

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-132",
+    "version": "1.0.0-beta-134",
     "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.2.166",
+        "tango-api-schema": "^2.2.173",
         "tango-app-api-middleware": "3.1.48",
         "url": "^0.11.4",
         "winston": "^3.17.0",

package/src/controllers/fixtureTemplate.controller.js

@@ -78,9 +78,8 @@ export async function updateTemplate( req, res ) {
     if ( !templateDetails ) {
       return res.sendError( 'No data found', 204 );
     }
-    if ( inputData.status == 'active' ) {
+    if ( inputData.status == 'complete' ) {
       let newFixture;
-      let storeList = inputData.store;
       delete inputData.store;
       if ( req.body?.new ) {
         templateDetails = templateDetails.toObject();
@@ -88,44 +87,53 @@ export async function updateTemplate( req, res ) {
         let templateData = { ...templateDetails, ...inputData };
         newFixture = await fixtureConfigService.create( templateData );
       }
-      await Promise.all( storeList.map( async ( ele ) => {
-        let fixtureCapacity = inputData.shelfConfig.reduce(
-            ( acc, ele ) => acc + ele.productPerShelf,
-            0,
-        );
-        let storeFixtureDetails = await storeFixtureService.findOne( { storeId: ele.storeId, fixtureConfigId: req.params.templateId } );
+      let fixtureCapacity = inputData.shelfConfig.reduce( ( acc, ele ) => {
+        if ( ele.shelfType == 'tray' ) {
+          ele.productPerShelf = ele.trayRows * ele.productPerShelf;
+        }
+        acc = acc + ele.productPerShelf;
+        return acc;
+      },
+      0 );
+
+      let storeFixtureDetails = await storeFixtureService.find( { fixtureConfigId: req.params.templateId } );
+      if ( storeFixtureDetails.length ) {
+        let fixtureList = storeFixtureDetails.map( ( ele ) => ele._id );
         let fixtureData = {
           ...inputData,
-          storeName: ele.storeName,
-          storeId: ele.storeId,
           fixtureCapacity: fixtureCapacity,
-          fixtureConfigId: newFixture ? newFixture._id : storeFixtureDetails.fixtureConfigId,
+          fixtureConfigId: newFixture ? newFixture._id : req.params.templateId,
         };
-        await storeFixtureService.updateOne( { _id: storeFixtureDetails._id }, fixtureData );
-        await fixtureShelfService.deleteMany( { fixtureId: storeFixtureDetails._id } );
-        let shelfData = [];
-        inputData.shelfConfig.forEach( ( ele, index ) => {
-          shelfData.push( {
-            productCategory: inputData.productCategory,
-            productSubCategory: inputData.productCategory,
-            shelfType: ele.shelfType,
-            trayRows: ele.trayRows,
-            shelfNumber: index + 1,
-            fixtureId: storeFixtureDetails._id,
-            clientId: req.body.clientId,
-            planoId: storeFixtureDetails.planoId,
-            floorId: storeFixtureDetails.floorId,
-            productBrandName: ele.productBrandName,
-            shelfOrder: 'LTR',
-            shelfSplitup: 0,
-            storeId: storeFixtureDetails.storeId,
-            storeName: storeFixtureDetails.storeName,
-            productPerShelf: ele.productPerShelf,
-            sectionZone: ele.zone,
+        delete fixtureData._id;
+        delete fixtureData.status;
+        await storeFixtureService.updateMany( { _id: { $in: fixtureList } }, fixtureData );
+        await Promise.all( storeFixtureDetails.map( async ( fixture ) => {
+          await fixtureShelfService.deleteMany( { fixtureId: fixture } );
+          let shelfData = [];
+          inputData.shelfConfig.forEach( ( ele, index ) => {
+            shelfData.push( {
+              productCategory: inputData.productCategory,
+              productSubCategory: inputData.productCategory,
+              shelfType: ele.shelfType,
+              trayRows: ele.trayRows,
+              shelfNumber: index + 1,
+              fixtureId: fixture,
+              clientId: req.body.clientId,
+              planoId: fixture.planoId,
+              floorId: fixture.floorId,
+              productBrandName: ele.productBrandName,
+              shelfOrder: 'LTR',
+              shelfSplitup: 0,
+              storeId: fixture.storeId,
+              storeName: fixture.storeName,
+              productPerShelf: ele.productPerShelf,
+              sectionZone: ele.zone,
+              zone: ele.zone,
+            } );
           } );
-        } );
-        await fixtureShelfService.insertMany( shelfData );
-      } ) );
+          await fixtureShelfService.insertMany( shelfData );
+        } ) );
+      }
     }
     await fixtureConfigService.updateOne( { _id: req.params.templateId }, inputData );
     return res.sendSuccess( 'Fixture template details updated successfully' );
@@ -473,3 +481,17 @@ export async function updateFixtureTask( req, res ) {
     logger.error( { functionName: 'updateFixtureTask', error: e } );
   }
 }
+
+export async function getAllTemplates( req, res ) {
+  try {
+    if ( !req.body.clientId ) {
+      return res.sendError( 'Client Id is required', 400 );
+    }
+
+    const fixtureTemplates = await fixtureConfigService.find( { clientId: req.body.clientId }, { fixtureName: 1, fixtureWidth: 1, productBrandName: 1 } );
+
+    res.sendSuccess( fixtureTemplates );
+  } catch ( e ) {
+    logger.error( { functionName: 'getAllTemplates', error: e } );
+  }
+}

package/src/controllers/managePlano.controller.js

@@ -13,12 +13,13 @@ import * as planoproductCategoryService from '../service/planoproductCategory.se
 import * as fixtureConfigService from '../service/fixtureConfig.service.js';
 import * as fixtureLibraryService from '../service/planoLibrary.service.js';
 import * as planoTaskService from '../service/planoTask.service.js';
+import * as planoGlobalCommentService from '../service/planoGlobalComment.service.js';
 import mongoose from 'mongoose';
+import * as planoRevisionService from '../service/planoRevision.service.js';
 export async function getplanoFeedback( req, res ) {
   try {
     let query = [];
 
-
     query.push( {
       $match: {
         planoId: new mongoose.Types.ObjectId( req.body.planoId ),
@@ -376,8 +377,25 @@ export async function getplanoFeedback( req, res ) {
 
 
     let findvmCompliance = await planoTaskService.aggregate( queryVm );
-    console.log( findvmCompliance );
-    res.sendSuccess( { count: findfixtureCompliance.length, layoutData: findPlanoCompliance, fixtureData: findfixtureCompliance, VmData: findvmCompliance } );
+
+
+    let layoutComment = await planoGlobalCommentService.find( {
+      planoId: new mongoose.Types.ObjectId( req.body.planoId ),
+      floorId: new mongoose.Types.ObjectId( req.body.floorId ),
+      taskType: 'layout',
+    } );
+    let fixtureComment = await planoGlobalCommentService.find( {
+      planoId: new mongoose.Types.ObjectId( req.body.planoId ),
+      floorId: new mongoose.Types.ObjectId( req.body.floorId ),
+      taskType: 'fixture',
+    } );
+    let vmComment = await planoGlobalCommentService.find( {
+      planoId: new mongoose.Types.ObjectId( req.body.planoId ),
+      floorId: new mongoose.Types.ObjectId( req.body.floorId ),
+      taskType: 'vm',
+    } );
+
+    res.sendSuccess( { layoutData: findPlanoCompliance, layoutComment: layoutComment, fixtureComment: fixtureComment, vmComment: vmComment, fixtureData: findfixtureCompliance, VmData: findvmCompliance } );
   } catch ( e ) {
     logger.error( { functionName: 'getplanoFeedback', error: e, message: req.body } );
     return res.sendError( e, 500 );
@@ -804,3 +822,106 @@ export async function updateredostatus( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+
+
+export async function updateGlobalComment( req, res ) {
+  try {
+    await planoGlobalCommentService.create( {
+      userId: req.user._id,
+      userName: req.user.userName,
+      comment: req.body.comment,
+      responsetype: req.body.responsetype,
+      planoId: new mongoose.Types.ObjectId( req.body.planoId ),
+      floorId: new mongoose.Types.ObjectId( req.body.floorId ),
+      taskType: req.body.taskType,
+      clientId: req.body.clientId,
+    } );
+
+    res.sendSuccess( 'updated successfully' );
+  } catch ( e ) {
+    logger.error( { functionName: 'updateGlobalComment', error: e } );
+    return res.sendError( e, 500 );
+  }
+}
+export async function getGlobalComment( req, res ) {
+  try {
+    let layoutComment = await planoGlobalCommentService.find( {
+      planoId: new mongoose.Types.ObjectId( req.body.planoId ),
+      floorId: new mongoose.Types.ObjectId( req.body.floorId ),
+      taskType: req.body.taskType,
+    } );
+    res.sendSuccess( layoutComment );
+  } catch ( e ) {
+    logger.error( { functionName: 'getGlobalComment', error: e } );
+    return res.sendError( e, 500 );
+  }
+}
+
+export async function getAllPlanoRevisions( req, res ) {
+  try {
+    const { clientId } = req.body;
+
+    if ( !clientId ) {
+      return res.sendError( 'Client Id is required', 400 );
+    }
+
+    const revisions = await planoRevisionService.find(
+        { clientId },
+        { storeName: 1, storeId: 1, planoId: 1, floorId: 1, createdAt: 1 },
+    );
+
+    res.sendSuccess( revisions );
+  } catch ( e ) {
+    logger.error( { functionName: 'getAllPlanoRevisions', error: e } );
+    res.sendError( 'Failed to fetch plano revisions', 500 );
+  }
+}
+
+export async function createPlanoRevision( req, res ) {
+  try {
+    const { storeName, storeId, clientId, planoId, floorId, floorData } = req.body;
+
+    if ( !storeName || !storeId || !clientId || !planoId || !floorId || !floorData ) {
+      return res.sendError( 'Missing required fields', 400 );
+    }
+
+    const newRevision = await planoRevisionService.create( {
+      storeName,
+      storeId,
+      clientId,
+      planoId,
+      floorId,
+      floorData,
+    } );
+
+    res.sendSuccess( newRevision );
+  } catch ( e ) {
+    logger.error( { functionName: 'createPlanoRevision', error: e } );
+    res.sendError( 'Failed to create plano revision', 500 );
+  }
+}
+
+export async function getPlanoRevisionById( req, res ) {
+  try {
+    const { id } = req.params;
+
+    if ( !id ) {
+      return res.sendError( 'Revision ID is required', 400 );
+    }
+
+    const revision = await planoRevisionService.findOne(
+        { _id: id },
+    );
+
+    if ( !revision ) {
+      return res.sendError( 'Plano revision not found', 404 );
+    }
+
+    res.sendSuccess( revision );
+  } catch ( e ) {
+    logger.error( { functionName: 'getPlanoRevisionById', error: e } );
+    res.sendError( 'Failed to fetch plano revision', 500 );
+  }
+}
+
+

package/src/controllers/planoLibrary.controller.js

@@ -92,7 +92,7 @@ export async function fixtureBulkUpload( req, res ) {
 
 async function getMaxFixtureLibCode() {
   try {
-    let getFixtureLibDetails = await planoLibraryService.find( {}, { fixtureLibCode: 1 } );
+    let getFixtureLibDetails = await planoLibraryService.find( { fixtureLibCode: { $exists: true } }, { fixtureLibCode: 1 } );
     if ( !getFixtureLibDetails.length ) {
       return 'FX01';
     } else {
@@ -242,7 +242,7 @@ export async function FixtureLibraryList( req, res ) {
     const matchStage = {
       clientId: req.body.clientId,
       ...( req.body?.searchValue ?
-    { fixtureCategory: { $regex: req.body.searchValue, $options: 'i' } } :
+    { $or: [ { fixtureCategory: { $regex: req.body.searchValue, $options: 'i' } }, { fixtureCategorySize: { $regex: req.body.searchValue, $options: 'i' } } ] } :
     {} ),
       ...( req.body?.filter?.type?.length ?
     { fixtureType: { $in: req.body.filter.type } } :
@@ -253,6 +253,13 @@ export async function FixtureLibraryList( req, res ) {
     };
 
     const query = [
+      {
+        $addFields: {
+          fixtureCategorySize: {
+            $concat: [ '$fixtureCategory', ' - ', { $toString: '$fixtureWidth.value' }, { $toString: '$fixtureWidth.unit' } ],
+          },
+        },
+      },
       { $match: matchStage },
       {
         $lookup: {
@@ -284,6 +291,7 @@ export async function FixtureLibraryList( req, res ) {
       },
       {
         $project: {
+          fixtureCategorySize: 1,
           fixtureWidth: 1,
           fixtureHeight: 1,
           fixtureLength: 1,
@@ -1397,7 +1405,7 @@ export async function vmBulkUpload( req, res ) {
 
 async function getMaxVMLibCode() {
   try {
-    let getVMLibDetails = await vmService.find( {}, { vmLibCode: 1 } );
+    let getVMLibDetails = await vmService.find( { vmLibCode: { $exists: true } }, { vmLibCode: 1 } );
     if ( !getVMLibDetails.length ) {
       return 'VM01';
     } else {

package/src/controllers/script.controller.js

@@ -2323,9 +2323,9 @@ export async function updateVmData( req, res ) {
 
 // import https from 'https';
 // async function scrapeCrest() {
-//   const storeIds = [ 'LKST3020' ];
+//   const storeIds = [ 'LKST506' ];
 //   const apiUrl = 'https://api.getcrest.ai/api/ms_shelfsensei/layout/';
-//   const bearerToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzUwMDU1OTMxLCJpYXQiOjE3NTAwNTIzMzEsImp0aSI6IjY5MGM1YTVhYjc3NDRlMmQ5YjlhMmZkYThhODM2MGYxIiwidXNlcl9pZCI6MTA4NSwiaWQiOjEwODUsImlzX21lZXNlZWtfYWNjb3VudCI6ZmFsc2UsImN1c3RvbWVyX2dyb3VwIjozOTgsImxpY2VuY2Vfc2NvcGVzIjpbeyJyZXNvdXJjZV9zZXQiOiJwcF9zZXQiLCJzY29wZV9yb2xlIjoiY29udHJpYnV0b3IifSx7InJlc291cmNlX3NldCI6ImRwX3NldCIsInNjb3BlX3JvbGUiOiJjb250cmlidXRvciJ9LHsicmVzb3VyY2Vfc2V0IjoiZGZfc2V0Iiwic2NvcGVfcm9sZSI6ImNvbnRyaWJ1dG9yIn0seyJyZXNvdXJjZV9zZXQiOiJkZWZhdWx0X3NldCIsInNjb3BlX3JvbGUiOiJjb250cmlidXRvciJ9XX0.juirYxGNCsCe75vwgL2AR9_LeFsr8r4cJmEdygRZGO0';
+//   const bearerToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzUwNjA1NDA1LCJpYXQiOjE3NTA2MDE4MDUsImp0aSI6IjAxZWJmNzRkYzNkODQ2MjliNTA4YzI0MjM3MDRiYjdlIiwidXNlcl9pZCI6MTA4NSwiaWQiOjEwODUsImlzX21lZXNlZWtfYWNjb3VudCI6ZmFsc2UsImN1c3RvbWVyX2dyb3VwIjozOTgsImxpY2VuY2Vfc2NvcGVzIjpbeyJyZXNvdXJjZV9zZXQiOiJwcF9zZXQiLCJzY29wZV9yb2xlIjoiY29udHJpYnV0b3IifSx7InJlc291cmNlX3NldCI6ImRwX3NldCIsInNjb3BlX3JvbGUiOiJjb250cmlidXRvciJ9LHsicmVzb3VyY2Vfc2V0IjoiZGZfc2V0Iiwic2NvcGVfcm9sZSI6ImNvbnRyaWJ1dG9yIn0seyJyZXNvdXJjZV9zZXQiOiJkZWZhdWx0X3NldCIsInNjb3BlX3JvbGUiOiJjb250cmlidXRvciJ9XX0.OnXe5ws08FwY1h0u3bLl8-dxQyrCL2mxr6c_b1lyf-Q';
 //   const filePath = 'response.json';
 //   let allResults = [];
 
@@ -7223,6 +7223,174 @@ export async function migrateCrestv1( req, res ) {
       }
     };
 
+    const getLibraryType = ( fixtureName ) => {
+      const parts = fixtureName
+          .split( ' - ' )
+          .map( ( str ) => str.trim() )
+          .filter( Boolean );
+
+      let category = 'Unknown';
+      let value = 3;
+
+      const last = parts[parts.length - 1];
+      const secondLast = parts[parts.length - 2];
+
+      const match = last?.match( /^([\d.]+)ft$/ );
+
+      if ( match && secondLast ) {
+        value = parseFloat( match[1] );
+        value = Math.round( value * 10 ) / 10;
+        if ( value % 1 === 0 ) value = Math.round( value );
+
+        category = secondLast;
+      } else {
+        if ( last?.toLowerCase() === 'ft' || last?.toLowerCase().endsWith( 'ft' ) ) {
+          category = secondLast || last;
+        } else {
+          category = last;
+        }
+
+        value = 3;
+      }
+
+      return {
+        fixtureCategory: category,
+        fixtureWidth: { value, unit: 'ft' },
+      };
+    };
+
+
+    const sampleLibrary = {
+      'clientId': '11',
+      'fixtureType': 'wall',
+      'fixtureHeight': {
+        'value': 0,
+        'unit': 'ft',
+      },
+      'fixtureLength': {
+        'value': 4,
+        'unit': 'ft',
+      },
+      'header': {
+        'height': {
+          'value': 0,
+          'unit': '',
+        },
+      },
+      'footer': {
+        'height': {
+          'value': 0,
+          'unit': '',
+        },
+      },
+      'fixtureCapacity': 90,
+      'status': 'complete',
+      'shelfConfig': [
+        {
+          'shelfNumber': 1,
+          'shelfType': 'shelf',
+          'shelfZone': 'Top',
+          'productPerShelf': 6,
+          'trayRows': 0,
+          'label': '',
+        },
+        {
+          'shelfNumber': 2,
+          'shelfType': 'shelf',
+          'shelfZone': 'Top',
+          'productPerShelf': 6,
+          'trayRows': 0,
+          'label': '',
+        },
+        {
+          'shelfNumber': 3,
+          'shelfType': 'shelf',
+          'shelfZone': 'Top',
+          'productPerShelf': 6,
+          'trayRows': 0,
+          'label': '',
+        },
+        {
+          'shelfNumber': 4,
+          'shelfType': 'tray',
+          'shelfZone': 'Mid',
+          'productPerShelf': 6,
+          'trayRows': 3,
+          'label': '',
+        },
+        {
+          'shelfNumber': 5,
+          'shelfType': 'tray',
+          'shelfZone': 'Mid',
+          'productPerShelf': 6,
+          'trayRows': 3,
+          'label': '',
+        },
+        {
+          'shelfNumber': 6,
+          'shelfType': 'tray',
+          'shelfZone': 'Bottom',
+          'productPerShelf': 6,
+          'trayRows': 3,
+          'label': '',
+        },
+        {
+          'shelfNumber': 7,
+          'shelfType': 'tray',
+          'shelfZone': 'Bottom',
+          'productPerShelf': 6,
+          'trayRows': 3,
+          'label': '',
+        },
+      ],
+      'vmConfig': [
+        {
+          'vmNumber': 1,
+          'vmHeightmm': 100,
+          'vmWidthmm': 905,
+          'startShelf': 1,
+          'endShelf': 2,
+          'zone': 'left',
+          'position': 'Top',
+        },
+        {
+          'vmNumber': 2,
+          'vmHeightmm': 100,
+          'vmWidthmm': 230,
+          'startShelf': 5,
+          'endShelf': 5,
+          'zone': 'left',
+          'position': 'Mid',
+        },
+        {
+          'vmNumber': 3,
+          'vmHeightmm': 100,
+          'vmWidthmm': 905,
+          'startShelf': 5,
+          'endShelf': 5,
+          'zone': 'left',
+          'position': 'Mid',
+        },
+        {
+          'vmNumber': 4,
+          'vmHeightmm': 100,
+          'vmWidthmm': 230,
+          'startShelf': 6,
+          'endShelf': 6,
+          'zone': 'right',
+          'position': 'Bottom',
+        },
+      ],
+      'fixtureStaticLength': {
+        'value': 1524,
+        'unit': 'mm',
+      },
+      'fixtureStaticWidth': {
+        'value': 1220,
+        'unit': 'mm',
+      },
+    };
+
 
     if ( !req?.body?.storeName ) {
       return res.sendError( 'No store supplied', 200 );
@@ -7232,19 +7400,7 @@ export async function migrateCrestv1( req, res ) {
       clientId: '11',
       $and: [
         { storeName: req.body.storeName },
-        // { storeName: { $in: [
-        //   'LKST81',
-        //   'LKST682',
-        //   'LKST351',
-        //   'LKST1193',
-        //   'LKST98',
-        //   'LKST01',
-        //   'LKST266',
-        //   'LKST495',
-        //   'LKST2280',
-        //   'LKST599',
-        //   'LKST267',
-        // ] } },
+        // { storeName: { $in: ['LKST98', 'LKST682', 'ST185', 'ST36', 'LKST1193'] } },
         // { storeName: { $nin: [ 'LKST98', 'LKST1193' ] } },
       ],
     };
@@ -7478,8 +7634,31 @@ export async function migrateCrestv1( req, res ) {
         for ( let index = 0; index < leftFixtures.length; index++ ) {
           const fixture = leftFixtures[index];
 
-          const fixtureConfig = await fixtureLibraryService.findOne( { fixtureCategory: fixture.fixtureType } );
-          if ( !fixtureConfig ) continue;
+          if ( !fixture.fixtureName ) {
+            return;
+          }
+
+          const libraryType = getLibraryType( fixture.fixtureName );
+
+          if ( libraryType.fixtureCategory === 'Space' ) {
+            continue;
+          }
+
+          let fixtureConfig = await fixtureLibraryService.findOne( libraryType );
+
+          if ( !fixtureConfig ) {
+            const existingLibrary = await fixtureLibraryService.findOne( { fixtureCategory: libraryType.fixtureCategory } );
+
+            const insertData = {
+              ...sampleLibrary,
+              ...( existingLibrary ? existingLibrary.toObject() : {} ),
+              ...libraryType,
+            };
+
+            delete insertData._id;
+
+            fixtureConfig = await fixtureLibraryService.upsertOne( libraryType, insertData );
+          }
           const fixtureConfigDoc = fixtureConfig.toObject();
 
           let mapKey = `${fixtureConfigDoc.fixtureCategory}${fixtureConfigDoc.fixtureWidth.value}${fixtureConfigDoc.fixtureWidth.unit},${fixture.header}`;
@@ -7495,7 +7674,7 @@ export async function migrateCrestv1( req, res ) {
 
             mapKey += ','+shelfIdentifier;
 
-            const productSubBrandName = shelfSection?.productName?.replace( /\s*PIDs\b/g, '' )?.split( /\s*\+\s*/ ) || [];
+            const productSubBrandName = shelfSection?.productName?.replace( /\s*PIDs?\b/g, '' )?.split( /\s*\+\s*/ ) || [];
 
             productSubBrandName.forEach( ( item ) => fixtureProductSubBrandName.add( item ) );
 
@@ -7749,8 +7928,31 @@ export async function migrateCrestv1( req, res ) {
         for ( let index = 0; index < backFixtures.length; index++ ) {
           const fixture = backFixtures[index];
 
-          const fixtureConfig = await fixtureLibraryService.findOne( { fixtureCategory: fixture.fixtureType } );
-          if ( !fixtureConfig ) continue;
+          if ( !fixture.fixtureName ) {
+            return;
+          }
+
+          const libraryType = getLibraryType( fixture.fixtureName );
+
+          if ( libraryType.fixtureCategory === 'Space' ) {
+            continue;
+          }
+
+          let fixtureConfig = await fixtureLibraryService.findOne( libraryType );
+
+          if ( !fixtureConfig ) {
+            const existingLibrary = await fixtureLibraryService.findOne( { fixtureCategory: libraryType.fixtureCategory } );
+
+            const insertData = {
+              ...sampleLibrary,
+              ...( existingLibrary ? existingLibrary.toObject() : {} ),
+              ...libraryType,
+            };
+
+            delete insertData._id;
+
+            fixtureConfig = await fixtureLibraryService.upsertOne( libraryType, insertData );
+          }
           const fixtureConfigDoc = fixtureConfig.toObject();
 
           let mapKey = `${fixtureConfigDoc.fixtureCategory}${fixtureConfigDoc.fixtureWidth.value}${fixtureConfigDoc.fixtureWidth.unit},${fixture.header}`;
@@ -7766,7 +7968,7 @@ export async function migrateCrestv1( req, res ) {
 
             mapKey += ','+shelfIdentifier;
 
-            const productSubBrandName = shelfSection?.productName?.replace( /\s*PIDs\b/g, '' )?.split( /\s*\+\s*/ ) || [];
+            const productSubBrandName = shelfSection?.productName?.replace( /\s*PIDs?\b/g, '' )?.split( /\s*\+\s*/ ) || [];
 
             productSubBrandName.forEach( ( item ) => fixtureProductSubBrandName.add( item ) );
 
@@ -8019,8 +8221,31 @@ export async function migrateCrestv1( req, res ) {
         for ( let index = 0; index < rightFixtures.length; index++ ) {
           const fixture = rightFixtures[index];
 
-          const fixtureConfig = await fixtureLibraryService.findOne( { fixtureCategory: fixture.fixtureType } );
-          if ( !fixtureConfig ) continue;
+          if ( !fixture.fixtureName ) {
+            return;
+          }
+
+          const libraryType = getLibraryType( fixture.fixtureName );
+
+          if ( libraryType.fixtureCategory === 'Space' ) {
+            continue;
+          }
+
+          let fixtureConfig = await fixtureLibraryService.findOne( libraryType );
+
+          if ( !fixtureConfig ) {
+            const existingLibrary = await fixtureLibraryService.findOne( { fixtureCategory: libraryType.fixtureCategory } );
+
+            const insertData = {
+              ...sampleLibrary,
+              ...( existingLibrary ? existingLibrary.toObject() : {} ),
+              ...libraryType,
+            };
+
+            delete insertData._id;
+
+            fixtureConfig = await fixtureLibraryService.upsertOne( libraryType, insertData );
+          }
           const fixtureConfigDoc = fixtureConfig.toObject();
 
           let mapKey = `${fixtureConfigDoc.fixtureCategory}${fixtureConfigDoc.fixtureWidth.value}${fixtureConfigDoc.fixtureWidth.unit},${fixture.header}`;
@@ -8036,7 +8261,7 @@ export async function migrateCrestv1( req, res ) {
 
             mapKey += ','+shelfIdentifier;
 
-            const productSubBrandName = shelfSection?.productName?.replace( /\s*PIDs\b/g, '' )?.split( /\s*\+\s*/ ) || [];
+            const productSubBrandName = shelfSection?.productName?.replace( /\s*PIDs?\b/g, '' )?.split( /\s*\+\s*/ ) || [];
 
             productSubBrandName.forEach( ( item ) => fixtureProductSubBrandName.add( item ) );
 
@@ -8323,10 +8548,10 @@ export async function migrateCrestv1( req, res ) {
             mapKey += ','+shelfIdentifier;
 
 
-            let productSubBrandName = fixture.centerSubMain.replace( /\s*PIDs\b/g, '' )?.split( /\s*\+\s*/ ) || [];
+            let productSubBrandName = fixture.centerSubMain.replace( /\s*PIDs?\b/g, '' )?.split( /\s*\+\s*/ ) || [];
 
             if ( shelfSection ) {
-              productSubBrandName = shelfSection.name.replace( /\s*PIDs\b/g, '' )?.split( /\s*\+\s*/ ) || [];
+              productSubBrandName = shelfSection.name.replace( /\s*PIDs?\b/g, '' )?.split( /\s*\+\s*/ ) || [];
             }
 
             productSubBrandName.forEach( ( item ) => fixtureProductSubBrandName.add( item ) );