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

package/package.json

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

package/src/controllers/script.controller.js

@@ -3689,6 +3689,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 );
@@ -3757,7 +3761,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 +3817,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 );
+}