tango-app-api-store-builder 1.0.11-dont-user → 1.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.11-dont-user",
+    "version": "1.0.12",
     "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.3",
+        "tango-api-schema": "^2.5.11",
         "tango-app-api-middleware": "3.1.48",
         "url": "^0.11.4",
         "winston": "^3.17.0",

package/src/controllers/managePlano.controller.js

@@ -1012,7 +1012,10 @@ export async function updateFixtureStatus( req, res ) {
       await planoTaskService.updateOnefilters(
           { _id: new mongoose.Types.ObjectId( req.body._id ) },
           {
-            $set: { 'answers.$[ans].status': req.body.type },
+            $set: {
+              'answers.$[ans].status': req.body.type,
+              'answers.$[ans].userAction': req.body.userAction 
+            }
           },
           [
             { 'ans._id': new mongoose.Types.ObjectId( req.body.answerId ) },
@@ -1277,7 +1280,7 @@ export async function updateStoreFixture( req, res ) {
 
     const currentFixture = await storeFixtureService.findOne( { _id: new mongoose.Types.ObjectId( fixtureId ) } );
     let currentFixtureDoc = currentFixture.toObject();
-    if ( req?.body?.taskType?.includes( 'fixture' ) || data?.taskType?.includes( 'fixture' ) ) {
+    if ( data?.userAction === 'editWithAi' || data?.userAction === 'acceptAi' ) {
       let shelfDetails = await fixtureShelfService.find( { fixtureId: fixtureId } );
       data.shelfConfig.forEach( ( ele ) => {
         let findShelfProduct = shelfDetails.find( ( shelf ) => shelf.shelfNumber == ele.shelfNumber );
@@ -1513,7 +1516,8 @@ export async function updateStoreFixture( req, res ) {
       } );
     }
     await planoService.updateOne( { _id: currentFixtureDoc?.planoId }, { $set: { updatedAt: new Date() } } );
-    if ( data?.taskType?.includes( 'fixture' ) ) {
+
+    if ( data?.userAction === 'editWithAi' || data?.userAction === 'editWithPlano' ) {
       let comments = {
         userId: req.user._id,
         userName: req.user.userName,
@@ -1521,17 +1525,19 @@ export async function updateStoreFixture( req, res ) {
         responsetype: 'agree',
         comment: '',
       };
-      await planoTaskService.updateOne( { planoId: currentFixture.planoId, floorId: currentFixture.floorId, fixtureId: currentFixture._id }, { 'answers.0.status': 'agree', 'approvalStatus': 'approved' } );
+      await planoTaskService.updateOne( { planoId: currentFixture.planoId, floorId: currentFixture.floorId, fixtureId: currentFixture._id }, { 'answers.0.status': 'agree', 'approvalStatus': 'approved','answers.0.userAction':  data.userAction  } );
+      
       await planoTaskService.updateOnefilters(
-          { planoId: new mongoose.Types.ObjectId( currentFixture.planoId ), floorId: new mongoose.Types.ObjectId( currentFixture.floorId ), fixtureId: new mongoose.Types.ObjectId( currentFixture._id ) },
-          {
-            $push: { 'answers.0.comments': comments },
-          },
+        { planoId: new mongoose.Types.ObjectId(currentFixture.planoId), floorId: new mongoose.Types.ObjectId(currentFixture.floorId), fixtureId: new mongoose.Types.ObjectId(currentFixture._id) },
+        {
+          $push: { 'answers.0.comments': comments },
+        },
       );
+
     }
-    if ( req.body?.editMode ) {
-      await floorService.updateOne( { _id: new mongoose.Types.ObjectId( currentFixture.floorId ) }, { isEdited: true } );
-    }
+    // if ( req.body?.editMode ) {
+    //   await floorService.updateOne( { _id: new mongoose.Types.ObjectId( currentFixture.floorId ) }, { isEdited: true } );
+    // }
     res.sendSuccess( { message: 'Updated Successfully', ...( configId && { id: configId } ) } );
   } catch ( e ) {
     logger.error( { functionName: 'updateStoreFixture', error: e } );