tango-app-api-trax 1.0.0-beta-task.16 → 1.0.0-beta-task.18

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-beta-task.16",
+    "version": "1.0.0-beta-task.18",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -26,8 +26,8 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.2.6",
-        "tango-app-api-middleware": "3.1.43-alpha.10",
+        "tango-api-schema": "^2.2.8",
+        "tango-app-api-middleware": "^3.1.43-alpha.10",
         "url": "^0.11.4",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/download.controller.js

@@ -52,7 +52,10 @@ export const downloadInsert = async ( req, res ) => {
             { 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 },
           ],
         },
       } );

package/src/controllers/gallery.controller.js

@@ -267,44 +267,49 @@ export async function approveChecklist( req, res ) {
     let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
     toDate.setUTCHours( 23, 59, 59, 59 );
-    let query = { sourceCheckList_id: req.body.sourceCheckList_id, date_iso: { $gte: req.body.fromDate, $lte: toDate }, checklistStatus: 'submit', approvalEnable: true };
+    let query = { sourceCheckList_id: req.body.sourceCheckList_id, date_iso: { $gte: req.body.fromDate, $lte: toDate }, $or: [ { checklistStatus: 'submit' }, { redoStatus: true } ], approvalEnable: true };
     if ( req.body?.storeId?.length ) {
       query['store_id'] = { $in: req.body.storeId };
     }
-    let checklistDetails = await processedChecklist.find( query, { _id: 1 } );
+    let checklistDetails = await processedChecklist.find( query, { _id: 1, checklistStatus: 1, storeName: 1 } );
     if ( !checklistDetails.length ) {
       return res.sendError( 'No data found', 204 );
     }
-    let idList = checklistDetails.map( ( item ) => item._id );
-    let updateResponse = await processedChecklist.updateMany( { _id: { $in: idList } }, { approvalStatus: true } );
-    if ( updateResponse.modifiedCount || updateResponse.matchedCount ) {
-      let params = {
-        'payload': {
-          sourceCheckList_id: req.body.sourceCheckList_id,
-          fromDate: req.body.fromDate,
-          toDate: req.body.toDate,
-          store_id: req.body.storeId,
-        },
-        'upsert': {
-          approvalStatus: true,
-        },
-      };
-      const requestOptions = {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify( params ),
-      };
-      let url = JSON.parse( process.env.LAMBDAURL );
-      let searchResponse = await fetch( url.approveChecklist, requestOptions );
+    let idList = checklistDetails.filter( ( ele ) => ele.checklistStatus == 'submit' ).map( ( item ) => item._id );
+    if ( idList.length ) {
+      let updateResponse = await processedChecklist.updateMany( { _id: { $in: idList } }, { approvalStatus: true } );
+      if ( updateResponse.modifiedCount || updateResponse.matchedCount ) {
+        let params = {
+          'payload': {
+            sourceCheckList_id: req.body.sourceCheckList_id,
+            fromDate: req.body.fromDate,
+            toDate: req.body.toDate,
+            store_id: req.body.storeId,
+          },
+          'upsert': {
+            approvalStatus: true,
+          },
+        };
+        const requestOptions = {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify( params ),
+        };
+        let url = JSON.parse( process.env.LAMBDAURL );
+        let searchResponse = await fetch( url.approveChecklist, requestOptions );
 
 
-      if ( searchResponse.ok ) {
-        return res.sendSuccess( 'Checklist Approved successfully' );
-      } else {
-        return res.sendError( 'Something went wrong', 500 );
+        if ( searchResponse.ok ) {
+          return res.sendSuccess( 'Checklist Approved successfully' );
+        } else {
+          return res.sendError( 'Something went wrong', 500 );
+        }
       }
+    } else {
+      let redoList = checklistDetails.filter( ( ele ) => ele.checklistStatus == 'open' ).map( ( item ) => item.storeName );
+      return res.sendError( `redo stores ${redoList.toString()}`, 400 );
     }
   } catch ( e ) {
     logger.error( { function: 'approveChecklist', error: e } );
@@ -348,6 +353,7 @@ export async function redoChecklist( req, res ) {
     let updateData = {
       checklistStatus: 'open',
       redoStatus: true,
+      reinitiateStatus: true,
       questionAnswers: question,
     };
 
@@ -444,9 +450,6 @@ export async function getLogs( req, res ) {
 
 export async function approvalstatus( req, res ) {
   try {
-   
-
-
     let Approver = await ApproverModel.find( { checkListId: req.body.checklistId } );
     if ( Approver.length === 0 ) {
       return res.sendSuccess( 'suceess' );

package/src/controllers/mobileTrax.controller.js

@@ -639,7 +639,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
-                if ( typeof qaAnswers[j]?.redo === 'boolean' ) {
+                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype == 'submit' ) {
                   structure.redo = false;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -688,7 +688,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
-                if ( typeof qaAnswers[j]?.redo === 'boolean' ) {
+                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype == 'submit' ) {
                   structure.redo = false;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -742,7 +742,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
-                if ( typeof qaAnswers[j]?.redo === 'boolean' ) {
+                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype == 'submit' ) {
                   structure.redo = false;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -791,7 +791,7 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
-                if ( typeof qaAnswers[j]?.redo === 'boolean' ) {
+                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype == 'submit' ) {
                   structure.redo = false;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -895,7 +895,7 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
 
-                if ( typeof qaAnswers[j]?.redo === 'boolean' ) {
+                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype == 'submit' ) {
                   structure.redo = false;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -940,7 +940,7 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
-                if ( typeof qaAnswers[j]?.redo === 'boolean' ) {
+                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype == 'submit' ) {
                   structure.redo = false;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -989,7 +989,7 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
-                if ( typeof qaAnswers[j]?.redo === 'boolean' ) {
+                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype == 'submit' ) {
                   structure.redo = false;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -1043,7 +1043,7 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
-                if ( typeof qaAnswers[j]?.redo === 'boolean' ) {
+                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype == 'submit' ) {
                   structure.redo = false;
                 }
                 if ( qaAnswers[j]?.redoComment ) {
@@ -1095,7 +1095,7 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 structure.parentanswer = requestSection[i].parentanswer;
                 structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
-                if ( typeof qaAnswers[j]?.redo === 'boolean' ) {
+                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype == 'submit' ) {
                   structure.redo = false;
                 }
                 if ( qaAnswers[j]?.redoComment ) {

package/src/controllers/teaxFlag.controller.js

@@ -3,6 +3,7 @@ import { aggregate } from '../services/processedchecklist.services.js';
 import dayjs from 'dayjs';
 import * as processedchecklistService from '../services/processedchecklist.services.js';
 import * as processedchecklistconfigService from '../services/processedchecklistconfig.services.js';
+import * as checklistconfigService from '../services/checklist.service.js';
 
 
 import utc from 'dayjs/plugin/utc.js';
@@ -608,13 +609,23 @@ export const flagCardsV1 = async ( req, res ) => {
     if ( data.questionFlag ) flagCards.questionFlag.count = data.questionFlag;
     if ( data.delayInSubmission ) flagCards.delayInSubmission.count = data.delayInSubmission;
 
+    const publishedAiChecklists = await checklistconfigService.find( { client_id: clientId, publish: true, checkListType: { $ne: 'custom' } }, { checkListType: 1 } );
+
+    if ( !publishedAiChecklists?.length ) {
+      return res.sendError( { error: 'No Data Found' }, 204 );
+    }
+
     const detectionPayload = { fromDate, toDate, storeId, clientId };
     const lambdaURL = 'https://f65azvtljclaxp6l7rnx65cdmm0lcgvp.lambda-url.ap-south-1.on.aws/';
     const resultData = await LamdaServiceCall( lambdaURL, detectionPayload );
 
+    const published = publishedAiChecklists.map( ( val ) => val?.checkListType );
+
     if ( resultData && resultData.status_code === '200' ) {
-      flagCards.detectionFlag.count = resultData.totalDetection;
-      flagCards.totalFlag += flagCards.detectionFlag.count;
+      published.forEach( ( item ) => {
+        flagCards.detectionFlag.count += resultData[item];
+      } );
+      flagCards.totalFlag = flagCards.detectionFlag.count;
     }
 
     return res.sendSuccess( { flagCards } );
@@ -726,11 +737,21 @@ export const flagComparisonCardsV1 = async ( req, res ) => {
 
       console.log( dayjs( toDate ).startOf( 'day' ).subtract( 1, 'day' ).format( 'YYYY-MM-DD' ), 'new start of' );
 
+      const publishedAiChecklists = await checklistconfigService.find( { client_id: requestData.clientId, publish: true, checkListType: { $ne: 'custom' } }, { checkListType: 1 } );
+
+      if ( !publishedAiChecklists?.length ) {
+        return 0;
+      }
+
       const LamdaURL = 'https://f65azvtljclaxp6l7rnx65cdmm0lcgvp.lambda-url.ap-south-1.on.aws/';
       const resultData = await LamdaServiceCall( LamdaURL, detectionPayload );
 
+      const published = publishedAiChecklists.map( ( val ) => val?.checkListType );
+
       if ( resultData?.status_code === '200' ) {
-        return resultData.totalDetection;
+        let result = 0;
+        published.forEach( ( item ) => result += resultData[item] );
+        return result;
       }
       return 0;
     };

package/src/controllers/trax.controller.js

@@ -530,7 +530,7 @@ export const duplicateChecklist = async ( req, res ) => {
 
     let dupDetails = { ...checkDetails._doc };
     let name = `^${dupDetails.checkListName.split( '(' )[0]}\\(.*\\)$`;
-    let checkListNameDetails = await checklistService.find( { checkListName: { $regex: name }, client_id: req.query.clientId, type: 'checklist', isdeleted: false } );
+    let checkListNameDetails = await checklistService.find( { checkListName: { $regex: name }, client_id: req.query.clientId, type: 'checklist' } );
     if ( checkListNameDetails.length ) {
       let nameLength = checkListNameDetails.length + 1;
       dupDetails.checkListName = dupDetails.checkListName.split( '(' )[0] + '(' + nameLength +')';
@@ -976,6 +976,7 @@ export const updateConfigure =async ( req, res ) => {
       } ) : [],
       remainder: inputBody?.checkListDetails?.remainder || [],
       owner: inputBody?.checkListDetails?.owner || [],
+      restrictAttendance: inputBody?.checkListDetails?.restrictAttendance || false,
     };
 
     if ( inputBody?.checkListDetails?.approver.length ) {
@@ -1850,6 +1851,8 @@ export async function insertSingleProcessData( checklistId, processId = 0, oldDa
       insertdata.allowedMultiSubmit = getCLconfig.allowedMultiSubmit;
       insertdata.approver = getCLconfig?.approver || [];
       insertdata.remainder = getCLconfig?.remainder || [];
+      insertdata.restrictAttendance = getCLconfig?.restrictAttendance;
+
       let collectSections = [];
       let sectionQuery = [];
       sectionQuery.push( {
@@ -2029,6 +2032,7 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
       element4.scheduleRepeatedType = getCLconfig.scheduleRepeatedType;
       element4.approvalEnable = getCLconfig.approver.length ? true : false;
       element4.remainder = getCLconfig?.remainder || [];
+      element4.restrictAttendance = getCLconfig?.restrictAttendance;
     }
     if ( userIdList.length ) {
       allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );