tango-app-api-store-builder 1.0.0-beta-108 → 1.0.0-beta-110

package/src/controllers/task.controller.js

@@ -11,7 +11,7 @@ import * as checklistService from '../service/checklist.service.js';
 import timeZone from 'dayjs/plugin/timezone.js';
 import * as planoProductService from '../service/planoProduct.service.js';
 import mongoose from 'mongoose';
-const ObjectId = mongoose.Types.ObjectId;
+// const ObjectId = mongoose.Types.ObjectId;
 import * as floorService from '../service/storeBuilder.service.js';
 import * as planoStaticService from '../service/planoStaticData.service.js';
 
@@ -110,6 +110,7 @@ async function createUser( data ) {
 
 export async function createTask( req, res ) {
   try {
+    console.log( 1 );
     let taskDetails = await taskService.find( { isPlano: true, client_id: req.body.clientId, ...( req.body.checkListName )? { checkListName: req.body.checkListName } : {} } );
     let storeList = req.body.stores.map( ( ele ) => ele.store.toLowerCase() );
     let userDetails;
@@ -218,6 +219,7 @@ export async function createTask( req, res ) {
       let storeDetails = await storeService.aggregate( query );
       await Promise.all( storeDetails.map( async ( store ) => {
         let getUserEmail = req.body.stores.find( ( ele ) => ele.store.toLowerCase() == store.storeName.toLowerCase() );
+        console.log( getUserEmail, 'email' );
         let planoDetails = await planoService.findOne( { storeName: store.storeName } );
         if ( planoDetails ) {
           let floorDetails = await floorService.find( { planoId: planoDetails._id }, { _id: 1, floorName: 1 } );
@@ -244,13 +246,13 @@ export async function createTask( req, res ) {
               taskData.checkListName = taskData.checkListName +' - '+ floorDetails[i].floorName;
               taskData.floorId = floorDetails[i]._id;
             }
+            console.log( userDetails );
             taskData.store_id = store.storeId;
             taskData.storeName = store.storeName;
             taskData.userId = userDetails._id;
             taskData.userName = userDetails.userName;
             taskData.userEmail = userDetails.email;
             taskData.planoId = planoDetails?._id;
-            console.log( taskData );
             for ( let i=0; i<req.body.days; i++ ) {
               let currDate = dayjs().add( i, 'day' );
               let insertData = { ...taskData, date_string: currDate.format( 'YYYY-MM-DD' ), date_iso: new Date( currDate.format( 'YYYY-MM-DD' ) ), scheduleStartTime_iso: dayjs.utc( `${currDate.format( 'YYYY-MM-DD' )} 12:00 AM`, 'YYYY-MM-DD hh:mm A' ).format() };
@@ -525,9 +527,6 @@ export async function updateAnswers( req, res ) {
     };
 
     await planoTaskService.updateOne( { planoId: req.body.planoId, floorId: req.body.floorId, fixtureId: req.body.fixtureId, type: req.body.type, date_string: dayjs().format( 'YYYY-MM-DD' ), ...( taskDetails?._id ) ? { taskId: taskDetails?._id } :{} }, data );
-    // req.body.taskId = taskDetails?._id;
-    // req.body.status = 'submit';
-    // await updateStatus( req, res );
     return res.sendSuccess( 'Fixture details updated successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'updateAnswers', error: e } );
@@ -673,26 +672,44 @@ export async function generatetaskDetails( req, res ) {
           userEmail: { $nin: [ 'sandeep.pal@yopmail.com', 'balaji@tangotech.co.in', 'gowri@tangotech.co.in', 'gowri@yopmail.com' ] },
         },
       },
-      {
-        $lookup: {
-          from: 'checklistassignconfigs',
-          let: { storeId: '$store_id', email: '$userEmail' },
-          pipeline: [
-            {
-              $match: {
-                $expr: {
-                  $and: [
-                    { $eq: [ '$checkListId', new ObjectId( '6789e3c7a5683c58215ec089' ) ] },
-                    { $eq: [ '$store_id', '$$storeId' ] },
-                    { $eq: [ '$userEmail', '$$email' ] },
-                  ],
-                },
-              },
-            },
-          ],
-          as: 'assignUser',
-        },
-      },
+      // {
+      //   $lookup: {
+      //     from: '$planogram',
+      //     let: { plano: '$planoId' },
+      //     pipeline: [
+      //       {
+      //         $match: {
+      //           $expr: {
+      //             $and: {
+      //               $eq: [ '$_id', '$$plano' ],
+      //             },
+      //           },
+      //         },
+      //       },
+      //     ],
+      //     as: 'planogram',
+      //   },
+      // },
+      // {
+      //   $lookup: {
+      //     from: 'checklistassignconfigs',
+      //     let: { storeId: '$store_id', email: '$userEmail' },
+      //     pipeline: [
+      //       {
+      //         $match: {
+      //           $expr: {
+      //             $and: [
+      //               // { $eq: [ '$checkListId', new ObjectId( '6789e3c7a5683c58215ec089' ) ] },
+      //               { $eq: [ '$store_id', '$$storeId' ] },
+      //               { $eq: [ '$userEmail', '$$email' ] },
+      //             ],
+      //           },
+      //         },
+      //       },
+      //     ],
+      //     as: 'assignUser',
+      //   },
+      // },
       {
         $project: {
           _id: 1,
@@ -717,7 +734,7 @@ export async function generatetaskDetails( req, res ) {
           _id: '$planoId',
           count: { $sum: 1 },
           storeName: { $first: '$storeName' },
-          taskId: { $last: '$_id' },
+          taskId: { $push: '$_id' },
           checklistStatus: { $push: '$checklistStatus' },
           date_string: { $push: '$date_string' },
         },
@@ -735,10 +752,26 @@ export async function generatetaskDetails( req, res ) {
       },
     ];
     let taskDetails = await processedService.aggregate( query );
-    console.log( taskDetails.map( ( ele ) => ele.taskId ) );
-    let processedTaskDetails = await planoTaskService.find( { date_string: { $gte: req.body.fromDate, $lte: req.body.toDate }, type: 'layout', ...( req.body.store.length ) ? { storeName: { $in: req.body.store } } : {}, taskId: { $in: taskDetails.map( ( ele ) => ele.taskId ) } }, { status: 1, planoId: 1, date_string: 1, _id: 0, taskId: 1 } );
+    console.log( taskDetails.flatMap( ( ele ) => ele.taskId ) );
+    // ...( req.body.store.length ) ? { storeName: { $in: req.body.store } } : {}, taskId: { $in: taskDetails.flatMap( ( ele ) => ele.taskId ) } },
+    let processedTaskDetails = await planoTaskService.find( { date_string: { $gte: req.body.fromDate, $lte: req.body.toDate }, type: 'layout' }, { status: 1, planoId: 1, date_string: 1, _id: 0, taskId: 1 } );
+    console.log( processedTaskDetails.length );
+
+    processedTaskDetails = await Promise.all( processedTaskDetails.map( async ( ele ) => {
+      ele = { ...ele.toObject(), storeName: '' };
+      if ( ele.planoId ) {
+        let planoDetails = await planoService.findOne( { _id: ele.planoId }, { storeName: 1 } );
+        console.log( planoDetails );
+        if ( planoDetails ) {
+          ele.storeName = planoDetails.storeName;
+        }
+      }
+      return ele;
+    } ) );
+
     processedTaskDetails.forEach( ( item ) => {
       let taskIndex = taskDetails.findIndex( ( taskItem ) => taskItem.checklistStatus.includes( 'submit' ) && taskItem.date_string.includes( item.date_string ) && item.planoId.toString() == taskItem.planoId.toString() );
+      console.log( taskIndex, 'index' );
       if ( taskIndex != -1 ) {
         taskDetails[taskIndex].storeStatus = item.status == 'complete' ? 'yes' : 'No';
       }
@@ -787,8 +820,10 @@ export async function generatetaskDetails( req, res ) {
     }
 
     let data = [ ...completeStore, ...incompleteStore ];
+    let yesCount = completeStore.filter( ( ele ) => ele.storeStatus == 'yes' );
+    let noCount = completeStore.filter( ( ele ) => ele.storeStatus == 'No' );
 
-    return res.sendSuccess( { count: data.length, completeStore: completeStore.length, incompleteStore: incompleteStore.length, data } );
+    return res.sendSuccess( { count: data.length, completeStore: completeStore.length, incompleteStore: incompleteStore.length, yesCount: yesCount.length, noCount: noCount.length, data } );
   } catch ( e ) {
     console.log( e );
     logger.error( { functioName: 'generatetaskDetails', error: e } );

package/src/dtos/validation.dtos.js

@@ -168,6 +168,16 @@ export const getClient = {
   query: getClientSchema,
 };
 
+export const brandSchema = joi.object( {
+  clientId: joi.string().required(),
+  export: joi.boolean().optional(),
+  emptyDownload: joi.boolean().optional(),
+} );
+
+export const brandDetails ={
+  body: brandSchema,
+};
+
 export const deleteVMTypeImageSchema = joi.object( {
   vmId: joi.string().required(),
   index: joi.number().required(),
@@ -211,10 +221,8 @@ export const fixtureBulkUpload = {
 
 export const addUpdateBrandSchema = joi.object( {
   clientId: joi.string().required(),
-  brandId: joi.string().optional(),
-  brandName: joi.string().required(),
-  subCategory: joi.array().items( joi.any() ).min( 0 ).required(),
-  category: joi.array().items( joi.any() ).min( 1 ).required(),
+  brandUsedList: joi.array().items( joi.any() ).min( 0 ).required(),
+  brandData: joi.array().items( joi.any() ).min( 1 ).required(),
 } );
 
 export const addUpdateBrand = {

package/src/routes/planoLibrary.routes.js

@@ -24,7 +24,7 @@ planoLibraryRouter
     .post( '/deleteVmTypeImage', isAllowedSessionHandler, validate( validateDtos.deleteVMTypeImage ), planoLibraryController.deletevmTypeImage );
 
 planoLibraryRouter
-    .get( '/getBrandList', isAllowedSessionHandler, validate( validateDtos.getClient ), planoLibraryController.getBrandList )
+    .post( '/getBrandList', isAllowedSessionHandler, validate( validateDtos.brandDetails ), planoLibraryController.getBrandList )
     .post( '/addUpdateBrand', isAllowedSessionHandler, validate( validateDtos.addUpdateBrand ), planoLibraryController.addUpdateBrandList )
     .post( '/uploadBrandList', isAllowedSessionHandler, validate( validateDtos.uploadBrandList ), planoLibraryController.uploadBrandList )
     .post( '/updateTaskconfig', isAllowedSessionHandler, validate( validateDtos.updateTaskConfig ), planoLibraryController.updateTaskConfig )

package/src/service/fixtureConfig.service.js

@@ -5,7 +5,7 @@ export async function find( query={}, field={} ) {
 }
 
 export async function findOne( query={}, field={} ) {
-  return model.fixtureCpaconfigModel.findOne( query, field );
+  return model.fixtureConfigModel.findOne( query, field );
 }
 
 export async function insertMany( data = [] ) {
@@ -42,9 +42,3 @@ export async function deleteOne( query = {} ) {
 export const findAndSort = async ( query={}, field={}, sort={} ) => {
   return await model.fixtureConfigModel.find( query, field ).sort( sort ).collation( { locale: 'en_US', numericOrdering: true } );
 };
-
-export async function sortAndFindOne( query = {}, field = {}, sort = {} ) {
-  return model.fixtureConfigModel.find( query, field )
-      .sort( sort )
-      .limit( 1 );
-}