tango-app-api-store-builder 1.0.0-beta-32 → 1.0.0-beta-33

package/package.json

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

package/src/controllers/storeBuilder.controller.js

@@ -1005,12 +1005,13 @@ export async function fixtureShelfProductv1( req, res ) {
     if ( fixture.toObject().productResolutionLevel === 'L1' ) {
       const productMappings = await planoMappingService.find( { fixtureId: new mongoose.Types.ObjectId( fixtureId ), type: 'product' } );
       const productDetails = await getProducts( productMappings );
-      return res.sendSuccess( { ...fixture.toObject(), products: productDetails, vms: vmDetails } );
+      return res.sendSuccess( { ...fixture.toObject(), products: productDetails, vms: vmDetails, productCount: productMappings.length } );
     }
 
     if ( [ 'L2', 'L4' ].includes( fixture.toObject().productResolutionLevel ) ) {
       const fixtureShelves = await fixtureShelfService.find( { fixtureId: new mongoose.Types.ObjectId( fixtureId ) } );
       if ( !fixtureShelves.length ) return res.sendError( 'No shelves found for the fixture', 204 );
+      const productCount = await planoMappingService.count( { fixtureId: new mongoose.Types.ObjectId( fixtureId ), type: 'product' } );
       const shelfProducts = await Promise.all(
           fixtureShelves.map( async ( shelf ) => {
             const productMappings = await planoMappingService.find( { shelfId: shelf._id, type: 'product' } );
@@ -1018,12 +1019,13 @@ export async function fixtureShelfProductv1( req, res ) {
             return { ...shelf.toObject(), products: productDetails };
           } ),
       );
-      return res.sendSuccess( { ...fixture.toObject(), shelves: shelfProducts, vms: vmDetails } );
+      return res.sendSuccess( { ...fixture.toObject(), shelves: shelfProducts, vms: vmDetails, productCount: productCount } );
     }
 
     if ( fixture.toObject().productResolutionLevel === 'L3' ) {
       const fixtureShelves = await fixtureShelfService.find( { fixtureId: new mongoose.Types.ObjectId( fixtureId ) } );
       if ( !fixtureShelves.length ) return res.sendError( 'No shelves found for the fixture', 204 );
+      const productCount = await planoMappingService.count( { fixtureId: new mongoose.Types.ObjectId( fixtureId ), type: 'product' } );
       const groupedShelves = fixtureShelves.reduce( async ( accPromise, shelf ) => {
         const acc = await accPromise;
         const productMappings = await planoMappingService.find( { shelfId: shelf._id, type: 'product' } );
@@ -1033,7 +1035,7 @@ export async function fixtureShelfProductv1( req, res ) {
         acc[sectionName].push( { ...shelf.toObject(), products: productDetails } );
         return acc;
       }, Promise.resolve( {} ) );
-      return res.sendSuccess( { ...fixture.toObject(), categories: await groupedShelves, vms: vmDetails } );
+      return res.sendSuccess( { ...fixture.toObject(), categories: await groupedShelves, vms: vmDetails, productCount: productCount } );
     }
 
     return res.sendError( 'Incorrect resolution level', 400 );
@@ -2086,6 +2088,12 @@ export const qrVideoUpload = async ( req, res ) => {
       return res.sendError( { message: 'Missing fixtureId' }, 400 );
     }
 
+    const fixture = await storeFixtureService.findOne( { _id: fixtureId } );
+
+    if ( !fixture ) {
+      return res.sendError( { message: 'Fixture not found' }, 400 );
+    }
+
     const format = path.extname( file.name ).toLowerCase().replace( '.', '' );
     file.name = file.name.replace( /\s/g, '' );
 
@@ -2094,7 +2102,7 @@ export const qrVideoUpload = async ( req, res ) => {
       return res.sendError( { message: 'Storage bucket not configured' }, 500 );
     }
 
-    const uploadPath = 'planoQrVideos';
+    const uploadPath = `planoQrVideos/${dayjs().format( 'YYYY-MM-DD' )}/${fixture.toObject().storeId}`;
 
     const params = {
       fileName: `/${fixtureId}.${format}`,
@@ -2114,19 +2122,10 @@ export const qrVideoUpload = async ( req, res ) => {
     };
 
     const sqs = JSON.parse( process.env.SQS || '{}' );
-    if ( !sqs.url || !sqs.highcountTopic ) {
+    if ( !sqs.url || !sqs.qrVideoTopic ) {
       return res.sendError( { message: 'SQS details not configured' }, 500 );
     }
 
-    let inputData = {
-      Bucket: bucket.storeBuilder,
-      file_path: fileUrl.Key,
-    };
-    const imgUrl = await signedUrl( inputData );
-    if ( !imgUrl ) {
-      return res.sendError( { message: 'Something went Wrong' }, 500 );
-    }
-
     const sqsPush = await sendMessageToQueue( `${sqs.url}${sqs.qrVideoTopic}`, JSON.stringify( message ) );
 
     return res.sendSuccess( { message: 'Uploaded successfully', sqsPush } );
@@ -2136,3 +2135,58 @@ export const qrVideoUpload = async ( req, res ) => {
   }
 };
 
+export const fixtureQrUpdate = async ( req, res ) => {
+  try {
+    const { fixtureId, date, productQr } = req.body;
+
+    const fixture = await storeFixtureService.findOne( { _id: new mongoose.Types.ObjectId( fixtureId ) }, { _id: 1 } );
+
+    if ( !fixture ) {
+      return res.sendError( { message: 'Invalid fixture Id' }, 400 );
+    }
+
+    const productMappings = await planoMappingService.find( { fixtureId: fixture.toObject()._id, type: 'product' } );
+
+    if ( !productMappings.length ) {
+      return res.sendError( { message: 'No mapping found for fixture' }, 400 );
+    }
+
+    const currentDate = new Date( date );
+
+    const updateStatus = await Promise.all(
+        productMappings.map( async ( mapping ) => {
+          const mappingData = mapping.toObject();
+
+          if ( productQr.includes( mappingData.rfId ) ) {
+            const complianceData = { ...mappingData, planoMappingId: mappingData._id, compliance: 'proper' };
+
+            delete complianceData._id;
+
+            await planoComplianceService.updateOne( { fixtureId: fixture.toObject()._id, rfId: mappingData.rfId, date: currentDate }, complianceData );
+
+            return {
+              result: 'proper',
+              id: mappingData.rfId,
+            };
+          } else {
+            const complianceData = { ...mappingData, planoMappingId: mappingData._id, compliance: 'missing' };
+
+            delete complianceData._id;
+
+            await planoComplianceService.updateOne( { fixtureId: fixture.toObject()._id, rfId: mappingData.rfId, date: currentDate }, complianceData );
+
+            return {
+              result: 'missing',
+              id: mappingData.rfId,
+            };
+          }
+        } ),
+    );
+
+    return res.sendSuccess( updateStatus );
+  } catch ( error ) {
+    logger.error( 'fixtureQrUpdate =>', error );
+    return res.sendError( { message: 'Internal Server Error' }, 500 );
+  }
+};
+

package/src/controllers/task.controller.js

@@ -115,6 +115,7 @@ export async function createTask( req, res ) {
           date_string: dayjs().format( 'YYYY-MM-DD' ),
           sourceCheckList_id: task._id,
           checkListName: task.checkListName,
+          checkListId: task._id,
           scheduleStartTime: '12:00 AM',
           scheduleEndTime: '11:59 PM',
           scheduleStartTime_iso: dayjs.utc( '12:00 AM', 'hh:mm A' ).format(),
@@ -228,10 +229,10 @@ export async function createTask( req, res ) {
 export async function getTaskDetails( req, res ) {
   try {
     if ( !req.query.storeId ) {
-      return res.sendError( 'Store id is required' );
+      return res.sendError( 'Store id is required', 400 );
     }
     let date = req.query?.date || dayjs().format( 'YYYY-MM-DD' );
-    let getDetails = await processedService.find( { store_id: req.query.storeId, date_string: date, isPlano: true, checklistStatus: 'open' }, { checkListName: 1 } );
+    let getDetails = await processedService.find( { store_id: req.query.storeId, date_string: date, isPlano: true, checklistStatus: { $ne: 'submit' } }, { checkListName: 1, taskType: '$type' } );
     return res.sendSuccess( getDetails );
   } catch ( e ) {
     logger.error( { functionName: 'getTaskDetails', error: e } );
@@ -281,7 +282,7 @@ export async function updateStatus( req, res ) {
       return res.sendError( 'No data found', 204 );
     }
     if ( !req.body.status ) {
-      return res.sendError( 'Status is required' );
+      return res.sendError( 'Status is required', 400 );
     }
     let taskDetails = await processedService.findOne( { _id: req.body.taskId } );
     if ( !taskDetails ) {
@@ -310,7 +311,7 @@ export async function updateAnswers( req, res ) {
     let data = {
       fixtureId: req.body.fixtureId,
       answers: req.body.answers,
-      status: req.body.answers?.find( ( ans ) => ans.answer && !ans.answer ) ? 'incomplete' : 'complete',
+      status: req.body.answers?.find( ( ans ) => typeof ans.value == 'boolean' && ans?.value == false ) ? 'incomplete' : 'complete',
       planoId: req.body.planoId,
       floorId: req.body.floorId,
       type: req.body.type,
@@ -327,7 +328,7 @@ export async function updateAnswers( req, res ) {
 export async function getFixtureDetails( req, res ) {
   try {
     if ( !req.query.fixtureId ) {
-      return res.sendError( 'Fixture id is required' );
+      return res.sendError( 'Fixture id is required', 400 );
     }
     let fixtureDetails = await planoTaskService.findOne( { fixtureId: req.query.fixtureId, type: req.query.type } );
     if ( !fixtureDetails ) {

package/src/routes/storeBuilder.routes.js

@@ -28,6 +28,6 @@ storeBuilderRouter
     .post( '/bulkFixtureUpload', storeBuilderController.bulkFixtureUpload )
     .post( '/uploadImage', storeBuilderController.uploadImage )
     .post( '/storeFixturesTask', storeBuilderController.storeFixturesTask )
-    .post( '/qrVideoUpload', storeBuilderController.qrVideoUpload );
-
+    .post( '/qrVideoUpload', storeBuilderController.qrVideoUpload )
+    .post( '/fixtureQrUpdate', storeBuilderController.fixtureQrUpdate );