tango-app-api-store-builder 1.0.0-beta-98 → 1.0.0-beta-99

package/src/controllers/task.controller.js

@@ -4,16 +4,14 @@ import * as storeService from '../service/store.service.js';
 import * as processedChecklistService from '../service/processedchecklist.service.js';
 import * as userService from '../service/user.service.js';
 import dayjs from 'dayjs';
-import { logger, fileUpload, signedUrl } from 'tango-app-api-middleware';
+import { logger, fileUpload, signedUrl, download } from 'tango-app-api-middleware';
 import * as planoTaskService from '../service/planoTask.service.js';
 import * as planoService from '../service/planogram.service.js';
 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;
 import * as floorService from '../service/storeBuilder.service.js';
-import * as planoStaticService from '../service/planoStaticData.service.js';
+import mongoose from 'mongoose';
 
 dayjs.extend( timeZone );
 
@@ -116,18 +114,6 @@ export async function createTask( req, res ) {
     if ( !taskDetails.length ) {
       return res.sendError( 'No data found', 204 );
     }
-    let endDate;
-    let scheduleEndTime = '11:59 PM';
-    let taskConfig = await planoStaticService.findOne( { clientId: req.body.clientId } );
-    if ( taskConfig && !req.body?.endTime ) {
-      scheduleEndTime = taskConfig.dueTime;
-      req.body.days = taskConfig?.dueDay || 0;
-      req.body.geoFencing = taskConfig?.allowedStoreLocation || false;
-    }
-    if ( req.body?.endTime ) {
-      scheduleEndTime = req.body.endTime;
-    }
-    endDate = dayjs().add( req.body.days, 'day' ).format( 'YYYY-MM-DD' );
     let userEmailList = [ ...new Set( req.body.stores.map( ( ele ) => ele.email ) ) ];
     for ( let mail of userEmailList ) {
       let query = [
@@ -154,7 +140,7 @@ export async function createTask( req, res ) {
         await createUser( userData );
       }
     }
-    endDate = `${endDate} ${scheduleEndTime}`;
+    let endDate = dayjs().add( req.body.days, 'day' ).format( 'YYYY-MM-DD' );
     await Promise.all( taskDetails.map( async ( task ) => {
       let splitName = task?.checkListName.split( ' ' );
       splitName.pop();
@@ -166,11 +152,11 @@ export async function createTask( req, res ) {
         checkListName: task.checkListName,
         checkListId: task._id,
         scheduleStartTime: '12:00 AM',
-        scheduleEndTime: scheduleEndTime,
+        scheduleEndTime: '11:59 PM',
         scheduleStartTime_iso: dayjs.utc( '12:00 AM', 'hh:mm A' ).format(),
-        scheduleEndTime_iso: dayjs.utc( endDate, 'YYYY-MM-DD hh:mm A' ).format(),
+        scheduleEndTime_iso: dayjs( endDate ).utc( '11:59 PM', 'hh:mm A' ).format(),
         allowedOverTime: false,
-        allowedStoreLocation: req.body?.geoFencing || false,
+        allowedStoreLocation: false,
         createdBy: task.createdBy,
         createdByName: task.createdByName,
         questionAnswers: [],
@@ -533,30 +519,6 @@ export async function updateAnswers( req, res ) {
     return res.sendError( e, 500 );
   }
 }
-export async function updateAnswersv2( req, res ) {
-  try {
-    let taskDetails = await processedService.findOne( { date_string: dayjs().format( 'YYYY-MM-DD' ), userId: req.user._id, isPlano: true, planoType: 'layout' } );
-    let data = {
-      fixtureId: req.body.fixtureId,
-      answers: req.body.answers,
-      status: req.body.answers?.find( ( ans ) => typeof ans.answer == 'boolean' && ans?.answer == false ) ? 'incomplete' : 'complete',
-      planoId: req.body.planoId,
-      floorId: req.body.floorId,
-      type: req.body.type,
-      date_iso: new Date( dayjs().format( 'YYYY-MM-DD' ) ),
-      taskId: taskDetails?._id,
-      storeName: taskDetails?.storeName,
-      storeId: taskDetails?.store_id,
-    };
-    console.log( data );
-    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 );
-
-    return res.sendSuccess( 'Fixture details updated successfully' );
-  } catch ( e ) {
-    logger.error( { functionName: 'updateAnswers', error: e } );
-    return res.sendError( e, 500 );
-  }
-}
 
 export async function getFixtureDetails( req, res ) {
   try {
@@ -667,33 +629,11 @@ export async function generatetaskDetails( req, res ) {
           date_iso: { $gte: new Date( req.body.fromDate ), $lte: new Date( req.body.toDate ) },
           isPlano: true,
           planoType: 'layout',
-          ...( req.body?.store?.length ) ? { storeName: { $in: req.body.store } } :{},
-          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',
         },
       },
       {
         $project: {
-          _id: 1,
+          _id: 0,
           storeName: 1,
           store_id: 1,
           userEmail: 1,
@@ -703,7 +643,7 @@ export async function generatetaskDetails( req, res ) {
           storeStatus: {
             $cond: {
               if: { $eq: [ '$checklistStatus', 'submit' ] },
-              then: '',
+              then: 'Yes',
               else: '',
 
             },
@@ -712,83 +652,51 @@ export async function generatetaskDetails( req, res ) {
       },
       {
         $group: {
-          _id: '$planoId',
+          _id: '$store_id',
           count: { $sum: 1 },
           storeName: { $first: '$storeName' },
-          taskId: { $last: '$_id' },
           checklistStatus: { $push: '$checklistStatus' },
-          date_string: { $push: '$date_string' },
         },
       },
       {
         $project: {
           _id: 0,
-          taskId: 1,
           storeName: 1,
           checklistStatus: 1,
           count: 1,
-          date_string: 1,
-          planoId: '$_id',
         },
       },
     ];
+    console.log( JSON.stringify( query ) );
     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 } );
+    let processedTaskDetails = await planoTaskService.find( { date_string: { $gte: req.body.fromDate, $lte: req.body.toDate }, type: 'layout', status: 'incomplete' } );
     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() );
+      let taskIndex = taskDetails.findIndex( ( taskItem ) => taskItem.checklistStatus == 'submit' && item.date_string == taskItem.date_string && item.planoId.toString() == taskItem.planoId.toString() );
       if ( taskIndex != -1 ) {
-        taskDetails[taskIndex].storeStatus = item.status == 'complete' ? 'yes' : 'No';
+        taskDetails[taskIndex].storeStatus = 'No';
       }
     } );
 
     taskDetails.forEach( ( ele ) => {
       delete ele.planoId;
     } );
+    // console.log( taskDetails );
+    // let completeStore = [ ...new Set( taskDetails.filter( ( ele ) => ele.checklistStatus.includes( 'submit' ) ).map( ( ele ) => ele.storeName ) ) ];
 
+    // let incompleteStore = [ ...new Set( taskDetails.filter( ( ele ) => !ele.checklistStatus.includes( 'submit' ) ).map( ( ele ) => {
+    //   return { storeName: ele.storeName, checklistStatus: ele.checklistStatus[ele.checklistStatus.length-1] };
+    // } ) ) ];
 
-    let completeStore = taskDetails.filter( ( ele ) => ele.checklistStatus.includes( 'submit' ) );
-    completeStore = completeStore.reduce( ( acc, ele ) => {
-      if ( !acc[ele.storeName] ) {
-        acc[ele.storeName] = {
-          storeName: ele.storeName,
-          status: 'submit',
-          storeStatus: ele.storeStatus,
-        };
-      }
-      return acc;
-    }, {} );
-
-    completeStore = Object.values( completeStore );
-
-    let completeStoreList =completeStore.map( ( item ) => item.storeName );
-
-    let incompleteStore = taskDetails.filter( ( ele ) => !ele.checklistStatus.includes( 'submit' ) );
-
-    incompleteStore = incompleteStore.reduce( ( acc, ele ) => {
-      if ( !acc[ele.storeName] ) {
-        acc[ele.storeName] = {
-          storeName: ele.storeName,
-          status: ele.checklistStatus[ele.checklistStatus.length - 1],
-          storeStatus: ele.storeStatus,
-        };
-      }
-      return acc;
-    }, {} );
-
-    incompleteStore = Object.values( incompleteStore );
-
-    incompleteStore = incompleteStore.filter( ( ele ) => !completeStoreList.includes( ele.storeName ) );
+    // incompleteStore = incompleteStore.filter( ( ele ) => !completeStore.includes( ele ) );
 
     if ( !taskDetails.length ) {
       return res.sendError( 'No date found', 204 );
     }
 
-    let data = [ ...completeStore, ...incompleteStore ];
+    // return res.sendSuccess( { completeCount: completeStore.length, store: completeStore, incompleteStore: incompleteStore, incompleteStoreCount: incompleteStore.length } );
 
-    return res.sendSuccess( { count: data.length, completeStore: completeStore.length, incompleteStore: incompleteStore.length, data } );
+    await download( taskDetails, res );
   } catch ( e ) {
-    console.log( e );
     logger.error( { functioName: 'generatetaskDetails', error: e } );
     return res.sendError( e, 500 );
   }
@@ -801,35 +709,22 @@ export async function taskSubmitDetails( req, res ) {
         $match: {
           date_string: { $gte: req.body.fromDate, $lte: req.body.toDate },
           type: 'layout',
-          status: req.body.status,
-        },
-      },
-      {
-        $group: {
-          _id: '',
-          planoId: { $addToSet: '$planoId' },
         },
       },
       {
         $lookup: {
-          from: 'processedtasks',
+          from: 'planograms',
           let: { plano_id: '$planoId' },
           pipeline: [
             {
               $match: {
                 $expr: {
                   $and: [
-                    { $in: [ '$planoId', '$$plano_id' ] },
+                    { $eq: [ '$_id', '$$plano_id' ] },
                   ],
                 },
               },
             },
-            {
-              $group: {
-                _id: '$planoId',
-                storeName: { $first: '$storeName' },
-              },
-            },
             {
               $project: {
                 storeName: 1,
@@ -843,15 +738,41 @@ export async function taskSubmitDetails( req, res ) {
       { $unwind: { path: '$planogram', preserveNullAndEmptyArrays: true } },
       {
         $project: {
-          _id: 0,
           storeName: '$planogram.storeName',
+          answers: 1,
+          type: 1,
+          status: 1,
+          planoId: 1,
+          floorId: 1,
+        },
+      },
+      {
+        $group: {
+          _id: '$planoId',
+          storeName: { $first: '$storeName' },
+          answers: { $last: '$answers' },
+          type: { $last: '$type' },
+          status: { $last: '$status' },
+          floorId: { $last: '$floorId' },
+        },
+      },
+      {
+        $project: {
+          storeName: 1,
+          answers: 1,
+          type: 1,
+          status: 1,
+          planoId: '$_id',
+          floorId: 1,
         },
       },
     ];
 
     let processedTaskDetails = await planoTaskService.aggregate( query );
-    processedTaskDetails = processedTaskDetails.map( ( ele ) => ele.storeName );
-    return res.sendSuccess( { count: processedTaskDetails.length, data: processedTaskDetails } );
+    let completeStore = [ ...new Set( processedTaskDetails.filter( ( ele ) => ele.status == 'complete' ).map( ( ele ) => ele.storeName ) ) ];
+    let incompleteStore = [ ...new Set( processedTaskDetails.filter( ( ele ) => ele.status == 'incomplete' ).map( ( ele ) => ele.storeName ) ) ];
+    incompleteStore = incompleteStore.filter( ( ele ) => !completeStore.includes( ele ) );
+    return res.sendSuccess( { complete: { count: completeStore.length, storeList: completeStore }, incompleteStore: { count: incompleteStore.length, storeList: incompleteStore }, data: processedTaskDetails } );
   } catch ( e ) {
     logger.error( { functioName: 'taskSubmitDetails', error: e } );
     return res.sendError( e, 500 );

package/src/dtos/validation.dtos.js

@@ -89,222 +89,4 @@ export const updateStatus = {
   body: updateStatusSchema,
 };
 
-export const createFixtureSchema = joi.object( {
-  fixtureCategory: joi.string().required(),
-  fixtureType: joi.string().required(),
-  clientId: joi.string().required(),
-} );
-
-export const createFixture = {
-  body: createFixtureSchema,
-};
-
-export const updateFixtureSchema = joi.object( {
-  fixtureWidth: joi.object().optional(),
-  fixtureHeight: joi.object().optional(),
-  fixtureCategory: joi.string().optional(),
-  fixtureLength: joi.object().optional(),
-  header: joi.object().optional(),
-  footer: joi.object().optional(),
-  shelfConfig: joi.array().optional(),
-  status: joi.string().required(),
-  fixtureCapacity: joi.number().required(),
-  isBodyEnabled: joi.boolean().required(),
-} );
-
-export const fixtureIdSchema = joi.object( {
-  fixtureId: joi.string().required(),
-} );
-
-export const fixtureId ={
-  query: fixtureIdSchema,
-};
-
-export const bodyFixtureId = {
-  body: fixtureIdSchema,
-};
-
-export const updateFixture = {
-  body: updateFixtureSchema,
-  params: fixtureIdSchema,
-};
-export const fixtureVMListSchema = joi.object( {
-  clientId: joi.string().required(),
-  limit: joi.number().required(),
-  offset: joi.number().required(),
-  sortColumnName: joi.string().required().allow( '' ),
-  sortBy: joi.number().required().allow( '' ),
-  searchValue: joi.string().required().allow( '' ),
-  filter: joi.object( {
-    status: joi.array().items( joi.any() ).min( 0 ),
-    type: joi.array().items( joi.any() ).min( 0 ),
-    size: joi.array().items( joi.any() ).min( 0 ).optional(),
-    brand: joi.array().items( joi.any() ).min( 0 ).optional(),
-    category: joi.array().items( joi.any() ).min( 0 ).optional(),
-    subCategory: joi.array().items( joi.any() ).min( 0 ).optional(),
-  } ).required(),
-  export: joi.boolean().required(),
-  emptyDownload: joi.boolean().required(),
-} );
-
-export const fixtureList = {
-  body: fixtureVMListSchema,
-};
-
-export const addVmTypeSchema = joi.object( {
-  clientId: joi.string().required(),
-  vmData: joi.array().items( joi.any() ).min( 1 ).required(),
-} );
-
-export const addVmType = {
-  body: addVmTypeSchema,
-};
-
-export const getClientSchema = joi.object( {
-  clientId: joi.string().required(),
-} );
-
-export const getClient = {
-  query: getClientSchema,
-};
-
-export const deleteVMTypeImageSchema = joi.object( {
-  vmId: joi.string().required(),
-  index: joi.number().required(),
-} );
-
-export const deleteVMTypeImage = {
-  body: getClientSchema,
-};
-
-export const updateTaskConfigSchema = joi.object( {
-  clientId: joi.string().required(),
-  dueDay: joi.number().required(),
-  dueTime: joi.string().required(),
-  allowedStoreLocation: joi.boolean().required(),
-} );
-
-export const updateTaskConfig = {
-  body: updateTaskConfigSchema,
-};
-
-export const uploadBrandListSchema = joi.object( {
-  clientId: joi.string().required(),
-  brandData: joi.array().items( joi.any() ).min( 1 ).required(),
-} );
-
-export const uploadBrandList = {
-  body: uploadBrandListSchema,
-};
-
-export const fixtureBulkUploadSchema = joi.object( {
-  clientId: joi.string().required(),
-  fixtureData: joi.array().items( joi.any() ).min( 1 ).required(),
-  newFixtureStatus: joi.string().optional(),
-  updateFixtureStatus: joi.string().optional(),
-  deleteFixtureList: joi.array().items( joi.any() ).min( 0 ),
-} );
-
-export const fixtureBulkUpload = {
-  body: fixtureBulkUploadSchema,
-};
-
-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(),
-} );
-
-export const addUpdateBrand = {
-  body: addUpdateBrandSchema,
-};
-
-export const getVmDetailsSchema = joi.object( {
-  vmId: joi.string().required(),
-} );
-
-export const getVmDetails = {
-  query: getVmDetailsSchema,
-};
-
-export const deleteVmLibSchema = joi.object( {
-  vmId: joi.string().required(),
-} );
-
-export const deleteVmLib = {
-  body: deleteVmLibSchema,
-};
-
-export const addUpdateVmSchema = joi.object( {
-  clientId: joi.string().required(),
-  vmName: joi.string().required(),
-  vmType: joi.string().required(),
-  vmBrand: joi.string().required(),
-  vmSubBrand: joi.string().optional().allow( '' ),
-  vmCategory: joi.string().optional().allow( '' ),
-  vmSubCategory: joi.string().optional().allow( '' ),
-  vmHeight: joi.object( {
-    value: joi.number().required(),
-    unit: joi.string().required(),
-  } ).required(),
-  vmWidth: joi.object( {
-    value: joi.number().required(),
-    unit: joi.string().required(),
-  } ).required(),
-  vmImageUrl: joi.string().optional(),
-  isDoubleSided: joi.boolean().required(),
-  status: joi.string().required(),
-  _id: joi.string().optional(),
-} );
-
-export const addUpdateVm = {
-  body: addUpdateVmSchema,
-};
-
-export const vmBulkUploadSchema = joi.object( {
-  clientId: joi.string().required(),
-  vmData: joi.array().items( joi.any() ).min( 1 ).required(),
-  newVmStatus: joi.string().required(),
-  updateVmStatus: joi.string().required(),
-  deleteVmList: joi.array().required(),
-} );
-
-export const vmBulkUpload = {
-  body: vmBulkUploadSchema,
-};
-
-export const createTemplateSchema = joi.object( {
-  clientId: joi.string().required(),
-  fixtureLibraryId: joi.string().required(),
-} );
-
-export const createTemplate = {
-  body: createTemplateSchema,
-};
-
-export const templateIdSchema = joi.object( {
-  templateId: joi.string().required(),
-} );
-
-export const templateId = {
-  body: templateIdSchema,
-};
-
-export const queryTemplateId = {
-  query: templateIdSchema,
-};
-
-export const updateFixtureTaskSchema = joi.object( {
-  endDate: joi.string().required(),
-  clientId: joi.string().required(),
-  storeList: joi.array().items( joi.any() ).min( 1 ).required(),
-  endTime: joi.string().required(),
-  geoFencing: joi.boolean().required(),
-} );
-
-export const updateFixtureTask = {
-  body: updateFixtureTaskSchema,
-};
 

package/src/routes/script.routes.js

@@ -29,6 +29,4 @@ scriptRouter
     .post( '/downloadPlanoImages', scriptController.downloadPlanoImage )
     .post( '/getVideoUrls', scriptController.getVideoLinks )
     .post( '/updateExcelPlanogram', scriptController.updateExcelPlanogram )
-    .post( '/recorrectTaskData', scriptController.recorrectTaskData )
-    .post( '/migrateCrest', scriptController.migrateCrestv1 )
-;
+    .post( '/recorrectTaskData', scriptController.recorrectTaskData );

package/src/routes/storeBuilder.routes.js

@@ -43,8 +43,4 @@ storeBuilderRouter
     .post( '/getFixtureBrands', isAllowedSessionHandler, storeBuilderController.getFixtureBrands )
     .post( '/checkPlanoExist', isAllowedSessionHandler, storeBuilderController.checkPlanoExist )
     .post( '/storeLayoutElements', isAllowedSessionHandler, storeBuilderController.storeLayoutElements )
-    .post( '/qrScan', storeBuilderController.qrScan )
-    .post( '/storeFixturesV2', validate( validateDtos.storeList ), storeBuilderController.storeFixturesv2 )
-    .post( '/fixtureShelfDetailsv2', validate( validateDtos.fixtureShelfProduct ), storeBuilderController.fixtureShelfProductv2 )
-    .post( '/storeFixturesTaskv2', storeBuilderController.storeFixturesTaskv2 )
-;
+    .post( '/qrScan', storeBuilderController.qrScan );

package/src/routes/task.routes.js

@@ -11,7 +11,6 @@ storeBuilderTaskRouter
     .post( '/uploadImage', isAllowedSessionHandler, taskController.uploadImage )
     .post( '/updateStatus', isAllowedSessionHandler, taskController.updateStatus )
     .post( '/updateAnswers', isAllowedSessionHandler, taskController.updateAnswers )
-    .post( '/updateAnswersv2', isAllowedSessionHandler, taskController.updateAnswersv2 )
     .get( '/getFixtureDetails', isAllowedSessionHandler, taskController.getFixtureDetails )
     .get( '/getVmDetails', isAllowedSessionHandler, taskController.getVmDetails )
     .post( '/generateTaskExcel', taskController.generatetaskDetails )

package/src/service/fixtureConfig.service.js

@@ -8,37 +8,14 @@ export async function findOne( query={}, field={} ) {
   return model.fixtureConfigModel.findOne( query, field );
 }
 
-export async function insertMany( data = [] ) {
+export async function insertMany( data ) {
   return model.fixtureConfigModel.insertMany( data );
 }
 
-export async function aggregate( query = [] ) {
+export async function aggregate( query ) {
   return model.fixtureConfigModel.aggregate( query );
 }
 
-export async function updateOne( query = {}, record = {} ) {
+export async function updateOne( query, record ) {
   return model.fixtureConfigModel.updateOne( query, { $set: record } );
 }
-
-export async function count( query = {} ) {
-  return model.fixtureConfigModel.countDocuments( query );
-}
-
-export async function upsertOne( query, record ) {
-  return model.fixtureConfigModel.findOneAndUpdate(
-      query,
-      record,
-      { upsert: true, new: true },
-  );
-}
-export async function create( data = {} ) {
-  return model.fixtureConfigModel.create( data );
-}
-
-export async function deleteOne( query = {} ) {
-  return model.fixtureConfigModel.deleteOne( query );
-}
-
-export const findAndSort = async ( query={}, field={}, sort={} ) => {
-  return await model.fixtureConfigModel.find( query, field ).sort( sort ).collation( { locale: 'en_US', numericOrdering: true } );
-};

package/src/service/planoStaticData.service.js

@@ -6,6 +6,3 @@ export async function find( query={}, field={} ) {
 export async function findOne( query={}, field={} ) {
   return model.planoStaticData.findOne( query, field );
 }
-export async function updateOne( query={}, record={} ) {
-  return model.planoStaticData.updateOne( query, record, { upsert: true } );
-}