tango-app-api-store-builder 1.0.0-beta-34 → 1.0.0-beta-36

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-34",
+    "version": "1.0.0-beta-36",
     "description": "storeBuilder",
     "main": "index.js",
     "type": "module",
@@ -23,7 +23,7 @@
         "joi": "^17.13.3",
         "mongodb": "^6.12.0",
         "nodemon": "^3.1.9",
-        "tango-api-schema": "^2.2.59",
+        "tango-api-schema": "^2.2.60",
         "tango-app-api-middleware": "^3.1.48",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/storeBuilder.controller.js

@@ -12,6 +12,8 @@ import * as planoProductService from '../service/planoProduct.service.js';
 import * as planoMappingService from '../service/planoMapping.service.js';
 import * as planoComplianceService from '../service/planoCompliance.service.js';
 import * as planoTaskComplianceService from '../service/planoTask.service.js';
+import * as planoQrConversionRequestService from '../service/planoQrConversionRequest.service.js';
+
 import path from 'path';
 
 
@@ -539,10 +541,17 @@ export async function storeFixtures( req, res ) {
 
 export async function storeFixturesv1( req, res ) {
   try {
-    const planoIds = req.body.id.map( ( id ) => new mongoose.Types.ObjectId( id ) );
+    const planoIds = req.body.id
+        .filter( ( id ) => mongoose.Types.ObjectId.isValid( id ) )
+        .map( ( id ) => new mongoose.Types.ObjectId( id ) );
 
     const planograms = await planoService.find(
-        { _id: { $in: planoIds } },
+        {
+          $or: [
+            { _id: { $in: planoIds } },
+            { storeId: { $in: req.body.id } },
+          ],
+        },
         { storeId: 1, storeName: 1, planoId: '$_id', productResolutionLevel: 1, scanType: 1 },
     );
 
@@ -1899,10 +1908,17 @@ export const uploadImage = async ( req, res ) => {
 
 export async function storeFixturesTask( req, res ) {
   try {
-    const planoIds = req.body.id.map( ( id ) => new mongoose.Types.ObjectId( id ) );
+    const planoIds = req.body.id
+        .filter( ( id ) => mongoose.Types.ObjectId.isValid( id ) )
+        .map( ( id ) => new mongoose.Types.ObjectId( id ) );
 
     const planograms = await planoService.find(
-        { _id: { $in: planoIds } },
+        {
+          $or: [
+            { _id: { $in: planoIds } },
+            { storeId: { $in: req.body.id } },
+          ],
+        },
         { storeId: 1, storeName: 1, planoId: '$_id', productResolutionLevel: 1, scanType: 1 },
     );
 
@@ -2074,15 +2090,14 @@ export async function storeFixturesTask( req, res ) {
   }
 }
 
-
-export const qrVideoUpload = async ( req, res ) => {
+export const qrFileUpload = async ( req, res ) => {
   try {
     if ( !req.files?.file ) {
       return res.sendError( { message: 'Please upload a file' }, 400 );
     }
 
     const { file } = req.files;
-    const { fixtureId } = req.body;
+    const { fixtureId, type } = req.body;
 
     if ( !fixtureId ) {
       return res.sendError( { message: 'Missing fixtureId' }, 400 );
@@ -2102,7 +2117,13 @@ export const qrVideoUpload = async ( req, res ) => {
       return res.sendError( { message: 'Storage bucket not configured' }, 500 );
     }
 
-    const uploadPath = `planoQrVideos/${dayjs().format( 'YYYY-MM-DD' )}/${fixture.toObject().storeId}`;
+    let uploadPath;
+
+    if ( type === 'video' ) {
+      uploadPath = `planoQrFixtureVideos/${dayjs().format( 'YYYY-MM-DD' )}/${fixture.toObject().storeId}`;
+    } else if ( type === 'image' ) {
+      uploadPath = `planoQrFixtureImages/${dayjs().format( 'YYYY-MM-DD' )}/${fixture.toObject().storeId}`;
+    }
 
     const params = {
       fileName: `/${fixtureId}.${format}`,
@@ -2114,11 +2135,43 @@ export const qrVideoUpload = async ( req, res ) => {
 
     const fileUrl = await fileUpload( params );
 
+    const signedParams = {
+      Bucket: bucket.storeBuilder,
+      file_path: fileUrl.Key,
+    };
+    const signedKey = await signedUrl( signedParams );
+
+    res.sendSuccess( signedKey );
+  } catch ( error ) {
+    logger.error( 'fixtureQrUpdate =>', error );
+    return res.sendError( { message: 'Internal Server Error' }, 500 );
+  }
+};
+
+export const updateQrCvProcessRequest = async ( req, res ) => {
+  try {
+    const { fixtureId, videoPath, imagePath, videoComment, imageComment } = req.body;
+
+    if ( !fixtureId ) {
+      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 bucket = JSON.parse( process.env.BUCKET || '{}' );
+    if ( !bucket.storeBuilder ) {
+      return res.sendError( { message: 'Storage bucket not configured' }, 500 );
+    }
+
     const message = {
       'fixtureId': fixtureId,
       'date': dayjs().format( 'YYYY-MM-DD' ),
       'bucket': bucket.storeBuilder,
-      'videoPath': fileUrl.Key,
+      'videoPath': videoPath,
     };
 
     const sqs = JSON.parse( process.env.SQS || '{}' );
@@ -2128,7 +2181,89 @@ export const qrVideoUpload = async ( req, res ) => {
 
     const sqsPush = await sendMessageToQueue( `${sqs.url}${sqs.qrVideoTopic}`, JSON.stringify( message ) );
 
-    return res.sendSuccess( { message: 'Uploaded successfully', sqsPush } );
+    if ( !sqsPush?.MessageId ) {
+      return res.sendError( { message: 'Failed to send SQS message' }, 500 );
+    }
+
+    const fixtureData = fixture.toObject();
+
+    const currentDate = new Date( dayjs().format( 'YYYY-MM-DD' ) );
+
+    const data = {
+      clientId: fixtureData?.clientId,
+      storeName: fixtureData?.storeName,
+      storeId: fixtureData?.storeId,
+      planoId: fixtureData?.planoId,
+      floorId: fixtureData?.floorId,
+      fixtureId: fixtureData?._id,
+      date: currentDate,
+      status: 'initiated',
+      fixtureImage: {
+        filePath: imagePath ? imagePath.match( /planoQrFixtureImages\/[^?]+/ )?.[0] : undefined,
+        comment: imageComment,
+      },
+      fixtureVideo: {
+        filePath: videoPath ? videoPath.match( /planoQrFixtureVideos\/[^?]+/ )?.[0] : undefined,
+        comment: videoComment,
+      },
+    };
+
+
+    await planoQrConversionRequestService.upsertOne( { fixtureId: fixtureData?._id, date: currentDate }, data );
+
+    return res.sendSuccess( { message: 'Updated successfully', data } );
+  } catch ( error ) {
+    logger.error( 'uploadFixtureVideo =>', error );
+    return res.sendError( { message: 'Internal Server Error' }, 500 );
+  }
+};
+
+export const getQrCvProcessRequest = async ( req, res ) => {
+  try {
+    const { fixtureId } = req.body;
+
+    if ( !fixtureId ) {
+      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 currentDate = new Date( dayjs().format( 'YYYY-MM-DD' ) );
+
+    const planoCvReq = await planoQrConversionRequestService.findOne( { fixtureId: new mongoose.Types.ObjectId( fixtureId ), date: currentDate } );
+
+    if ( !planoCvReq ) {
+      return res.sendError( 'No data found', 204 );
+    }
+
+    const bucket = JSON.parse( process.env.BUCKET || '{}' );
+    if ( !bucket.storeBuilder ) {
+      return res.sendError( { message: 'Storage bucket not configured' }, 500 );
+    }
+
+    let planoCvReqData = planoCvReq.toObject();
+
+    if ( planoCvReqData?.fixtureImage?.filePath ) {
+      const params = {
+        Bucket: bucket.storeBuilder,
+        file_path: planoCvReqData.fixtureImage.filePath,
+      };
+      planoCvReqData.fixtureImage.filePath = await signedUrl( params );
+    }
+
+    if ( planoCvReqData?.fixtureVideo?.filePath ) {
+      const params = {
+        Bucket: bucket.storeBuilder,
+        file_path: planoCvReqData.fixtureVideo.filePath,
+      };
+      planoCvReqData.fixtureVideo.filePath = await signedUrl( params );
+    }
+
+    return res.sendSuccess( planoCvReqData );
   } catch ( error ) {
     logger.error( 'uploadFixtureVideo =>', error );
     return res.sendError( { message: 'Internal Server Error' }, 500 );
@@ -2183,6 +2318,8 @@ export const fixtureQrUpdate = async ( req, res ) => {
         } ),
     );
 
+    await planoQrConversionRequestService.updateOne( { fixtureId: new mongoose.Types.ObjectId( fixtureId ), date: currentDate }, { status: 'data-received' } );
+
     return res.sendSuccess( updateStatus );
   } catch ( error ) {
     logger.error( 'fixtureQrUpdate =>', error );
@@ -2190,3 +2327,4 @@ export const fixtureQrUpdate = async ( req, res ) => {
   }
 };
 
+

package/src/routes/storeBuilder.routes.js

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

package/src/service/planoQrConversionRequest.service.js

@@ -0,0 +1,32 @@
+import model from 'tango-api-schema';
+
+export async function find( query={}, field={} ) {
+  return model.planoQrConversionRequest.find( query, field );
+}
+export async function findOne( query={}, field={} ) {
+  return model.planoQrConversionRequest.findOne( query, field );
+}
+
+export async function insertMany( data ) {
+  return model.planoQrConversionRequest.insertMany( data );
+}
+
+export async function aggregate( query ) {
+  return model.planoQrConversionRequest.aggregate( query );
+}
+
+export async function updateOne( query, record ) {
+  return model.planoQrConversionRequest.updateOne( query, { $set: record } );
+}
+
+export async function count( query ) {
+  return model.planoQrConversionRequest.countDocuments( query );
+}
+
+export async function create( data ) {
+  return model.planoQrConversionRequest.create( data );
+}
+
+export async function upsertOne( query, record ) {
+  return model.planoQrConversionRequest.updateOne( query, { $set: record }, { upsert: true } );
+}