tango-app-api-trax 1.0.0-alpha-task.131 → 1.0.0-alpha-task.132

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "1.0.0-alpha-task.131",
+    "version": "1.0.0-alpha-task.132",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/download.controller.js

@@ -2,7 +2,10 @@ import { logger, signedUrl, sendMessageToQueue } from 'tango-app-api-middleware'
 import dayjs from 'dayjs';
 import * as downloadService from '../services/download.services.js';
 import * as processedchecklistService from '../services/processedchecklist.services.js';
+import * as processedTaskService from '../services/processedTaskList.service.js';
+import * as taskConfigService from '../services/taskConfig.service.js';
 import * as checklistService from '../services/checklist.service.js';
+// import * as processedTaskconfigService from '../services/processedTaskConfig.service.js';
 import * as clientService from '../services/clients.services.js';
 import * as storeService from '../services/store.service.js';
 
@@ -40,7 +43,7 @@ export const downloadInsert = async ( req, res ) => {
       }
     }
 
-    if ( requestData.sourceCheckList_id && requestData.sourceCheckList_id !='' ) {
+    if ( requestData.sourceCheckList_id && requestData.sourceCheckList_id != '' ) {
       let getChecklistQuery = [];
       getChecklistQuery.push( { $project: { sourceCheckList_id: 1, date_iso: 1, store_id: 1, checklistStatus: 1 } } );
       getChecklistQuery.push( {
@@ -54,9 +57,12 @@ export const downloadInsert = async ( req, res ) => {
         },
       } );
       getChecklistQuery.push( { $count: 'totalCount' } );
-      let getChecklistCount = await processedchecklistService.aggregate( getChecklistQuery );
 
-      if ( getChecklistCount && getChecklistCount[0]?.totalCount && getChecklistCount[0].totalCount >0 ) {
+      let getChecklistCount = await processedchecklistService.aggregate( getChecklistQuery );
+      if ( requestData.insertType === 'task' ) {
+        getChecklistCount = await processedTaskService.aggregate( getChecklistQuery );
+      }
+      if ( getChecklistCount && getChecklistCount[0]?.totalCount && getChecklistCount[0].totalCount > 0 ) {
         // console.log( 'if' );
         // console.log( 'getChecklistCountgetChecklistCount[0].totalCount =>', getChecklistCount[0]?.totalCount );
       } else {
@@ -65,7 +71,7 @@ export const downloadInsert = async ( req, res ) => {
     }
 
     if ( requestData.fileType == 'pdf' ) {
-      if ( requestData?.sourceCheckList_id && requestData?.sourceCheckList_id !='' ) {
+      if ( requestData?.sourceCheckList_id && requestData?.sourceCheckList_id != '' ) {
         fileType = 'pdfzip';
       }
       if ( requestData?.checklistId && requestData?.checklistId.length > 1 ) {
@@ -76,7 +82,7 @@ export const downloadInsert = async ( req, res ) => {
     if ( requestData.checklistName != '' ) {
       name = requestData.checklistName + '_' + dayjs( requestData.fromDate ).format( 'DD/MM/YYYY' );
       if ( requestData?.toDate ) {
-        name = name + '-'+ dayjs( requestData?.toDate ).format( 'DD/MM/YYYY' );
+        name = name + '-' + dayjs( requestData?.toDate ).format( 'DD/MM/YYYY' );
       }
       let regexName = new RegExp( `^${name.split( '(' )[0]} \\(.*\\)$`, 'i' );
       let type = requestData.fileType || 'pdfzip';
@@ -88,7 +94,7 @@ export const downloadInsert = async ( req, res ) => {
       name = requestData?.checklistName;
     }
 
-    name = name+'-'+requestData.fileType;
+    name = name + '-' + requestData.fileType;
     let insertData = {
       'date_string': requestData.fromDate || '',
       'sourceCheckList_id': requestData?.sourceCheckList_id || '',
@@ -110,6 +116,9 @@ export const downloadInsert = async ( req, res ) => {
       'downloadInsertFrom': requestData.downloadInsertFrom || '',
       'answerType': requestData.answerType || '',
       'searchValue': requestData.searchValue || '',
+      'insertType': requestData.insertType || '',
+      'viewRedo': requestData.viewRedo || false,
+
     };
     let resultData = await downloadService.insert( insertData );
     if ( resultData ) {
@@ -151,10 +160,10 @@ export const downloadInsertOld = async ( req, res ) => {
         { date_iso: { $lte: todate } },
         { checklistStatus: 'submit' },
     );
-    if ( requestData.storeIds && requestData.storeIds.length >0 ) {
+    if ( requestData.storeIds && requestData.storeIds.length > 0 ) {
       findAndQuery.push( { store_id: { $in: requestData.storeIds } } );
     }
-    if ( requestData.sourceCheckList_id && requestData.sourceCheckList_id !='' ) {
+    if ( requestData.sourceCheckList_id && requestData.sourceCheckList_id != '' ) {
       findAndQuery.push( { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ) } );
     }
     if ( requestData.checklistId && requestData.checklistId.length > 0 ) {
@@ -175,11 +184,11 @@ export const downloadInsertOld = async ( req, res ) => {
       },
     } );
     let checklistDetails = await processedchecklistService.aggregate( findQuery );
-    if ( checklistDetails && checklistDetails.length >0 ) {
+    if ( checklistDetails && checklistDetails.length > 0 ) {
       let name;
       let fileType = requestData?.fileType || 'pdfzip';
       if ( requestData.fileType == 'pdf' ) {
-        if ( requestData?.sourceCheckList_id && requestData?.sourceCheckList_id !='' ) {
+        if ( requestData?.sourceCheckList_id && requestData?.sourceCheckList_id != '' ) {
           fileType = 'pdfzip';
         }
         if ( requestData?.checklistId && requestData?.checklistId.length > 1 ) {
@@ -191,7 +200,7 @@ export const downloadInsertOld = async ( req, res ) => {
       if ( requestData.checklistName != '' ) {
         name = requestData.checklistName + '_' + dayjs( requestData.fromDate ).format( 'DD/MM/YYYY' );
         if ( requestData?.toDate ) {
-          name = name + '-'+ dayjs( requestData?.toDate ).format( 'DD/MM/YYYY' );
+          name = name + '-' + dayjs( requestData?.toDate ).format( 'DD/MM/YYYY' );
         }
         let regexName = new RegExp( `^${name.split( '(' )[0]} \\(.*\\)$`, 'i' );
         let type = requestData.fileType || 'pdfzip';
@@ -203,7 +212,7 @@ export const downloadInsertOld = async ( req, res ) => {
         name = requestData?.checklistName;
       }
 
-      name = name+'-'+requestData.fileType;
+      name = name + '-' + requestData.fileType;
       let insertData = {
         'date_string': requestData.fromDate || '',
         'sourceCheckList_id': requestData?.sourceCheckList_id || '',
@@ -296,7 +305,7 @@ export const downloadList = async ( req, res ) => {
       return res.sendError( { error: 'No Data Found' }, 204 );
     }
 
-    if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
+    if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy != '' ) {
       findQuery.push( { $sort: { [requestData.sortColumnName]: requestData.sortBy } } );
     } else {
       findQuery.push( { $sort: { ['_id']: -1 } } );
@@ -307,8 +316,8 @@ export const downloadList = async ( req, res ) => {
     findQuery.push( { $skip: skip }, { $limit: limit } );
     let getDownlaodData = await downloadService.aggregate( findQuery );
     let bucket = JSON.parse( process.env.BUCKET );
-    for ( let i=0; i<getDownlaodData.length; i++ ) {
-      if ( getDownlaodData[i].url && getDownlaodData[i].url !='' ) {
+    for ( let i = 0; i < getDownlaodData.length; i++ ) {
+      if ( getDownlaodData[i].url && getDownlaodData[i].url != '' ) {
         let inputData1 = {
           Bucket: bucket.sop,
           file_path: getDownlaodData[i].url,
@@ -367,12 +376,11 @@ export const getChecklistFromZipId = async ( req, res ) => {
       brandLogo: '',
       checkListDescription: '',
     };
-
     if ( getzipdata ) {
       let getClientData = await clientService.findOne( { clientId: getzipdata.client_id } );
       if ( getClientData ) {
         brandInfo.clientName = getClientData.clientName;
-        brandInfo.brandLogo = getzipdata.client_id+'/logo/'+getClientData.profileDetails.logo;
+        brandInfo.brandLogo = getzipdata.client_id + '/logo/' + getClientData.profileDetails.logo;
       }
 
       // if ( getzipdata.fileType == 'zipfiles' ) {
@@ -387,7 +395,12 @@ export const getChecklistFromZipId = async ( req, res ) => {
 
       if ( getzipdata.sourceCheckList_id && getzipdata.sourceCheckList_id != '' ) {
         let getChecklistDescription = await checklistService.findOne( { _id: getzipdata.sourceCheckList_id }, { checkListName: 1, checkListDescription: 1 } );
-        brandInfo.checkListDescription = getChecklistDescription.checkListDescription || '';
+        if ( getzipdata.insertType == 'task' ) {
+          let getChecklistDescription = await taskConfigService.findOne( { _id: getzipdata.sourceCheckList_id }, { checkListName: 1, checkListDescription: 1 } );
+          brandInfo.checkListDescription = getChecklistDescription.checkListDescription || '';
+        } else {
+          brandInfo.checkListDescription = getChecklistDescription.checkListDescription || '';
+        }
 
         resultData.brandInfo = brandInfo;
         if ( getzipdata.sourceCheckList_id && getzipdata.sourceCheckList_id != '' ) {
@@ -404,13 +417,21 @@ export const getChecklistFromZipId = async ( req, res ) => {
         resultData.viewFlag = getzipdata.viewFlag;
         resultData.previewType = getzipdata.previewType || '';
         resultData.answerType = getzipdata.answerType || '';
+        resultData.insertType = getzipdata.insertType;
         return res.sendSuccess( resultData );
       } else {
         let getchecklistsQuery = {};
         getchecklistsQuery._id = new mongoose.Types.ObjectId( getzipdata.checklistIdList[0] );
         let getchecklistsData = await processedchecklistService.findOne( getchecklistsQuery, { _id: 1, sourceCheckList_id: 1 } );
+        if ( getzipdata.insertType == 'task' ) {
+          getchecklistsData = await processedTaskService.findOne( getchecklistsQuery, { _id: 1, sourceCheckList_id: 1 } );
+        }
+
         if ( getchecklistsData ) {
           let getChecklistDescription = await checklistService.findOne( { _id: getchecklistsData.sourceCheckList_id }, { checkListName: 1, checkListDescription: 1 } );
+          if ( getzipdata.insertType == 'task' ) {
+            getChecklistDescription = await taskConfigService.findOne( { _id: getzipdata.sourceCheckList_id }, { checkListName: 1, checkListDescription: 1 } );
+          }
           brandInfo.checkListDescription = getChecklistDescription.checkListDescription || '';
         }
 
@@ -418,6 +439,7 @@ export const getChecklistFromZipId = async ( req, res ) => {
         resultData.checklistIds = getzipdata.checklistIdList;
         resultData.fileType = getzipdata.fileType;
         resultData.questions = getzipdata.questions;
+        resultData.insertType = getzipdata.insertType;
         return res.sendSuccess( resultData );
       }
     } else {
@@ -459,12 +481,14 @@ export const getPDFCSVChecklistDetails = async ( req, res ) => {
     ];
 
     let getchecklistsData = await processedchecklistService.aggregate( query );
-    if ( getchecklistsData && getchecklistsData.length >0 ) {
+
+
+    if ( getchecklistsData && getchecklistsData.length > 0 ) {
       let getbrand = await clientService.findOne( { clientId: getchecklistsData[0].client_id }, { clientName: 1 } );
       let brandInfo = {};
       if ( getbrand ) {
         brandInfo.clientName = getbrand.clientName;
-        brandInfo.brandLogo = getchecklistsData[0].client_id+'/logo/brandLogo.png';
+        brandInfo.brandLogo = getchecklistsData[0].client_id + '/logo/brandLogo.png';
       }
 
       let getstore = await storeService.findOne( { id: getchecklistsData[0].store_id }, { storeProfile: 1 } );
@@ -472,7 +496,7 @@ export const getPDFCSVChecklistDetails = async ( req, res ) => {
       getchecklistsData[0].city = getstore?.storeProfile?.city || '--';
       getchecklistsData[0].state = getstore?.storeProfile?.state || '--';
       let questions = [];
-      function processQuestion( question, section, questions, nested=false ) {
+      function processQuestion( question, section, questions, nested = false ) {
         let findExists = questions.find( ( item ) => item?.qno && item.qno == question.qno );
         if ( findExists && nested ) {
           let findIndex = questions.findIndex( ( item ) => item?.qno && item.qno == question.qno );

package/src/controllers/gallery.controller.js

@@ -433,14 +433,19 @@ export async function getLogs( req, res ) {
 
 export async function approvalstatus( req, res ) {
   try {
-    let Approver = await ApproverModel.findOne( { checkListId: req.body.checklistId } );
-    if ( !Approver||Approver&&Approver.email!=req.user.email ) {
+    let Approver = await ApproverModel.find( { checkListId: req.body.checklistId } );
+    if ( Approver.length === 0 ) {
+      return res.sendError( 'No Content', 204 );
+    }
+    let filterApprover = Approver.filter( ( data ) => data.userEmail=== req.user.email );
+    if ( filterApprover.length === 0 ) {
       return res.sendError( 'No Content', 204 );
     }
 
 
     let url = JSON.parse( process.env.LAMBDAURL );
     let resultData = await LamdaServiceCall( url.approvalstatus, req.body );
+    console.log( resultData );
     if ( resultData ) {
       if ( resultData.status_code == '200' ) {
         return res.sendSuccess( resultData );

package/src/dtos/downloadValidation.dtos.js

@@ -20,6 +20,9 @@ export const validateDownloadInsertSchema = joi.object( {
   userId: joi.string().optional().allow( '' ),
   answerType: joi.string().optional().allow( '' ),
   searchValue: joi.string().optional().allow( '' ),
+  viewRedo: joi.boolean().optional().allow( '' ),
+  insertType: joi.string().optional().allow( '' ),
+
 } );
 
 export const validateDownloadInsertParams = {

package/src/services/taskConfig.service.js

@@ -0,0 +1,32 @@
+import model from 'tango-api-schema';
+
+export const find = async ( query = {}, field={} ) => {
+  return model.taskConfigModel.find( query, field );
+};
+
+export const findOne = async ( query = {}, field={} ) => {
+  return model.taskConfigModel.findOne( query, field );
+};
+
+export const updateMany = async ( query = {}, record={} ) => {
+  return model.taskConfigModel.updateMany( query, { $set: record } );
+};
+export const updateOne = async ( query = {}, record={} ) => {
+  return model.taskConfigModel.updateOne( query, { $set: record } );
+};
+
+export const insertMany = async ( data = [] ) => {
+  return model.taskConfigModel.insertMany( data );
+};
+
+export const deleteMany = async ( query = [] ) => {
+  return model.taskConfigModel.deleteMany( query );
+};
+
+export const aggregate = async ( query = [] ) => {
+  return model.taskConfigModel.aggregate( query );
+};
+
+export const insert = async ( data = [] ) => {
+  return model.taskConfigModel.create( data );
+};