tango-app-api-store-builder 1.0.0-beta-137 → 1.0.0-beta-139

package/package.json

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

package/src/controllers/managePlano.controller.js

@@ -1,7 +1,7 @@
 import * as floorService from '../service/storeBuilder.service.js';
 import { logger } from 'tango-app-api-middleware';
 // import * as storeService from '../service/store.service.js';
-// import * as planoService from '../service/planogram.service.js';
+import * as planoService from '../service/planogram.service.js';
 import * as storeFixtureService from '../service/storeFixture.service.js';
 import * as fixtureShelfService from '../service/fixtureShelf.service.js';
 // import * as planoProductService from '../service/planoProduct.service.js';
@@ -634,8 +634,23 @@ export async function updateFixtureStatus( req, res ) {
             { 'iss._id': new mongoose.Types.ObjectId( req.body.issueId ) },
           ] );
     }
+    let vmTask = await planoTaskService.find(
+        {
+          planoId: new mongoose.Types.ObjectId( req.body.planoId ),
+          floorId: new mongoose.Types.ObjectId( req.body.floorId ),
+          type: 'vm',
+        },
 
-
+    );
+    let allTaskDone = vmTask.filter( ( data ) => data.status === 'incomplete' );
+    if ( allTaskDone.length === 0 ) {
+      await planoService.updateOne(
+          {
+            _id: new mongoose.Types.ObjectId( req.body.planoId ),
+          },
+          { $set: { planoProgress: 100 } },
+      );
+    }
     res.sendSuccess( 'updated successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'updateFixtureStatus', error: e } );

package/src/controllers/planoLibrary.controller.js

@@ -77,7 +77,7 @@ export async function fixtureBulkUpload( req, res ) {
       let FixLibCode = await getMaxFixtureLibCode();
       groupedData[ele].fixtureLibCode = FixLibCode;
       // fixtureData.push( groupedData[ele] );
-      await planoLibraryService.findOneAndUpdate( { 'fixtureCategory': groupedData[ele].fixtureCategory, 'fixtureWidth.value': groupedData[ele].fixtureWidth.value, 'fixtureWidth.unit': groupedData[ele].fixtureWidth.unit }, groupedData[ele] );
+      await planoLibraryService.upsertOne( { 'fixtureCategory': groupedData[ele].fixtureCategory, 'fixtureWidth.value': groupedData[ele].fixtureWidth.value, 'fixtureWidth.unit': groupedData[ele].fixtureWidth.unit }, groupedData[ele] );
       // }
     }
     // let deleteList = inputData.deleteFixtureList.map( ( ele ) => new ObjectId( ele ) );

package/src/controllers/storeBuilder.controller.js

@@ -3053,9 +3053,9 @@ export async function storeFixturesTaskv2( req, res ) {
                                 redoCount++;
                                 disabled = false;
                               }
-                              if ( compliance?.taskType == 'redo' ) {
-                                disabled = false;
-                              }
+                            }
+                            if ( compliance?.taskType == 'redo' ) {
+                              disabled = false;
                             }
 
                             return {
@@ -3153,9 +3153,9 @@ export async function storeFixturesTaskv2( req, res ) {
                           redoCount++;
                           disabled = false;
                         }
-                        if ( compliance.taskType == 'redo' ) {
-                          disabled = false;
-                        }
+                      }
+                      if ( compliance?.taskType == 'redo' ) {
+                        disabled = false;
                       }
 
                       return {
@@ -4183,3 +4183,16 @@ export async function getTaskDetails( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+
+export async function getPlanoUser( req, res ) {
+  try {
+    let userList = await planoStaticData.findOne( { type: 'user' }, { data: 1 } );
+    if ( !userList?.data?.includes( req.user.email ) ) {
+      return res.sendSuccess( 'Unauthorized' );
+    }
+    return res.sendSuccess( 'Authorized' );
+  } catch ( e ) {
+    logger.error( { functionName: 'getPlanoUser', error: e } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/controllers/task.controller.js

@@ -293,11 +293,9 @@ export async function createTask( req, res ) {
               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' ) {
-                  let taskIdList = await planoTaskService.find( { planoId: planoDetails?._id, floorId: taskData.floorId } );
-                  taskIdList = taskIdList.map( ( ele ) => ele.taskId );
-                  await planoTaskService.deleteMany( { planoId: planoDetails?._id, floorId: taskData.floorId } );
+                  await planoTaskService.deleteMany( { planoId: planoDetails?._id, floorId: taskData?.floorId } );
                   planoProgress = 25;
-                  await processedService.deleteMany( { _id: taskIdList } );
+                  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' );

package/src/routes/storeBuilder.routes.js

@@ -50,4 +50,5 @@ storeBuilderRouter
 
 storeBuilderRouter
     .post( '/planoList', isAllowedSessionHandler, storeBuilderController.planoList )
-    .get( '/taskDetails', isAllowedSessionHandler, storeBuilderController.getTaskDetails );
+    .get( '/taskDetails', isAllowedSessionHandler, storeBuilderController.getTaskDetails )
+    .get( '/getPlanoUser', isAllowedSessionHandler, storeBuilderController.getPlanoUser );