tango-app-api-store-builder 1.0.0-beta-207 → 1.0.0-beta-209

package/package.json

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

package/src/controllers/managePlano.controller.js

@@ -713,16 +713,38 @@ export async function updateStorePlano( req, res ) {
     const currentWallFixtures = data.layoutPolygon.flatMap( ( element ) =>
       ( element.fixtures || [] ).map( ( fixture ) => fixture ),
     );
-
     const currentFloorFixtures = ( data.centerFixture || [] );
-
     const currentFixtures = [ ...currentWallFixtures, ...currentFloorFixtures ];
 
-    const existingFixtures = await storeFixtureService.find( { floorId: new mongoose.Types.ObjectId( floorId ) } );
+    const wallOtherElements = data.layoutPolygon.flatMap( ( element ) =>
+      ( element.otherElements || [] ).map( ( el ) => el ),
+    );
+    const floorOtherElements = ( data.otherElements || [] );
+    const currentOtherElements = [...wallOtherElements, ...floorOtherElements];
+
+    const existingFixtures = await storeFixtureService.find({
+      floorId: new mongoose.Types.ObjectId(floorId),
+      fixtureType: { $ne: 'other' }
+    });
+   
+    const existingOtherElements = await storeFixtureService.find({
+      floorId: new mongoose.Types.ObjectId(floorId),
+      fixtureType: 'other' 
+    });
+
+    const currentOtherElementsIds = new Set( currentOtherElements.map( ( f ) => f._id ) );
+    const removedOtherElements = existingOtherElements.filter(
+        ( f ) => f._id && !currentOtherElementsIds.has( f._id.toString()),
+    );
 
-    const currentIds = new Set( currentFixtures.map( ( f ) => f._id ) );
+    if(removedOtherElements.length){
+      const otherElementIds = removedOtherElements.map( ( ele ) => ele.toObject()._id );
+      await storeFixtureService.deleteMany( { _id: { $in: otherElementIds } } );
+    }
+
+    const currentFixtureIds = new Set( currentFixtures.map( ( f ) => f._id ) );
     const removedFixtures = existingFixtures.filter(
-        ( f ) => f._id && !currentIds.has( f._id.toString() ),
+        ( f ) => f._id && !currentFixtureIds.has( f._id.toString()),
     );
 
     if ( removedFixtures.length ) {
@@ -731,10 +753,8 @@ export async function updateStorePlano( req, res ) {
       await fixtureShelfService.deleteMany( { fixtureId: { $in: fixtureIds } } );
     }
 
-
-    const newWallFixtures = currentWallFixtures.filter( ( fixture ) => fixture?._id?.startsWith( 'new' ) );
-
-    const newFloorFixtures = currentFloorFixtures.filter( ( fixture ) => fixture?._id?.startsWith( 'new' ) );
+    const newWallFixtures = currentWallFixtures.filter( ( fixture ) => fixture?._id?.startsWith( 'new' ));
+    const newFloorFixtures = currentFloorFixtures.filter( ( fixture ) => fixture?._id?.startsWith( 'new' ));
 
     const newFixtures = [ ...newWallFixtures, ...newFloorFixtures ];
 
@@ -758,6 +778,29 @@ export async function updateStorePlano( req, res ) {
         } );
       } );
     }
+    
+
+
+    const newOtherElements = currentOtherElements.filter((ele) => ele?._id?.startsWith( 'new' ));
+
+
+    currentOtherElements.forEach(async (ele)=>{
+      if(ele?._id && mongoose.Types.ObjectId.isValid(ele._id)) {
+        await storeFixtureService.upsertOne({_id: new mongoose.Types.ObjectId(ele._id)}, ele);
+      }
+    })
+
+
+    if(newOtherElements.length){
+      newOtherElements.forEach(async(ele) =>{
+        delete ele._id
+        const payload = {
+          ...ele,
+          ...additionalMeta
+        }
+       await storeFixtureService.create(payload)
+      })
+    }
 
     currentFixtures.forEach( async ( fixture ) => {
       if ( mongoose.Types.ObjectId.isValid( fixture._id ) ) {

package/src/controllers/storeBuilder.controller.js

@@ -2811,11 +2811,12 @@ export async function storeFixturesv2( req, res ) {
                 const masterTemplateIds = new Set();
                 const layoutPolygonWithFixtures = await Promise.all(
                     floor.layoutPolygon.map( async ( element ) => {
-                      const fixtures = await storeFixtureService.findAndSort( {
+                        const fixtures = await storeFixtureService.findAndSort( {
                         floorId: floor._id,
                         associatedElementType: element.elementType,
                         associatedElementNumber: element.elementNumber,
-                      }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
+                        fixtureType: { $ne: 'other' },
+                        }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
 
                       const fixturesWithStatus = await Promise.all(
                           fixtures.map( async ( fixture ) => {
@@ -2916,6 +2917,7 @@ export async function storeFixturesv2( req, res ) {
                   $and: [
                     { associatedElementType: { $exists: false } },
                     { associatedElementNumber: { $exists: false } },
+                    { fixtureType: { $ne: 'other' } }
                   ],
                 }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
 
@@ -2996,7 +2998,6 @@ export async function storeFixturesv2( req, res ) {
                         vmCount: vmCount,
                         shelfConfig: shelfDetails,
                         vmConfig: vmDetails,
-
                       };
                     } ),
                 );
@@ -3494,6 +3495,7 @@ export async function storeFixturesTaskv2( req, res ) {
                         floorId: floor._id,
                         associatedElementType: element.elementType,
                         associatedElementNumber: element.elementNumber,
+                        fixtureType: { $ne: 'other' }
                       }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
 
                       const fixturesWithStatus = await Promise.all(
@@ -3595,6 +3597,7 @@ export async function storeFixturesTaskv2( req, res ) {
                   $and: [
                     { associatedElementType: { $exists: false } },
                     { associatedElementNumber: { $exists: false } },
+                    { fixtureType: { $ne: 'other' } }
                   ],
                 }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
 

package/src/service/storeFixture.service.js

@@ -68,3 +68,17 @@ export async function count( query ) {
 export async function updateOneArrayItem( query, record, filter ) {
   return model.storeFixtureModel.updateOne( query, record, filter );
 }
+
+export async function bulkUpsert(dataList = [], matchKey = '_id') {
+  if (!Array.isArray(dataList) || dataList.length === 0) return [];
+
+  const operations = dataList.map(item => ({
+    updateOne: {
+      filter: { [matchKey]: item[matchKey] },
+      update: { $set: item },
+      upsert: true,
+    },
+  }));
+
+  return model.storeFixtureModel.bulkWrite(operations);
+}