tango-app-api-store-builder 1.0.0-beta-140 → 1.0.0-beta-142

package/package.json

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

package/src/controllers/managePlano.controller.js

@@ -418,7 +418,9 @@ export async function updateStorePlano( req, res ) {
     } );
 
     await floorService.updateOne( { _id: new mongoose.Types.ObjectId( floorId ) },
-        { layoutPolygon: layoutPolygon } );
+        { layoutPolygon: layoutPolygon,
+          ...( req.body?.editMode === true && { isEdited: true } ),
+        } );
 
     const currentWallFixtures = data.layoutPolygon.flatMap( ( element ) =>
       ( element.fixtures || [] ).map( ( fixture ) => fixture ),

package/src/controllers/script.controller.js

@@ -8593,6 +8593,7 @@ export async function migrateCrestv1( req, res ) {
                 vmName: vm.name + ' - 1',
                 vmHeight: configData1.vmHeightmm,
                 vmWidth: configData1.vmWidthmm,
+                ...( vm?.preview_image_url && { preview_image_url: vm?.preview_image_url } ),
               },
               {
                 startYPosition: configData2.startShelf,
@@ -8602,11 +8603,39 @@ export async function migrateCrestv1( req, res ) {
                 vmName: vm.name + ' - 2',
                 vmHeight: configData2.vmHeightmm,
                 vmWidth: configData2.vmWidthmm,
+                ...( vm?.preview_image_url2 && { preview_image_url: vm?.preview_image_url2 } ),
               },
             ];
           } );
 
           const vmTemplate = await Promise.all( vmConfig.map( async ( vmTemplate, k ) => {
+            let attachmentId = '';
+            let imgPath = '';
+            let imageMeta = null;
+            if ( vmTemplate?.preview_image_url ) {
+              const parsedUrl = new URL( vmTemplate.preview_image_url );
+              attachmentId = parsedUrl.searchParams.get( 'attachment_id' );
+
+              const isVmImageExist = await planoVmService.findOne( { crestImageId: attachmentId } );
+
+              if ( !isVmImageExist ) {
+                const vmImageData = await fetchVmImage( attachmentId );
+
+                imageMeta = await getImageMetadata( vmImageData );
+
+                const params = {
+                  Bucket: JSON.parse( process.env.BUCKET ).storeBuilder,
+                  Key: `crestVms/`,
+                  fileName: `${attachmentId}.${imageMeta.fileExtension}`,
+                  ContentType: imageMeta.contentType,
+                  body: vmImageData,
+                };
+
+                const imgUpload = await fileUpload( params );
+
+                imgPath = imgUpload.Key;
+              }
+            }
             const vmInsertData = {
               clientId: '11',
               vmName: vmTemplate.vmName,
@@ -8623,6 +8652,11 @@ export async function migrateCrestv1( req, res ) {
               vmType: 'LKVM',
             };
 
+            if ( attachmentId && imgPath ) {
+              vmInsertData.crestImageId = attachmentId;
+              vmInsertData.vmImageUrl = imgPath;
+            }
+
             const vmIdentifier = `vm${k+1}=${vmTemplate.vmName}+${vmTemplate.vmHeight}+${vmTemplate.vmWidth}+${vmTemplate.startYPosition}+${vmTemplate.endYPosition}+${vmTemplate.xZone}`;
 
             mapKey += ','+vmIdentifier;

package/src/controllers/storeBuilder.controller.js

@@ -2655,7 +2655,7 @@ export async function storeFixturesv2( req, res ) {
         planograms.map( async ( planogram ) => {
           const floors = await storeBuilderService.find(
               { planoId: planogram._id },
-              { floorName: 1, layoutPolygon: 1, planoId: 1 },
+              { floorName: 1, layoutPolygon: 1, planoId: 1, isEdited: 1 },
           );
 
           const floorsWithFixtures = await Promise.all(
@@ -2669,7 +2669,7 @@ export async function storeFixturesv2( req, res ) {
                         floorId: floor._id,
                         associatedElementType: element.elementType,
                         associatedElementNumber: element.elementNumber,
-                      }, { shelfcount: 0 }, { fixtureNumber: 1 } );
+                      }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
 
                       const fixturesWithStatus = await Promise.all(
                           fixtures.map( async ( fixture ) => {
@@ -2762,13 +2762,14 @@ export async function storeFixturesv2( req, res ) {
                     } ),
                 );
 
-                const centerFixtures = await storeFixtureService.find( {
+                const centerFixtures = await storeFixtureService.findAndSort( {
                   floorId: floor._id,
                   $and: [
                     { associatedElementType: { $exists: false } },
                     { associatedElementNumber: { $exists: false } },
                   ],
-                } );
+                }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
+
 
                 const centerFixturesWithStatus = await Promise.all(
                     centerFixtures.map( async ( fixture ) => {
@@ -2838,7 +2839,7 @@ export async function storeFixturesv2( req, res ) {
                       return {
                         ...fixture.toObject(),
                         status: fixtureStatus,
-                        shelfCount: shelves.shelves,
+                        shelfCount: shelves.length,
                         productCount: productCount,
                         vmCount: vmCount,
                         shelfConfig: shelfDetails,
@@ -2977,7 +2978,7 @@ export async function storeFixturesTaskv2( req, res ) {
         planograms.map( async ( planogram ) => {
           const floors = await storeBuilderService.find(
               { planoId: planogram._id },
-              { floorName: 1, layoutPolygon: 1, planoId: 1 },
+              { floorName: 1, layoutPolygon: 1, planoId: 1, isEdited: 1 },
           );
 
           const floorsWithFixtures = await Promise.all(
@@ -2992,7 +2993,7 @@ export async function storeFixturesTaskv2( req, res ) {
                         floorId: floor._id,
                         associatedElementType: element.elementType,
                         associatedElementNumber: element.elementNumber,
-                      }, { shelfcount: 0 }, { fixtureNumber: 1 } );
+                      }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
 
                       const fixturesWithStatus = await Promise.all(
                           fixtures.map( async ( fixture ) => {
@@ -3086,13 +3087,13 @@ export async function storeFixturesTaskv2( req, res ) {
                     } ),
                 );
 
-                const centerFixtures = await storeFixtureService.find( {
+                const centerFixtures = await storeFixtureService.findAndSort( {
                   floorId: floor._id,
                   $and: [
                     { associatedElementType: { $exists: false } },
                     { associatedElementNumber: { $exists: false } },
                   ],
-                } );
+                }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
 
                 const centerFixturesWithStatus = await Promise.all(
                     centerFixtures.map( async ( fixture ) => {
@@ -3161,7 +3162,7 @@ export async function storeFixturesTaskv2( req, res ) {
                       return {
                         ...fixture.toObject(),
                         status: compliance?.status ? compliance.status : '',
-                        shelfCount: shelves.shelves,
+                        shelfCount: shelves.length,
                         productCount: productCount,
                         disabled: req?.body?.redo ? disabled : false,
                         vmCount: vmCount,
@@ -3343,7 +3344,7 @@ export async function planoList( req, res ) {
                   $and: [
                     { $eq: [ '$planoId', '$$plano' ] },
                     // { $in: [ '$taskId', pendingDetails.map( ( ele ) => ele.taskId ) ] },
-                    { $eq: [ '$taskType', 'initial' ] },
+                    // { $eq: [ '$taskType', 'initial' ] },
                   ],
                 },
               },
@@ -3361,13 +3362,28 @@ export async function planoList( req, res ) {
                           in: {
                             $concatArrays: [
                               '$$value',
-                              { $ifNull: [ '$$this.issues', [] ] },
+                              {
+                                $reduce: {
+                                  input: { $ifNull: [ '$$this.issues', [] ] },
+                                  initialValue: [],
+                                  in: {
+                                    $concatArrays: [
+                                      '$$value',
+                                      { $ifNull: [ '$$this.Details', [] ] },
+                                    ],
+                                  },
+                                },
+                              },
                             ],
                           },
                         },
                       },
-                      as: 'issue',
-                      in: { $eq: [ '$$issue.status', 'pending' ] },
+                      as: 'detail',
+                      in: {
+                        $or: [
+                          { $eq: [ '$$detail.status', 'pending' ] },
+                        ],
+                      },
                     },
                   },
                 },
@@ -3738,7 +3754,7 @@ export async function planoList( req, res ) {
       {
         $match: {
           taskId: { $in: pendingDetails.map( ( ele ) => ele.taskId ) },
-          taskType: 'initial',
+          // taskType: 'initial',
         },
       },
       {
@@ -3753,13 +3769,28 @@ export async function planoList( req, res ) {
                     in: {
                       $concatArrays: [
                         '$$value',
-                        { $ifNull: [ '$$this.issues', [] ] },
+                        {
+                          $reduce: {
+                            input: { $ifNull: [ '$$this.issues', [] ] },
+                            initialValue: [],
+                            in: {
+                              $concatArrays: [
+                                '$$value',
+                                { $ifNull: [ '$$this.Details', [] ] },
+                              ],
+                            },
+                          },
+                        },
                       ],
                     },
                   },
                 },
-                as: 'issue',
-                in: { $eq: [ '$$issue.status', 'pending' ] },
+                as: 'detail',
+                in: {
+                  $or: [
+                    { $eq: [ '$$detail.status', 'pending' ] },
+                  ],
+                },
               },
             },
           },

package/src/controllers/task.controller.js

@@ -15,6 +15,7 @@ import mongoose from 'mongoose';
 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';
 
 
 dayjs.extend( timeZone );
@@ -112,6 +113,9 @@ async function createUser( data ) {
 
 export async function createTask( req, res ) {
   try {
+    if ( req.body?.floorId ) {
+      await storeBuilderService.updateOne( { _id: new mongoose.Types.ObjectId( req.body?.floorId ) }, { isEdited: false } );
+    }
     let scheduleEndTime = '11:59 PM';
     if ( req.body?.redo ) {
       if ( !req.body.taskId ) {
@@ -290,14 +294,14 @@ export async function createTask( req, res ) {
               taskData.userName = userDetails.userName;
               taskData.userEmail = userDetails.email;
               taskData.planoId = planoDetails?._id;
+              let planoProgress = req.body.checkListName == 'Fixture Verification' ? 50 : req.body.checkListName == 'VM Verification' ? 75 : 25;
+              if ( req.body?.checkListName && req.body.checkListName == 'Layout Verification' ) {
+                await planoTaskService.deleteMany( { planoId: planoDetails?._id, floorId: taskData?.floorId } );
+                planoProgress = 25;
+                await processedService.deleteMany( { planoId: planoDetails?._id, floorId: taskData?.floorId, isPlano: true } );
+              }
+              await planoService.updateOne( { _id: planoDetails?._id }, { $set: { planoProgress } } );
               for ( let j=0; j<req.body.days; j++ ) {
-                let planoProgress = req.body.checkListName == 'Fixture Verification' ? 50 : req.body.checkListName == 'VM Verification' ? 75 : 25;
-                if ( req.body?.checkListName && req.body.checkListName == 'Layout Verification' ) {
-                  await planoTaskService.deleteMany( { planoId: planoDetails?._id, floorId: taskData?.floorId } );
-                  planoProgress = 25;
-                  await processedService.deleteMany( { planoId: planoDetails?._id, floorId: taskData?.floorId, isPlano: true } );
-                }
-                await planoService.updateOne( { _id: planoDetails?._id }, { $set: { planoProgress } } );
                 let currDate = dayjs().add( j, 'day' );
                 let time = '12:00 AM';
                 if ( currDate.format( 'YYYY-MM-DD' ) == dayjs().format( 'YYYY-MM-DD' ) ) {