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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.11-dont-user",
+    "version": "1.0.13",
     "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

@@ -1,5 +1,5 @@
 import * as floorService from '../service/storeBuilder.service.js';
-import { logger, insertOpenSearchData, getOpenSearchData } from 'tango-app-api-middleware';
+import { logger, insertOpenSearchData, getOpenSearchData, updateOpenSearchData, getOpenSearchById } from 'tango-app-api-middleware';
 // import * as storeService from '../service/store.service.js';
 import * as planoService from '../service/planogram.service.js';
 import * as storeFixtureService from '../service/storeFixture.service.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,25 @@ 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 ( data?.userAction === 'editWithAi' || data?.userAction === 'acceptAi' ) {
+      const op_id = `${data?.storeName}_${data?.storeDate}_${data?._id}`
+      await updateAIFeedbackInOpenSearch(data,op_id);
     }
+
+    // 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 } );
@@ -1539,6 +1551,64 @@ export async function updateStoreFixture( req, res ) {
   }
 }
 
+const updateAIFeedbackInOpenSearch = async (fixtureData, id) => {
+  
+  try {
+    let openSearchDetails = await getOpenSearchById(JSON.parse(process.env.OPENSEARCH).planoAIValidation, id);
+    if (openSearchDetails && openSearchDetails.statusCode == 200 && openSearchDetails?.body?._source) {
+
+      const doc = {
+        "fixtureId": fixtureData._id,
+        "fixtureCapacity": fixtureData.fixtureCapacity,
+        "fixtureType": fixtureData.fixtureType,
+        "fixtureCategory": fixtureData.fixtureCategory,
+        "header": {
+          "label": fixtureData.header.label,
+        },
+        "vmConfig": fixtureData?.vmConfig.map(vm => {
+          return {
+            "vmType": vm.vmType,
+            "startYPosition": vm.startYPosition,
+            "endYPosition": vm.endYPosition,
+            "xZone": vm.xZone,
+            "yZone": vm.yZone,
+            "vmImage": vm.vmImage,
+            "vmName": vm.vmName,
+          }
+        }) ?? [
+
+          ],
+        "shelfConfig": fixtureData?.shelfConfig.map(s => {
+          return {
+            "shelfNumber": s.shelfNumber,
+            "shelfType": s.shelfType,
+            "productPerShelf": s.productPerShelf,
+            "trayRows": s.trayRows
+          }
+        }) ?? [],
+        "fixtureImage": fixtureData.fixtureImage,
+        "storeDate": fixtureData.storeDate
+      }
+
+      const document = {
+        doc: doc,
+      };
+
+      let updateResult = await updateOpenSearchData(JSON.parse(process.env.OPENSEARCH).planoAIValidation, id, document);
+      
+      if (updateResult?.statusCode == 200) {
+        return true;
+      }
+      return false
+    } else {
+      return false
+    }
+  } catch (e) {
+    logger.error({ error: e, function: 'updateAIFeedbackInOpenSearch' });
+    return false
+  }
+};
+
 export async function updateredostatus( req, res ) {
   try {
     if ( req.body.type === 'layout' ) {