tango-app-api-store-builder 1.0.0-beta-35 → 1.0.0-beta-37

package/package.json

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

package/src/controllers/storeBuilder.controller.js

@@ -541,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 },
     );
 
@@ -607,9 +614,19 @@ export async function storeFixturesv1( req, res ) {
                                 } ),
                             );
 
+                            let fixtureStatus;
+
+                            const cvProcessStatus = await planoQrConversionRequestService.count( { fixtureId: fixture._id, date: currentDate, status: 'initiated' } );
+
+                            if ( cvProcessStatus ) {
+                              fixtureStatus = 'inprogress';
+                            } else {
+                              fixtureStatus = complianceCount === 0 ? '' : complianceCount === productCount ? 'complete' : 'incomplete';
+                            }
+
                             return {
                               ...fixture.toObject(),
-                              status: complianceCount === 0 ? '' : complianceCount === productCount ? 'complete' : 'incomplete',
+                              status: fixtureStatus,
                               shelfCount: shelves.length,
                               productCount: productCount,
                               vmCount: vmCount,
@@ -675,9 +692,19 @@ export async function storeFixturesv1( req, res ) {
                           } ),
                       );
 
+                      let fixtureStatus;
+
+                      const cvProcessStatus = await planoQrConversionRequestService.count( { fixtureId: fixture._id, date: currentDate, status: 'initiated' } );
+
+                      if ( cvProcessStatus ) {
+                        fixtureStatus = 'inprogress';
+                      } else {
+                        fixtureStatus = complianceCount === 0 ? '' : complianceCount === productCount ? 'complete' : 'incomplete';
+                      }
+
                       return {
                         ...fixture.toObject(),
-                        status: complianceCount === 0 ? '' : complianceCount === productCount ? 'complete' : 'incomplete',
+                        status: fixtureStatus,
                         shelfCount: shelves.shelves,
                         productCount: productCount,
                         vmCount: vmCount,
@@ -1901,10 +1928,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 },
     );
 
@@ -2106,7 +2140,7 @@ export const qrFileUpload = async ( req, res ) => {
     let uploadPath;
 
     if ( type === 'video' ) {
-      uploadPath = `planoQrVideos/${dayjs().format( 'YYYY-MM-DD' )}/${fixture.toObject().storeId}`;
+      uploadPath = `planoQrFixtureVideos/${dayjs().format( 'YYYY-MM-DD' )}/${fixture.toObject().storeId}`;
     } else if ( type === 'image' ) {
       uploadPath = `planoQrFixtureImages/${dayjs().format( 'YYYY-MM-DD' )}/${fixture.toObject().storeId}`;
     }
@@ -2121,7 +2155,13 @@ export const qrFileUpload = async ( req, res ) => {
 
     const fileUrl = await fileUpload( params );
 
-    res.sendSuccess( fileUrl.Key );
+    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 );
@@ -2179,11 +2219,11 @@ export const updateQrCvProcessRequest = async ( req, res ) => {
       date: currentDate,
       status: 'initiated',
       fixtureImage: {
-        filePath: imagePath,
+        filePath: imagePath ? imagePath.match( /planoQrFixtureImages\/[^?]+/ )?.[0] : undefined,
         comment: imageComment,
       },
       fixtureVideo: {
-        filePath: videoPath,
+        filePath: videoPath ? videoPath.match( /planoQrFixtureVideos\/[^?]+/ )?.[0] : undefined,
         comment: videoComment,
       },
     };