tango-app-api-store-builder 1.0.0-beta-213 → 1.0.0-beta-215

package/package.json

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

package/src/controllers/managePlano.controller.js

@@ -979,7 +979,7 @@ export async function updateFixtureStatus( req, res ) {
             { 'ans._id': new mongoose.Types.ObjectId( req.body.answerId ) },
           ] );
 
-      await planoTaskService.updateOne( { _id: req.body._id }, { approvalStatus: 'approved' } );
+      await planoTaskService.updateOne( { _id: req.body._id }, { approvalStatus: 'approved', taskType: 'initial' } );
       let fixtureTask = await planoTaskService.find(
           {
             planoId: new mongoose.Types.ObjectId( req.body.planoId ),
@@ -1224,16 +1224,26 @@ export async function updateStoreFixture( req, res ) {
   try {
     const { fixtureId, data } = req.body;
 
+    let configId;
+
     const currentFixture = await storeFixtureService.findOne( { _id: new mongoose.Types.ObjectId( fixtureId ) } );
     let currentFixtureDoc = currentFixture.toObject();
     if ( req?.body?.taskType?.includes( 'fixture' ) || data?.taskType?.includes( 'fixture' ) ) {
       let shelfDetails = await fixtureShelfService.find( { fixtureId: fixtureId } );
       data.shelfConfig.forEach( ( ele ) => {
         let findShelfProduct = shelfDetails.find( ( shelf ) => shelf.shelfNumber == ele.shelfNumber );
-        ele.productBrandName = findShelfProduct?.productBrandName ?? [];
-        ele.productCategory = findShelfProduct?.productCategory ?? [];
-        ele.productSubCategory = findShelfProduct?.productSubCategory ?? [];
-        ele.zone = findShelfProduct?.zone ?? 'Bottom';
+        if ( !ele?.zone ) {
+          ele.zone = findShelfProduct?.zone ?? 'Bottom';
+        }
+        if ( !ele?.productBrandName ) {
+          ele.productBrandName = findShelfProduct?.productBrandName ?? [];
+        }
+        if ( !ele?.productCategory ) {
+          ele.productCategory = findShelfProduct?.productCategory ?? [];
+        }
+        if ( !ele?.productSubCategory ) {
+          ele.productSubCategory = findShelfProduct?.productSubCategory ?? [];
+        }
       } );
       let vmConfig = [];
       for ( let vm of data.vmConfig ) {
@@ -1356,9 +1366,14 @@ export async function updateStoreFixture( req, res ) {
         templateData.templateType = 'sub';
         templateData.masterTemplateId = fixtureMasterTemplate._id;
         let subTemplate = await fixtureConfigService.create( templateData );
+        configId = subTemplate._id;
+
+        console.log( subTemplate, 'subTemplate' );
 
         data.fixtureConfigId = subTemplate._id;
         data.masterTemplateId = fixtureMasterTemplate._id;
+      } else {
+        data.fixtureConfigId = fixturesubTemplate?.[0]?._id;
       }
     }
 
@@ -1464,7 +1479,10 @@ export async function updateStoreFixture( req, res ) {
           },
       );
     }
-    res.sendSuccess( 'Updated Successfully' );
+    if ( req.body?.editMode ) {
+      await floorService.updateOne( { _id: new mongoose.Types.ObjectId( currentFixture.floorId ) }, { isEdited: true } );
+    }
+    res.sendSuccess( { message: 'Updated Successfully', ...( configId && { id: configId } ) } );
   } catch ( e ) {
     logger.error( { functionName: 'updateStoreFixture', error: e } );
     return res.sendError( e, 500 );

package/src/controllers/storeBuilder.controller.js

@@ -3552,7 +3552,7 @@ export async function storeFixturesTaskv2( req, res ) {
                             let disabled = true;
                             if ( compliance?.status ) {
                               const hasDisagree = compliance?.answers?.some( ( answer ) =>
-                                answer?.status === 'disagree' || ( req.body?.type == 'fixture' && req?.body?.redo && compliance.status == 'complete' && !answer?.status ) ||
+                                answer?.status === 'disagree' ||
                                 answer?.issues?.some( ( issue ) =>
                                   issue?.Details?.some( ( detail ) => detail.status === 'disagree' ),
                                 ),
@@ -3655,7 +3655,7 @@ export async function storeFixturesTaskv2( req, res ) {
                       let disabled = true;
                       if ( compliance?.status ) {
                         const hasDisagree = compliance?.answers?.some( ( answer ) =>
-                          answer?.status === 'disagree' || ( req.body?.type == 'fixture' && req?.body?.redo && compliance.status == 'complete' && !answer?.status ) ||
+                          answer?.status === 'disagree' ||
                           answer?.issues?.some( ( issue ) =>
                             issue?.Details?.some( ( detail ) => detail.status === 'disagree' ),
                           ),
@@ -4606,7 +4606,7 @@ export async function planoList( req, res ) {
         } );
       }
       if ( inputData.filter.status.includes( 'completed' ) ) {
-        let taskType= [ 'layout', 'fixture', 'vm' ];
+        let taskType= [ 'fixture' ];
         let andCondition = [];
         taskType.forEach( ( type ) => {
           andCondition.push(
@@ -4617,7 +4617,7 @@ export async function planoList( req, res ) {
                 },
               } },
               {
-                [`taskDetails.${type}Status`]: '',
+                [`taskDetails.${type}Status`]: 'complete',
               },
           );
         } );
@@ -4890,6 +4890,7 @@ export async function getTaskDetails( req, res ) {
               floorId: '$_id.floorId',
               redoStatus: '$redoStatus',
               endTime: '$scheduleEndTime_iso',
+              taskId: '$taskId',
               breach: {
                 $cond: {
                   if: {
@@ -5274,6 +5275,7 @@ export async function getTaskDetails( req, res ) {
                 redoStatus: '$$task.redoStatus',
                 endTime: '$$task.endTime',
                 breach: '$$task.breach',
+                taskId: '$$task.taskId',
                 feedbackStatus: {
                   $switch: {
                     branches: [
@@ -5304,7 +5306,7 @@ export async function getTaskDetails( req, res ) {
     let taskInfo = await planotaskService.aggregate( query );
     let disabledInfo = [];
     let floorDetails = await layoutService.findOne( { _id: req.query.floorId }, { isEdited: 1, planoProgress: 1 } );
-    disabledInfo = taskInfo?.[0]?.taskStatus?.filter( ( ele ) => ( ( ele.feedbackStatus && ![ 'complete', 'disagree' ].includes( ele.feedbackStatus ) ) || ele.status != 'submit' ) && !ele?.breach );
+    disabledInfo = taskInfo?.[0]?.taskStatus?.filter( ( ele ) => ( ele.feedbackStatus && ![ 'complete', 'disagree' ].includes( ele.feedbackStatus ) && ele.status == 'submit' ) || ( ele.status != 'submit' && !ele?.breach ) );
     if ( floorDetails.isEdited ) {
       let findPending = taskInfo?.[0]?.taskStatus?.findIndex( ( ele ) => ele.type == 'fixture' && ele.feedbackStatus == 'pending' );
       if ( findPending != -1 ) {

package/src/controllers/task.controller.js

@@ -1113,7 +1113,7 @@ export async function revokeTask( req, res ) {
     if ( !req.body.floorId ) {
       return res.sendError( 'floor id is required', 400 );
     }
-    await processedService.deleteMany( { planoId: req.body.planoId, floorId: req.body.floorId, checklistStatus: { $ne: 'submit' }, ...( req.body?.type && { planoType: req.body?.type } ) } );
+    await processedService.deleteMany( { planoId: req.body.planoId, floorId: req.body.floorId, ...( req.body?.type != 'fixture' && { checklistStatus: { $ne: 'submit' } } ), ...( req.body?.type && { planoType: req.body?.type } ) } );
     return res.sendSuccess( 'Task revoked successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'revokeTask', error: e } );