tango-app-api-trax 1.0.0-task.129 → 1.1.0

package/fir-51e77-firebase-adminsdk-x3sdp-fd902b74ae.json

@@ -1,9 +1,8 @@
-
 {
   "type": "service_account",
   "project_id": "tango-trax",
-  "private_key_id": "2bf70eb4a3b9f4e74138bce76063c78c75e166d7",
-  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXwmrIk6t5vfdE\niIskCwdg9Q1EyugQQeA5ve8z6hKrXng/goz+gpkonPI5pHHNELgIoOaC6+3QvxRA\nKB30ETqMKkZJQORy0zUaDQq+qyqNTj5AgNizAtnxMOAf46PIe5gWvDaXkyiHN/cE\ngfFdRyW7ctm4EDub7Ii69fr96X9mmbhOtuP/4tG+MhGIe5JmHnVvM75kC1aWb+ob\n8EaQfLeWpxYqXtsEZoCHbVTm+pDUWMGqiMko7C84BcxKOT4RFk4MeV99T0UaZtab\ncgQlWFmbcvev4KeNkkkmbVCSbBawAe1EsY8QMSj1telikh0NExNodeatIbuYBtc1\nnFqaxv7zAgMBAAECggEAHBtr/54qAjBG3bCUZKaORUzdmkIiXPB2gPtGlEzkDE1A\n5DJfvruddkIrMrXcRei0zRRP3SupLiJVs9Q6R/vw5gjmX6bfKM0pZpvHw6ycAvPc\n38F9YRpEF0HAIOfea8FIV92gFs6wkOqym2kdtPL6cA9Dd625/JUAdfAc/m4CpJPG\n4mjPoNEwMi2a66RW1CghmkQ8VgnxGk05UawZ4f6r+ABko5Q/hX/B+crApbriGPo6\nMBVtqxKGcrAmdTXWF8Bpua3I8hwGRqenLc6CY1kPHCb3XleOj+BkGGxzUGRKkJcU\nwkIiLub//XlTnM8V4R72VqKOP0Zo9SUrqPtPEg8FcQKBgQDI8SWGg5NMAsGhmopl\naUtkAKrZEK/waNBVxeFfKmXhq+hZYZ0Fj4ewI/jvKRPF0zPNWuwQuYSb3LxqmaFc\ng0iQT/crlF1skU7a0vZm7wumSxuMJq+qVcEmG8e8tD9hUGAZDImWeLqZ5UfSNbcb\nF82IeFoB5LWBAq8W2ecST4QA1wKBgQDBV2puSB1jqa9ZVgUIiEGsWzgQLSJ43AmM\nLRy058kuGr11XxLXZvc0v3rB8MhMoaNurFXcUjX67dAV3F8ejqL65dCQHwBDiS32\nsMiMmHfCGBHUn/MsjsZ3LTljLC08ltAoeEuluaW9v8sT93BbrIhpdEmD+tDegqdU\nv/QMKAnDRQKBgQClTgyK3k8cpt/YLCRSTQ7iU9I5BAtZAUDybvl6qoxp3Fwmu7DL\nVEpR0yYEyYwkoBzrgTLWh2faOPsfzwb57l6RqdcymLlKiTePuSFPiLPSt9MPtvuo\nayecTBpC2R2S1uZXdQLzMJqB5CbzfZEGzswcyrVw/U97tFOJvvTjEVsMvQKBgHdj\nWHhzFZrWTE45HPCQ2yToSy1KAbBqB4dE0CYxvvw2TOmuZL8YeOxclRwvaDBR287a\nokZjiavCsCzfoOkIoUGXKfvk+M+7ZOOhdKXE/KahIFmQz6OjIpCzH23K+MAiTLXA\n2s2iXuNWDLvunrYtSyr7QO47skDEozllMvlSu/yVAoGAWKjKVyJZeX1yh6ndzfRh\nszTRQ31W77guZm3j0CJtA7SO8eRWLdeg4BwlMT1YFer/Z65QvhJUgAdnh0Iu4Yv/\niFJ6ZwkNWnWg0239WhSroeVwIobafB/0maILkax5NcBcBvIZxBbvS4Y7bR3HqA7r\nxKbTG5i67w5TetuhLWQjt10=\n-----END PRIVATE KEY-----\n",
+  "private_key_id": "25f62c55f9ad649f333b54f62ab8b1aa97b7038e",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDEZRGyxM+TUN+j\nqv6rSGWUqN9sEn9BxhdmCKZ8vsp73QIp71plFQSzWCL8pH5cfiwIu2zJlE1suApj\nGxJ+3/4X8CxWZ374HZBTSGVhsXcchYEGIwKWY6D3kfma8zRoPft3RULbus9fW0l/\nADcOMkLlN6OsawfvJXGPkMyM4e67ZOAkjlLWDGWYRnakbJZPqFN0U7aqGaXxgGoR\n1oN9qgnqQUqLl/085it5rqJ08hTXIsTViDrbD9gsShesC4L95C9jE1fnrJseghLM\n91qlJcspWGU6MgI1H44SYT0SttFaYZ2hJXmISMH9CnI9sdFmQBs8oBZXPHL3oXhM\nsrnMy169AgMBAAECggEABdpRj3S5jz/uVkPoNdsLue/ZbrCowwv1UmNeG3gac9wH\ng+U/709pIIjMdsqBKzOluiHkcVJz3JJUhD/ANUXqyN8DDJUmLcdAb+xHpy8WfWQG\nJGnChTsABvi+SfhG/sygE/MdYGEowRmo7vm8P6D5qOKXrwb73sw3Hj/tX00euU4Q\nKek3W9Sd5j3MDvSoCM7tlqmOuyQjD1z4taUmeQ8I4KOOWmpamS4wg90iW13FxgSK\n/vNpqb/xWqlxoFfpwgZaT8xM6TKBURyDeDi0Fu+WAP6gIDM8lHoW1tPtSJifE5bU\ngMmAhR+DlWZM6wuDJvdJRomHl7huT36rYp1IFa/nkQKBgQDswbL21UbkdV2YsSRn\nwmDjgO/VAGv27OhTtHJpSSOQ9O1Fk94BLG9RPqx6CXm+86Kmxctrl3EIsEbfPcBK\nOHF0yknhwhTfDZuEtLdsqvK06bLaBYdq0E0RghUiqi9jtQvaQJeu3e0735gfHsrp\nhE21rctn85uo31WCVrjW5WegUQKBgQDUW4sYZ+46RrjPhVNj2W1w0A6qAaWeN/BC\nJn0y2kS0AbDSRzqfLrGivwDGRwlAzVyo76ARRZKVxqR4XlzygGELV0obGtKj1a1R\nwjLCbmsFIf7xXl2+rWeQh9oNsOfa2OR1cuG/ne8IS2dLayGOyZBoku45SOWLhwDA\nINwCCcmIrQKBgQC9fHmjnCbVCioS3xPoB2ZMLxHEREYkpo97DtzS7zqL9btBCIuS\nHOIrACJCufq6nXv8Rin8voQ1FABlA6M2w93qP0zKZu8VZmql141GZ7tAmBoQ7IPp\nNTW5YYdQ6yxqfKgz0aaUygHo/ZdesOJt6vnXAnXdiNd4XOavHoFpXMmHQQKBgB42\nV/fE8ZPA9BIyOcb+7B8curldOp7j/n6q0y0k+JlTlECWebSkBAnPeuC6wopBrWkr\njm5mo5BDjqrBYh/uO+BNLvHkQwukHuB+7JHU+8zjJU5ZyqSSLyXU7iT8gkAUk4xS\nJ+QHKDbZ43xLZZ7W9oCqRtJHmMDdGDI9eo+frNiRAoGBANN7ZkuPdUAqBbMmj5I7\n+C9k5Jg5OFsw9CYzi5LBETKcy1YiUw4PX5xSWV0hlhjrSbCuvpbX1fVwcz4UNYaK\nNdgt2GJOQZ6vtnaInhx737D31l5ZXpb+9IH7O5iZ711PXV3Ic4zQSPbDkC8V5z+k\nafICa9PE9II8SypV9b5kVbpl\n-----END PRIVATE KEY-----\n",
   "client_email": "firebase-adminsdk-k7lom@tango-trax.iam.gserviceaccount.com",
   "client_id": "112026772051782321525",
   "auth_uri": "https://accounts.google.com/o/oauth2/auth",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "1.0.0-task.129",
+    "version": "1.1.0",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,7 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.1.94",
+        "tango-api-schema": "^2.2.9",
         "tango-app-api-middleware": "^3.1.43-alpha.10",
         "url": "^0.11.4",
         "winston": "^3.13.1",

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,23 +43,29 @@ 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( { $project: { sourceCheckList_id: 1, date_iso: 1, store_id: 1, checklistStatus: 1, redoStatus: 1 } } );
       getChecklistQuery.push( {
         $match: {
           $and: [
             { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ) },
             { date_iso: { $gte: fromDate, $lte: toDate } },
             { store_id: { $in: requestData.storeIds } },
+          ],
+          $or: [
             { checklistStatus: 'submit' },
+            { redoStatus: true },
           ],
         },
       } );
       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 +74,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 +85,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 +97,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 +119,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 +163,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 +187,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 +203,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 +215,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 || '',
@@ -270,6 +282,7 @@ export const downloadList = async ( req, res ) => {
     findAndQuery.push(
         { client_id: requestData.clientId },
         { createdBy: new mongoose.Types.ObjectId( requestData.createdBy ) },
+        { status: { $ne: 'canceled' } },
     );
 
     findQuery.push( { $match: { $and: findAndQuery } } );
@@ -296,7 +309,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 +320,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,
@@ -345,10 +358,10 @@ export const downloadUpdate = async ( req, res ) => {
       if ( resultData ) {
         return res.sendSuccess( 'download updated successfully' );
       } else {
-        return res.sendServerError( 'something went wrong, please try again' );
+        return res.sendError( { error: 'something went wrong, please try again' }, 500 );
       }
     } else {
-      return res.sendBadRequest( 'Invalid Zip Id' );
+      return res.sendError( { error: 'Invalid Zip Id' }, 400 );
     }
   } catch ( error ) {
     console.log( 'error =>', error );
@@ -367,12 +380,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 +399,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 +421,23 @@ export const getChecklistFromZipId = async ( req, res ) => {
         resultData.viewFlag = getzipdata.viewFlag;
         resultData.previewType = getzipdata.previewType || '';
         resultData.answerType = getzipdata.answerType || '';
+        resultData.insertType = getzipdata.insertType;
+        resultData.status = getzipdata.status;
+
         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 +445,8 @@ export const getChecklistFromZipId = async ( req, res ) => {
         resultData.checklistIds = getzipdata.checklistIdList;
         resultData.fileType = getzipdata.fileType;
         resultData.questions = getzipdata.questions;
+        resultData.insertType = getzipdata.insertType;
+        resultData.status = getzipdata.status;
         return res.sendSuccess( resultData );
       }
     } else {
@@ -459,12 +488,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 +503,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 );
@@ -542,3 +573,19 @@ export const getPDFCSVChecklistDetails = async ( req, res ) => {
 };
 
 
+export async function cancelDownload( req, res ) {
+  try {
+    let finddata = await downloadService.findOne( { _id: req.params.id, status: 'completed' } );
+    if ( finddata ) {
+      return res.sendError( 'Download Already Completed', 500 );
+    }
+
+    let update = await downloadService.updateOne( { _id: req.params.id }, { status: 'canceled' } );
+    if ( update ) {
+      return res.sendSuccess( 'Canceled Successfully' );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'cancelDownload' } );
+    return res.sendError( error, 500 );
+  }
+}