tango-app-api-store-builder 1.0.0-beta-82 → 1.0.0-beta-84

package/package.json

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

package/src/controllers/script.controller.js

@@ -3309,7 +3309,6 @@ export async function updatePlanoFixtureLayout( planoId, floorId ) {
     const planoDoc = insertedPlano.toObject();
 
     const fixtureData = await storeFixtureService.findAndSort( { planoId: planoId, floorId: floorId }, {}, { fixtureNumber: 1 } );
-    console.log( fixtureData, 'data' );
 
     const leftFixtures = fixtureData.filter( ( fixture ) => fixture.associatedElementType == 'wall' && fixture.associatedElementNumber == 1 );
     const rightFixtures = fixtureData.filter( ( fixture ) => fixture.associatedElementType == 'wall' && fixture.associatedElementNumber == 3 );
@@ -3665,13 +3664,13 @@ export async function updatelayout( req, res ) {
             elementNumber = key.split( ' ' )[1];
             matchingFixtures = fixtureDetails.filter(
                 ( elementFixture ) =>
-                  elementFixture.associatedElementType === elementType &&
-                  elementFixture.associatedElementNumber === parseInt( elementNumber ),
+                  elementFixture.associatedElementType == elementType &&
+                  elementFixture.associatedElementNumber == elementNumber,
             );
           } else {
             matchingFixtures = fixtureDetails.filter(
                 ( elementFixture ) =>
-                  elementFixture.fixtureType === 'floor',
+                  elementFixture.fixtureType == 'floor',
             );
           }
           if ( matchingFixtures.length ) {
@@ -3689,6 +3688,10 @@ export async function updatelayout( req, res ) {
                 ...( key == 'floor' ) ? { header: '', footer: '' } : {},
               };
               fixtureDetails.splice( fixtureIndex, 1 );
+              let matchFixtureIndex = matchingFixtures.findIndex( ( fix ) => fix._id.toString() == fixture.fixtureId.toString() );
+              if ( matchFixtureIndex != -1 ) {
+                matchingFixtures.splice( matchFixtureIndex, 1 );
+              }
               if ( maxFixtureNumber < parseInt( fixture.position ) ) {
                 details.associatedElementFixtureNumber = maxFixtureNumber + 1;
                 matchingFixtures.splice( maxFixtureNumber, 0, details );
@@ -3706,14 +3709,27 @@ export async function updatelayout( req, res ) {
       }
       if ( layoutAnswer?.correctedFixture?.length ) {
         for ( let [ fixtureIndex, fixture ] of layoutAnswer.correctedFixture.entries() ) {
-          const matchingFixtures = fixtureDetails.filter(
-              ( elementFixture ) =>
-                elementFixture.associatedElementType === fixture.alignment.split( ' ' )[0] &&
-                elementFixture.associatedElementNumber === parseInt( fixture.alignment.split( ' ' )[1] ),
-          );
-          const maxFixtureNumber = Math.max(
-              ...matchingFixtures.map( ( f ) => f.associatedElementFixtureNumber ),
-          );
+          let matchingFixtures;
+          let maxFixtureNumber = 0;
+          if ( fixture.alignment != 'centre' ) {
+            let elementType = fixture.alignment.split( ' ' )[0];
+            let elementNumber = fixture.alignment.split( ' ' )[1];
+            matchingFixtures = fixtureDetails.filter(
+                ( elementFixture ) =>
+                  elementFixture.associatedElementType == elementType &&
+                elementFixture.associatedElementNumber == elementNumber,
+            );
+          } else {
+            matchingFixtures = fixtureDetails.filter(
+                ( elementFixture ) =>
+                  elementFixture.fixtureType == 'floor',
+            );
+          }
+          if ( matchingFixtures.length ) {
+            maxFixtureNumber = Math.max(
+                ...matchingFixtures.map( ( f ) => f.associatedElementFixtureNumber ),
+            );
+          }
           const fixtureConfig = await fixtureConfigService.findOne( { fixtureCategory: fixture.fixtureType } );
           if ( fixtureConfig ) {
             const fixtureConfigDoc = fixtureConfig.toObject();
@@ -3757,7 +3773,10 @@ export async function updatelayout( req, res ) {
             let fixtureDoc = await storeFixtureService.create( fixtureData );
             if ( fixtureDoc ) {
               let productCount = 0;
-              fixtureDetails.splice( parseInt( fixture.position ) - 1, 0, JSON.parse( JSON.stringify( fixtureDoc ) ) );
+              matchingFixtures.splice( parseInt( fixture.position ) - 1, 0, JSON.parse( JSON.stringify( fixtureDoc ) ) );
+              let fixIdList = matchingFixtures.map( ( mixFixture ) => mixFixture._id.toString() );
+              fixtureDetails = fixtureDetails.filter( ( fixt ) => !fixIdList.includes( fixt._id.toString() ) );
+              fixtureDetails.push( ...matchingFixtures );
               let shelfDetails = layoutAnswer.shlef[fixtureIndex];
               for ( let i=0; i<shelfDetails.count; i++ ) {
                 const insertData = {
@@ -3810,6 +3829,9 @@ export async function updatelayout( req, res ) {
           };
 
           await storeFixtureService.updateOne( { _id: element._id }, data );
+          if ( key == 'floor' ) {
+            await storeFixtureService.removeKeys( { _id: element._id }, { $unset: { header: '', footer: '', associatedElementType: '', associatedElementNumber: '' } } );
+          }
         }
       }
       await updatePlanoFixtureLayout( layout.planoId, layout.floorId );

package/src/service/planoMapping.service.js

@@ -41,4 +41,4 @@ export async function upsertOne( query, record ) {
       record,
       { upsert: true, new: true },
   );
-}
+}

package/src/service/storeFixture.service.js

@@ -51,3 +51,7 @@ export async function upsertOne( query, record ) {
       { upsert: true, new: true },
   );
 }
+
+export async function removeKeys( query, data ) {
+  return model.storeFixtureModel.updateOne( query, data );
+}