tango-app-api-store-builder 1.0.0-beta-116 → 1.0.0-beta-118

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-116",
+    "version": "1.0.0-beta-118",
     "description": "storeBuilder",
     "main": "index.js",
     "type": "module",
@@ -32,7 +32,7 @@
         "path": "^0.12.7",
         "selenium-webdriver": "^4.31.0",
         "sharp": "^0.34.1",
-        "tango-api-schema": "2.2.154",
+        "tango-api-schema": "2.2.155",
         "tango-app-api-middleware": "^3.1.48",
         "url": "^0.11.4",
         "winston": "^3.17.0",

package/src/controllers/managePlano.controller.js

@@ -454,7 +454,7 @@ export async function updateFixtureStatus( req, res ) {
       userId: req.user._id,
       userName: req.user.userName,
       role: req.user.role,
-      responsetype: req.user.type,
+      responsetype: req.body.type,
       comment: req.body.comments,
     };
     console.log( comments );
@@ -462,7 +462,7 @@ export async function updateFixtureStatus( req, res ) {
     let updateResponse = await planoTaskService.updateOnefilters(
         { _id: new mongoose.Types.ObjectId( req.body._id ) },
         {
-          $set: { 'answers.$[ans].issues.$[iss].Details.$[det].status': 'completed' },
+          $set: { 'answers.$[ans].issues.$[iss].Details.$[det].status': req.body.type },
         },
         [
           { 'ans._id': new mongoose.Types.ObjectId( req.body.answerId ) },
@@ -470,18 +470,33 @@ export async function updateFixtureStatus( req, res ) {
           { 'det._id': new mongoose.Types.ObjectId( req.body.DetailsId ) },
 
         ] );
-    let updatecomment = await planoTaskService.updateOnefilters(
-        { _id: new mongoose.Types.ObjectId( req.body._id ) },
-        {
-          $push: { 'answers.$[ans].issues.$[iss].Details.$[det].comments': comments },
-        },
-        [
-          { 'ans._id': new mongoose.Types.ObjectId( req.body.answerId ) },
-          { 'iss._id': new mongoose.Types.ObjectId( req.body.issueId ) },
-          { 'det._id': new mongoose.Types.ObjectId( req.body.DetailsId ) },
+    if ( req.body.taskType==='layout' ) {
+      let updatecomment = await planoTaskService.updateOnefilters(
+          { _id: new mongoose.Types.ObjectId( req.body._id ) },
+          {
+            $push: { 'answers.$[ans].issues.$[iss].Details.$[det].comments': comments },
+          },
+          [
+            { 'ans._id': new mongoose.Types.ObjectId( req.body.answerId ) },
+            { 'iss._id': new mongoose.Types.ObjectId( req.body.issueId ) },
+            { 'det._id': new mongoose.Types.ObjectId( req.body.DetailsId ) },
+
+          ] );
+      console.log( updatecomment );
+    } else {
+      let updatecomment = await planoTaskService.updateOnefilters(
+          { _id: new mongoose.Types.ObjectId( req.body._id ) },
+          {
+            $push: { 'answers.$[ans].issues.$[iss].comments': comments },
+          },
+          [
+            { 'ans._id': new mongoose.Types.ObjectId( req.body.answerId ) },
+            { 'iss._id': new mongoose.Types.ObjectId( req.body.issueId ) },
+          ] );
+      console.log( updatecomment );
+    }
+    console.log( updateResponse );
 
-        ] );
-    console.log( updateResponse, updatecomment );
     res.sendSuccess( 'updated successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'updateFixtureStatus', error: e } );
@@ -517,13 +532,12 @@ export async function updateStoreFixture(req, res) {
 });
     
 
-
     if (currentFixtureDoc.fixtureConfigId.toString() !== data.fixtureConfigId) {
-      const newTemplate = await fixtureConfigService.findOne({_id: data.fixtureConfigId})
+      const newTemplate = await fixtureConfigService.findOne({_id: new mongoose.Types.ObjectId(data.fixtureConfigId) })
       currentFixtureDoc = {
         ...currentFixtureDoc,
         ...newTemplate.toObject(),
-        fixtureConfigDoc:newTemplate.toObject()._id,
+        fixtureConfigId:newTemplate.toObject()._id,
         productBrandName:[...productBrandName],
         productCategory:[...productCategory],
         productSubCategory:[...productSubCategory]

package/src/controllers/script.controller.js

@@ -7231,20 +7231,20 @@ export async function migrateCrestv1( req, res ) {
     let storeQuery = {
       clientId: '11',
       $and: [
-        // { storeName: req.body.storeName },
-        { storeName: { $in: [
-          'LKST81',
-          'LKST682',
-          'LKST351',
-          'LKST1193',
-          'LKST98',
-          'LKST01',
-          'LKST266',
-          'LKST495',
-          'LKST2280',
-          'LKST599',
-          'LKST267',
-        ] } },
+        { storeName: req.body.storeName },
+        // { storeName: { $in: [
+        //   'LKST81',
+        //   'LKST682',
+        //   'LKST351',
+        //   'LKST1193',
+        //   'LKST98',
+        //   'LKST01',
+        //   'LKST266',
+        //   'LKST495',
+        //   'LKST2280',
+        //   'LKST599',
+        //   'LKST267',
+        // ] } },
         // { storeName: { $nin: [ 'LKST98', 'LKST1193' ] } },
       ],
     };
@@ -7267,8 +7267,6 @@ export async function migrateCrestv1( req, res ) {
     for ( let i = 0; i < storeList.length; i++ ) {
       const storeData = await fetchStoreData( storeList[i], staticToken, res );
 
-      console.log( JSON.stringify( storeData ) );
-
       if ( storeData?.data?.message !== 'SUCCESS' ) continue;
 
 
@@ -7526,6 +7524,7 @@ export async function migrateCrestv1( req, res ) {
             const vmConfig = fixtureConfigDoc.vmConfig.filter( ( vm ) => vm.position === zone.zoneName );
             const pids = zone.products.filter( ( vm ) => !vm.isMerchandisingElement );
 
+
             return vms.map( ( vm, k ) => {
               let configData = vmConfig[0];
 
@@ -7537,6 +7536,7 @@ export async function migrateCrestv1( req, res ) {
                 configData = vmConfig.find( ( config ) => config.vmWidthmm === 230 );
               }
 
+
               if ( configData.vmWidthmm === 905 ) {
                 configData.zone = 'stretch';
               }
@@ -7617,7 +7617,7 @@ export async function migrateCrestv1( req, res ) {
 
             const vmDetails = await planoVmService.upsertOne(
                 {
-                  'productName': vmInsertData.vmName,
+                  'vmName': vmInsertData.vmName,
                 },
                 vmInsertData,
             );
@@ -7887,7 +7887,7 @@ export async function migrateCrestv1( req, res ) {
 
             const vmDetails = await planoVmService.upsertOne(
                 {
-                  'productName': vmInsertData.vmName,
+                  'vmName': vmInsertData.vmName,
                 },
                 vmInsertData,
             );
@@ -8157,7 +8157,7 @@ export async function migrateCrestv1( req, res ) {
 
             const vmDetails = await planoVmService.upsertOne(
                 {
-                  'productName': vmInsertData.vmName,
+                  'vmName': vmInsertData.vmName,
                 },
                 vmInsertData,
             );
@@ -8310,7 +8310,7 @@ export async function migrateCrestv1( req, res ) {
           if ( !fixtureConfig ) continue;
           const fixtureConfigDoc = fixtureConfig.toObject();
 
-          let mapKey = `${fixtureConfigDoc.fixtureCategory}${fixtureConfigDoc.fixtureWidth.value}${fixtureConfigDoc.fixtureWidth.unit},${fixture.header}`;
+          let mapKey = `${fixtureConfigDoc.fixtureCategory}${fixtureConfigDoc.fixtureWidth.value}${fixtureConfigDoc.fixtureWidth.unit},${fixture.centerSubMain}`;
 
           const fixtureProductSubBrandName = new Set();
 
@@ -8318,7 +8318,7 @@ export async function migrateCrestv1( req, res ) {
           const shelfTemplate = fixtureConfigDoc.shelfConfig.map( ( configShelf, j ) => {
             const shelfSection = fixture?.centerSuperSubMain?.find( ( product ) => !product.isVisualMerchandiser );
 
-            const shelfIdentifier = `shelf${j + 1}=${shelfSection?.productName}`;
+            const shelfIdentifier = `shelf${j + 1}=${fixture?.centerSubMain}`;
 
             mapKey += ','+shelfIdentifier;
 
@@ -8381,7 +8381,7 @@ export async function migrateCrestv1( req, res ) {
             ];
           } );
 
-          const vmTemplate = await Promise.all( vmConfig.map( async ( vmTemplate ) => {
+          const vmTemplate = await Promise.all( vmConfig.map( async ( vmTemplate, k ) => {
             const vmInsertData = {
               clientId: '11',
               vmName: vmTemplate.vmName,
@@ -8398,6 +8398,10 @@ export async function migrateCrestv1( req, res ) {
               vmType: 'LKVM',
             };
 
+            const vmIdentifier = `vm${k+1}=${vmTemplate.vmName}+${vmTemplate.vmHeight}+${vmTemplate.vmWidth}+${vmTemplate.startYPosition}+${vmTemplate.endYPosition}+${vmTemplate.xZone}`;
+
+            mapKey += ','+vmIdentifier;
+
             const vmDetails = await planoVmService.upsertOne(
                 {
                   'vmName': vmInsertData.vmName,

package/src/controllers/storeBuilder.controller.js

@@ -3129,11 +3129,20 @@ export async function storeFixturesTaskv2( req, res ) {
                         };
                       } ) );
 
+                      let disabled = true;
+                      if ( compliance?.status && compliance.status == 'incomplete' ) {
+                        let issueDetails = compliance?.answers?.[0]?.issues.find( ( ele ) => ele.status == 'disagree' );
+                        if ( issueDetails ) {
+                          disabled = false;
+                        }
+                      }
+
                       return {
                         ...fixture.toObject(),
                         status: compliance?.status ? compliance.status : '',
                         shelfCount: shelves.shelves,
                         productCount: productCount,
+                        disabled: disabled,
                         vmCount: vmCount,
                         shelfConfig: shelfDetails,
                         vms: vmDetails,
@@ -3247,6 +3256,8 @@ export async function planoList( req, res ) {
           fixtureCapacity: '$fixtureDetails.fixtureCapacity',
           status: 1,
           planoProgress: 1,
+          createdAt: 1,
+          lastUpdate: '$updatedAt',
         },
       },
     ];
@@ -3272,7 +3283,6 @@ export async function planoList( req, res ) {
         ],
       },
     } );
-
     let planoDetails = await planoService.aggregate( query );
 
     if ( !planoDetails[0].data.length ) {

package/src/controllers/task.controller.js

@@ -458,8 +458,14 @@ export async function updateStatus( req, res ) {
     } else {
       currentDateTime = requestData?.currentTime ? dayjs( requestData.currentTime, 'HH:mm:ss' ) : dayjs();
     }
-    let submitTimeString = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
-    await processedService.updateOne( { _id: req.body.taskId }, { checklistStatus: req.body.status, ...( req.body.status == 'inprogress' ) ? { startTime_string: submitTimeString } : { submitTime_string: submitTimeString } } );
+    let timeString = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
+    let comments = {
+      userId: req.user._id,
+      userName: req.user.Name,
+      email: req.user.email,
+      comment: req.body.comments,
+    };
+    await processedService.updateOne( { _id: req.body.taskId }, { checklistStatus: req.body.status, ...( req.body.status == 'inprogress' ) ? { startTime_string: timeString } : { submitTime_string: timeString }, comments: { $push: comments } } );
     if ( req.body.status == 'submit' ) {
       await processedService.deleteMany( { planoId: taskDetails.planoId, userEmail: taskDetails.userEmail, store_id: taskDetails.store_id, ...( taskDetails?.floorId ) ? { floorId: taskDetails.floorId } : {}, date_iso: { $gt: new Date( dayjs().format( 'YYYY-MM-DD' ) ) } } );
     }
@@ -895,3 +901,20 @@ export async function taskSubmitDetails( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+
+export async function redoTask( req, res ) {
+  try {
+    if ( !req.body.taskId ) {
+      return res.sendError( 'Task id is required', 400 );
+    }
+    let getTaskDetails = await processedService.findOne( { _id: req.body.taskId } );
+    if ( !getTaskDetails ) {
+      return res.sendError( e, 204 );
+    }
+    await processedService.updateOne( { _id: req.body.taskId }, { checklistStatus: 'open', redoStatus: true } );
+    return res.sendSuccess( 'Task is republished successfully' );
+  } catch ( e ) {
+    logger.error( { functionName: 'redoTask', error: e } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/dtos/validation.dtos.js

@@ -201,7 +201,7 @@ export const updateTaskConfig = {
 export const uploadBrandListSchema = joi.object( {
   clientId: joi.string().required(),
   brandData: joi.array().items( joi.any() ).min( 1 ).required(),
-  brandUsedList:joi.array().items(joi.any()).min(0)
+  brandUsedList: joi.array().items( joi.any() ).min( 0 ),
 } );
 
 export const uploadBrandList = {

package/src/routes/task.routes.js

@@ -15,4 +15,5 @@ storeBuilderTaskRouter
     .get( '/getFixtureDetails', isAllowedSessionHandler, taskController.getFixtureDetails )
     .get( '/getVmDetails', isAllowedSessionHandler, taskController.getVmDetails )
     .post( '/generateTaskExcel', taskController.generatetaskDetails )
-    .post( '/getSubmitDetails', taskController.taskSubmitDetails );
+    .post( '/getSubmitDetails', taskController.taskSubmitDetails )
+    .post( '/redoTask', isAllowedSessionHandler, taskController.redoTask );