tango-app-api-store-builder 1.0.0-beta-202 → 1.0.0-beta-203

package/package.json

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

package/src/controllers/fixtureTemplate.controller.js

@@ -1473,12 +1473,6 @@ export async function getTreeList( req, res ) {
           ...( req.query?.masterId ) ? { masterTemplateId: new ObjectId( req.query.masterId ) } :{ clientId: req.query.clientId, templateType: 'master' },
         },
       },
-      {
-        $sort: {
-          'header.label': 1,
-        },
-      },
-
     ];
 
     let fixtureDetails = await fixtureConfigService.aggregate( query );

package/src/controllers/storeBuilder.controller.js

@@ -2717,9 +2717,9 @@ export async function qrScan1( req, res ) {
       const fm = await getFixtureMetrics( fixture, currentDate );
 
 
-      return res.sendSuccess( { data: productMapping, fixtureMetrics: fm, status: 'proper' } );
+      return res.sendSuccess( { data: { ...productMapping.toObject() }, fixtureMetrics: fm, status: 'proper' } );
     } else if ( fixture.productResolutionLevel === 'L3' ) {
-      const sectionShelves = await fixtureShelfService.find( { fixtureId: fixture._id, zone: req.body.sectionName } );
+      const sectionShelves = await fixtureShelfService.find( { fixtureId: fixture._id, sectionName: req.body.sectionName } );
 
       if ( !sectionShelves.length ) return res.sendError( 'No shelves found for the Section', 400 );
 
@@ -2744,7 +2744,7 @@ export async function qrScan1( req, res ) {
         const fm = await getFixtureMetrics( fixture, currentDate );
 
 
-        return res.sendSuccess( { data: locatePlano, fixtureMetrics: fm, status: 'misplaced' } );
+        return res.sendSuccess( { data: { ...locatePlano.toObject() }, fixtureMetrics: fm, status: 'misplaced' } );
       }
 
       planoMapping.forEach( async ( ele ) => {
@@ -5568,17 +5568,3 @@ export async function getRolloutTaskDetails( req, res ) {
     return res.sendError( e, 500 );
   }
 }
-
-export async function getPlanoStoreList( req, res ) {
-  try {
-    let storeDetails = await storeService.find( { status: 'active', clientId: req.query.clientId }, { storeId: 1 } );
-    if ( !storeDetails.length ) {
-      return res.sendError( 'No data found', 204 );
-    }
-    let planoDetails = await planoService.find( { storeId: { $in: storeDetails.map( ( ele ) => ele.storeId ) } }, { _id: 1, storeName: 1, storeId: 1 } );
-    return res.sendSuccess( planoDetails );
-  } catch ( e ) {
-    logger.error( { functionName: 'getPlanoStoreList', error: e } );
-    return res.sendError( e, 500 );
-  }
-}

package/src/controllers/task.controller.js

@@ -15,7 +15,8 @@ import * as floorService from '../service/storeBuilder.service.js';
 import * as planoStaticService from '../service/planoStaticData.service.js';
 import * as assignService from '../service/assignService.service.js';
 import * as storeBuilderService from '../service/storeBuilder.service.js';
-// import * as storeFixtureService from '../service/storeFixture.service.js';
+import * as storeFixtureService from '../service/storeFixture.service.js';
+import * as fixtureShelfService from '../service/fixtureShelf.service.js';
 
 
 dayjs.extend( timeZone );
@@ -676,8 +677,6 @@ export async function updateAnswersv2( req, res ) {
     if ( !taskDetails ) {
       return res.sendError( 'No data found', 204 );
     }
-    console.log( req.body.answers[0] );
-    console.log( req.body.answers[0].issues[0] );
     let data = {
       fixtureId: req.body.fixtureId,
       answers: req.body.answers,
@@ -692,8 +691,6 @@ export async function updateAnswersv2( req, res ) {
       storeId: req.body?.storeId,
       date_string: dayjs().format( 'YYYY-MM-DD' ),
     };
-    console.log( '111111', data.answers[0] );
-    console.log( '111111', data.answers[0].issues[0] );
     if ( req.body.type === 'layout' ) {
       await planoTaskService.updateOne( { planoId: req.body.planoId, taskType: req.body.taskType, floorId: req.body.floorId, fixtureId: req.body.fixtureId, type: req.body.type, ...( taskDetails?._id ) ? { taskId: taskDetails?._id } : {} }, data );
     } else {
@@ -713,6 +710,35 @@ export async function updateAnswersv2( req, res ) {
       await sendMessageToQueue( `${sqs.url}${sqs.storeBuilder}`, JSON.stringify( sqsData ) );
     }
 
+    if ( req.body.type === 'fixture' ) {
+      let fixtureData = await storeFixtureService.findOne( { _id: new mongoose.Types.ObjectId( req.body.fixtureId ) } );
+
+      if ( fixtureData ) {
+        fixtureData = fixtureData?.toObject();
+
+        let fixtureShelves = await fixtureShelfService.find( { fixtureId: fixtureData._id } );
+
+        if ( fixtureShelves.length ) {
+          fixtureShelves = fixtureShelves.map( ( shelf ) => shelf?.toObject() );
+
+          fixtureData.shelfConfig = fixtureShelves;
+        }
+      }
+
+      let sqsData = {
+        bucket: JSON.parse( process.env.BUCKET ).storeBuilder,
+        date_string: dayjs().format( 'YYYY-MM-DD' ),
+        storeName: data?.storeName,
+        imagePath: data?.answers[0]?.image,
+        fixtureId: req.body.fixtureId,
+        fixtureData: fixtureData,
+      };
+
+      const sqs = JSON.parse( process.env.SQS );
+      await sendMessageToQueue( `${sqs.url}${sqs.fixtureImageProcess}`, JSON.stringify( sqsData ) );
+    }
+
+
     return res.sendSuccess( 'Fixture details updated successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'updateAnswers', error: e } );

package/src/routes/storeBuilder.routes.js

@@ -54,5 +54,4 @@ storeBuilderRouter
     .get( '/taskDetails', isAllowedSessionHandler, storeBuilderController.getTaskDetails )
     .get( '/getPlanoUser', isAllowedSessionHandler, storeBuilderController.getPlanoUser )
     .post( '/planoRolloutList', isAllowedSessionHandler, storeBuilderController.getRolloutDetails )
-    .get( '/getRolloutTaskDetails', isAllowedSessionHandler, storeBuilderController.getRolloutTaskDetails )
-    .get( '/getPlanoStoreList', isAllowedSessionHandler, storeBuilderController.getPlanoStoreList );
+    .get( '/getRolloutTaskDetails', isAllowedSessionHandler, storeBuilderController.getRolloutTaskDetails );