tango-app-api-store-builder 1.0.0-beta-214 → 1.0.0-beta-216

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-214",
+    "version": "1.0.0-beta-216",
     "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 ) {
@@ -1352,13 +1362,21 @@ export async function updateStoreFixture( req, res ) {
           let getMaxTemp = await fixtureConfigService.aggregate( tempQuery );
           templateIndex = getMaxTemp?.[0]?.tempId + 1;
         }
-        templateData.fixtureName= `${header}-${data.fixtureCategory}-varient-${templateIndex}`,
+        templateData.fixtureName= `${header}-${data.fixtureCategory}-variant-${templateIndex}`,
         templateData.templateType = 'sub';
         templateData.masterTemplateId = fixtureMasterTemplate._id;
+        templateData.templateIndex = templateIndex;
+        templateData.createdAt = new Date();
+        templateData.updatedAt = new Date();
         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;
       }
     }
 
@@ -1467,7 +1485,7 @@ export async function updateStoreFixture( req, res ) {
     if ( req.body?.editMode ) {
       await floorService.updateOne( { _id: new mongoose.Types.ObjectId( currentFixture.floorId ) }, { isEdited: true } );
     }
-    res.sendSuccess( 'Updated Successfully' );
+    res.sendSuccess( { message: 'Updated Successfully', ...( configId && { id: configId } ) } );
   } catch ( e ) {
     logger.error( { functionName: 'updateStoreFixture', error: e } );
     return res.sendError( e, 500 );

package/src/controllers/script.controller.js

@@ -9698,44 +9698,45 @@ function transformProducts( products, shelvesByZone, fixtureData ) {
 
 // ---------------------Plano Migrate-------------------------
 
-export async function getAllPlanoIds( req, res ) {
+export async function getAllPlanoIds(req, res){
   try {
-    if ( !req.query?.clientId ) {
-      return res.sendError( 'Client id is required', 400 );
+
+    if (!req.query?.clientId) {
+      return res.sendError('Client id is required', 400);
     }
-    const floorsData = await storeBuilderService.aggregate( [
+    const floorsData = await storeBuilderService.aggregate([
       {
-        '$match': {
-          'clientId': '11',
-        },
-      }, {
-        '$group': {
-          '_id': '$planoId',
-          'storeName': {
-            '$first': '$storeName',
-          },
-          'storeId': {
-            '$first': '$storeId',
-          },
-        },
+      '$match': {
+        'clientId': '11'
+      }
       }, {
-        '$project': {
-          'planoId': '$_id',
-          'storeName': 1,
-          'storeId': 1,
+      '$group': {
+        '_id': '$planoId',
+        'storeName': {
+        '$first': '$storeName'
         },
+        'storeId': {
+        '$first': '$storeId'
+        }
+      }
+      }, {  
+      '$project': {
+        'planoId': '$_id',
+        'storeName': 1,
+        'storeId': 1
+      }
       }, {
-        '$sort': { storeName: 1 },
-      },
-    ] );
+      '$sort': { storeName: 1 }
+      }
+    ]);
 
-    if ( floorsData ) {
-      return res.sendSuccess( floorsData );
+    if (floorsData) {
+      return res.sendSuccess(floorsData);
     } else {
-      return res.sendError( 'No floor data found', 204 );
+      return res.sendError("No floor data found", 204)
     }
-  } catch ( error ) {
-    console.log( '@@ ~ getAllPlanoIds [ERR]:', error );
-    return res.sendError( e, 500 );
+  } catch (error) {
+    console.log("@@ ~ getAllPlanoIds [ERR]:", error);
+    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' ),
                           ),
@@ -5306,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 ) {