tango-app-api-audit 3.4.38 → 3.4.40

package/README.md

@@ -1,29 +1,29 @@
-# README #
-
-This README would normally document whatever steps are necessary to get your application up and running.
-
-### What is this repository for? ###
-
-* Quick summary
-* Version
-* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
-
-### How do I get set up? ###
-
-* Summary of set up
-* Configuration
-* Dependencies
-* Database configuration
-* How to run tests
-* Deployment instructions
-
-### Contribution guidelines ###
-
-* Writing tests
-* Code review
-* Other guidelines
-
-### Who do I talk to? ###
-
-* Repo owner or admin
+# README #
+
+This README would normally document whatever steps are necessary to get your application up and running.
+
+### What is this repository for? ###
+
+* Quick summary
+* Version
+* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
+
+### How do I get set up? ###
+
+* Summary of set up
+* Configuration
+* Dependencies
+* Database configuration
+* How to run tests
+* Deployment instructions
+
+### Contribution guidelines ###
+
+* Writing tests
+* Code review
+* Other guidelines
+
+### Who do I talk to? ###
+
+* Repo owner or admin
 * Other community or team contact

package/package.json

@@ -1,40 +1,40 @@
-{
-    "name": "tango-app-api-audit",
-    "version": "3.4.38",
-    "description": "audit & audit metrics apis",
-    "main": "index.js",
-    "type": "module",
-    "scripts": {
-        "start": "nodemon --exec \"eslint --fix . && node index.js\""
-    },
-    "engines": {
-        "node": ">=18.10.0"
-    },
-    "author": "praveenraj",
-    "license": "ISC",
-    "dependencies": {
-        "adm-zip": "^0.5.15",
-        "aws-sdk": "^2.1643.0",
-        "dayjs": "^1.11.11",
-        "dotenv": "^16.4.5",
-        "express": "^4.19.2",
-        "handlebars": "^4.7.8",
-        "joi-to-swagger": "^6.2.0",
-        "lodash": "^4.17.21",
-        "mongodb": "^6.7.0",
-        "nodemon": "^3.1.3",
-        "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.2.19",
-        "tango-app-api-middleware": "^3.1.48",
-        "winston": "^3.13.0",
-        "winston-daily-rotate-file": "^5.0.0"
-    },
-    "devDependencies": {
-        "eslint": "^8.57.0",
-        "eslint-config-google": "^0.14.0",
-        "eslint-config-semistandard": "^17.0.0",
-        "eslint-config-standard": "^17.1.0",
-        "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-promise": "^6.2.0"
-    }
-}
+{
+    "name": "tango-app-api-audit",
+    "version": "3.4.40",
+    "description": "audit & audit metrics apis",
+    "main": "index.js",
+    "type": "module",
+    "scripts": {
+        "start": "nodemon --exec \"eslint --fix . && node index.js\""
+    },
+    "engines": {
+        "node": ">=18.10.0"
+    },
+    "author": "praveenraj",
+    "license": "ISC",
+    "dependencies": {
+        "adm-zip": "^0.5.15",
+        "aws-sdk": "^2.1643.0",
+        "dayjs": "^1.11.11",
+        "dotenv": "^16.4.5",
+        "express": "^4.19.2",
+        "handlebars": "^4.7.8",
+        "joi-to-swagger": "^6.2.0",
+        "lodash": "^4.17.21",
+        "mongodb": "^6.7.0",
+        "nodemon": "^3.1.3",
+        "swagger-ui-express": "^5.0.1",
+        "tango-api-schema": "^2.2.19",
+        "tango-app-api-middleware": "^3.1.48",
+        "winston": "^3.13.0",
+        "winston-daily-rotate-file": "^5.0.0"
+    },
+    "devDependencies": {
+        "eslint": "^8.57.0",
+        "eslint-config-google": "^0.14.0",
+        "eslint-config-semistandard": "^17.0.0",
+        "eslint-config-standard": "^17.1.0",
+        "eslint-plugin-import": "^2.29.1",
+        "eslint-plugin-promise": "^6.2.0"
+    }
+}

package/src/controllers/audit.controllers.js

@@ -841,7 +841,6 @@ export async function workSpace( req, res ) {
           clientId: { $last: '$clientId' },
           clientName: { $last: '$clientName' },
           installedStore: { $last: '$installedStore' },
-          // queueName: { $last: '$queueName' },
           totalCount: { $sum: 1 },
         },
       },
@@ -972,30 +971,29 @@ export async function workSpace( req, res ) {
       },
     ];
 
-    // const userDrafted = [
-    //   {
-    //     $match: {
-    //       $and: [
-    //         { clientId: { $in: clientList } },
-    //         { userId: { $eq: req.user._id } },
-    //         { auditStatus: { $eq: true } },
-    //         { moduleType: { $eq: inputData.moduleType } },
-    //         { createdAt: { $gte: new Date( dayjs( fileDate ).format( 'YYYY-MM-DD' ) ) } },
-    //         { createdAt: { $lte: dateRange.end } },
-    //       ],
-    //     },
-    //   },
-    //   {
-    //     $limit: 1,
-    //   },
-    //   {
-    //     $project: {
-    //       clienId: 1,
-    //       auditStatus: 1,
-    //     },
-    //   },
+    const userDrafted = [
+      {
+        $match: {
+          $and: [
+            { userId: { $eq: req.user._id } },
+            { auditStatus: { $in: [ 'inprogress', 'drafted' ] } },
+            { moduleType: { $eq: inputData.moduleType } },
+            { createdAt: { $gte: new Date( dayjs( fileDate ).format( 'YYYY-MM-DD' ) ) } },
+            { createdAt: { $lte: dateRange.end } },
+          ],
+        },
+      },
+      {
+        $limit: 1,
+      },
+      {
+        $project: {
+          clienId: 1,
+          auditStatus: 1,
+        },
+      },
 
-    // ];
+    ];
 
     const userAsignAudit = [
       {
@@ -1053,9 +1051,9 @@ export async function workSpace( req, res ) {
     const userIncompleteFilesCount = await aggregateUserAudit(
         userIncompleteFiles,
     );
-    // const userDraftedCount = await aggregateUserAudit(
-    //     userDrafted,
-    // );
+    const userDraftedCount = await aggregateUserAudit(
+        userDrafted,
+    );
     const userAsignAuditCount = await aggregateAssignAudit( userAsignAudit );
     const completedStoresCount = await aggregateStoreAudit( completedStores );
     const clientAssignedCount = await aggregateAssignAudit( clientAssign );
@@ -1103,7 +1101,7 @@ export async function workSpace( req, res ) {
           queueName: merge[i].queueName,
           isDraft: merge[i]?.isDrafted || false,
           isEnable:
-          // userDraftedCount.length > 0 && !merge[i].isDrafted? 0:
+          userDraftedCount.length > 0 &&( !merge[i].isDrafted && ( !merge[i].userInprogressCount || merge[i]?.userInprogressCount==0 ) )? 0:
             Number( pending ) > 0 ||
               merge[i].isDrafted ||
               ( merge[i].userAsignedCount && merge[i].userAsignedCount > 0 ) ||
@@ -1192,13 +1190,7 @@ export async function saveDraft( req, res ) {
     };
 
     if ( getUserAuditData?.startTime ) {
-      // const isoDate = getUserAuditData.startTime;
-      // const currentTime = dayjs();
-      // const isoDateTime = dayjs( isoDate );
-      // const timeDifferenceInMinutes = currentTime.diff( isoDateTime, 'seconds' );
-
       userRecord.timeSpent = inputData.timeSpent;
-
       storeRecord.timeSpent =inputData.timeSpent;
     }
 

package/src/controllers/traxAudit.controllers.js

@@ -1278,6 +1278,43 @@ export async function userAuditHistory( req, res ) {
           path: '$client', preserveNullAndEmptyArrays: true,
         },
       },
+      {
+        $lookup: {
+          from: 'traxAuditData',
+          let: {
+            fileDate: '$fileDate', storeId: '$storeId', zoneName: '$zoneName',
+          },
+          pipeline: [
+            {
+              $match: {
+                $expr: {
+                  $and: [
+                    {
+                      $eq: [ '$fileDate', '$$fileDate' ],
+                    },
+                    {
+                      $eq: [ '$storeId', '$$storeId' ],
+                    },
+                    {
+                      $eq: [ '$zoneName', '$$zoneName' ],
+                    },
+                  ],
+                },
+              },
+            },
+            {
+              $project: {
+                message: '$sqs.Body',
+              },
+            },
+          ], as: 'sqs',
+        },
+      },
+      {
+        $unwind: {
+          path: '$sqs', preserveNullAndEmptyArrays: true,
+        },
+      },
       {
         $project: {
           storeId: 1,
@@ -1289,6 +1326,7 @@ export async function userAuditHistory( req, res ) {
           questionType: 1,
           answer: 1,
           userComments: 1,
+          question: '$sqs.message.question',
           storeName: '$store.storeName',
           clientId: 1,
           clientName: '$client.clientName',
@@ -1370,6 +1408,7 @@ export async function userAuditHistory( req, res ) {
             { tempId: { $regex: inputData.searchValue, $options: 'i' } },
             { question: { $regex: inputData.searchValue, $options: 'i' } },
             { zoneName: { $regex: inputData.searchValue, $options: 'i' } },
+            { question: { $regex: inputData.searchValue, $options: 'i' } },
             { userComments: { $regex: inputData.searchValue, $options: 'i' } },
           ],
 
@@ -1440,7 +1479,7 @@ export async function userAuditHistory( req, res ) {
               temp['Accuracy'] = element.accuracy || '';
               break;
             case 'hygiene':
-              temp['Zone Name'] = element.zoneName;
+              temp['Zone Name'] = element.question;
               temp['Before Count'] = element.beforeCount;
               temp['After Count'] = element.afterCount;
               temp['Accuracy'] = element.accuracy || '';
@@ -1877,6 +1916,43 @@ export async function storeMetrics( req, res ) {
           preserveNullAndEmptyArrays: true,
         },
       },
+      {
+        $lookup: {
+          from: 'traxAuditData',
+          let: {
+            fileDate: '$fileDate', storeId: '$storeId', zoneName: '$zoneName',
+          },
+          pipeline: [
+            {
+              $match: {
+                $expr: {
+                  $and: [
+                    {
+                      $eq: [ '$fileDate', '$$fileDate' ],
+                    },
+                    {
+                      $eq: [ '$storeId', '$$storeId' ],
+                    },
+                    {
+                      $eq: [ '$zoneName', '$$zoneName' ],
+                    },
+                  ],
+                },
+              },
+            },
+            {
+              $project: {
+                message: '$sqs.Body',
+              },
+            },
+          ], as: 'sqs',
+        },
+      },
+      {
+        $unwind: {
+          path: '$sqs', preserveNullAndEmptyArrays: true,
+        },
+      },
       {
         $project: {
           auditId: '$_id',
@@ -1896,6 +1972,7 @@ export async function storeMetrics( req, res ) {
           userComments: 1,
           question: 1,
           questionType: 1,
+          question: '$sqs.message.question',
           answer: 1,
           userId: {
             $arrayElemAt: [ '$userId', { $subtract: [ { $size: '$userId' }, 1 ] } ], // need to check if no data
@@ -2229,6 +2306,7 @@ export async function storeMetrics( req, res ) {
             { answer: { $regex: inputData.searchValue, $options: 'i' } },
             { auditStatus: { $regex: inputData.searchValue, $options: 'i' } },
             { userComments: { $regex: inputData.searchValue, $options: 'i' } },
+            { question: { $regex: inputData.searchValue, $options: 'i' } },
           ],
         },
       } );
@@ -2341,7 +2419,7 @@ export async function storeMetrics( req, res ) {
             temp['Accuracy'] = element.accuracy;
             break;
           case 'hygiene':
-            temp['Zone Name'] = element.zoneName;
+            temp['Zone Name'] = element.question;
             temp['Before Count'] = element.beforeCount;
             temp['After Count'] = element.afterCount;
             temp['Status'] = toCamelCase( element.status );
@@ -2709,6 +2787,44 @@ export async function pendingSummaryTable( req, res ) {
         },
 
       },
+      {
+        $lookup: {
+          from: 'traxAuditData',
+          let: {
+            fileDate: '$fileDate', storeId: '$storeId', zoneName: '$zoneName',
+          },
+          pipeline: [
+            {
+              $match: {
+                $expr: {
+                  $and: [
+                    {
+                      $eq: [ '$fileDate', '$$fileDate' ],
+                    },
+                    {
+                      $eq: [ '$storeId', '$$storeId' ],
+                    },
+                    {
+                      $eq: [ '$zoneName', '$$zoneName' ],
+                    },
+                  ],
+                },
+              },
+            },
+            {
+              $project: {
+                message: '$sqs.Body',
+              },
+            },
+          ], as: 'sqs',
+        },
+      },
+      {
+        $unwind: {
+          path: '$sqs', preserveNullAndEmptyArrays: true,
+        },
+      },
+
       {
         $project: {
           _id: 0,
@@ -2720,6 +2836,7 @@ export async function pendingSummaryTable( req, res ) {
           questionType: 1,
           answer: 1,
           userComments: 1,
+          question: '$sqs.message.question',
           fileDate: 1,
           moduleType: 1,
           value: {
@@ -2801,6 +2918,7 @@ export async function pendingSummaryTable( req, res ) {
             { userName: { $regex: inputData.searchValue, $options: 'i' } },
             { userEmail: { $regex: inputData.searchValue, $options: 'i' } },
             { value: { $regex: inputData.searchValue, $options: 'i' } },
+            { question: { $regex: inputData.searchData, $options: 'i' } },
           ],
 
         },
@@ -2862,7 +2980,7 @@ export async function pendingSummaryTable( req, res ) {
             temp['Before Count'] = element.beforeCount;
             break;
           case 'hygiene':
-            temp['Zone Name'] = element.zoneName;
+            temp['Zone Name'] = element.question;
             temp['Before Count'] = element.beforeCount;
             break;
         }
@@ -3259,6 +3377,43 @@ export async function overviewTable( req, res ) {
         },
 
       },
+      {
+        $lookup: {
+          from: 'traxAuditData',
+          let: {
+            fileDate: '$fileDate', storeId: '$storeId', zoneName: '$zoneName',
+          },
+          pipeline: [
+            {
+              $match: {
+                $expr: {
+                  $and: [
+                    {
+                      $eq: [ '$fileDate', '$$fileDate' ],
+                    },
+                    {
+                      $eq: [ '$storeId', '$$storeId' ],
+                    },
+                    {
+                      $eq: [ '$zoneName', '$$zoneName' ],
+                    },
+                  ],
+                },
+              },
+            },
+            {
+              $project: {
+                message: '$sqs.Body',
+              },
+            },
+          ], as: 'sqs',
+        },
+      },
+      {
+        $unwind: {
+          path: '$sqs', preserveNullAndEmptyArrays: true,
+        },
+      },
       {
         $project: {
           _id: 0,
@@ -3267,7 +3422,7 @@ export async function overviewTable( req, res ) {
           zoneName: 1,
           streamName: 1,
           tempId: 1,
-          question: 1,
+          question: '$sqs.message.question',
           questionType: 1,
           answer: 1,
           userComments: 1,
@@ -3324,6 +3479,7 @@ export async function overviewTable( req, res ) {
             { question: { $regex: inputData.searchValue, $options: 'i' } },
             { answer: { $regex: inputData.searchValue, $options: 'i' } },
             { userComments: { $regex: inputData.searchValue, $options: 'i' } },
+            { question: { $regex: inputData.searchValue, $options: 'i' } },
           ],
 
         },
@@ -3395,7 +3551,7 @@ export async function overviewTable( req, res ) {
             temp['Status'] = toCamelCase( element.status );
             break;
           case 'hygiene':
-            temp['Zone Name'] = element.zoneName;
+            temp['Zone Name'] = element.question;
             temp['Before Count'] = element.beforeCount;
             temp['After Count'] = element.afterCount;
             temp['Audit Type'] = element.auditType;
@@ -3449,6 +3605,38 @@ export async function getDetectionAuditFile( req, res ) {
       {
         $limit: 1,
       },
+      {
+        $lookup: {
+          from: 'traxAuditData',
+          let: {
+            fileDate: '$fileDate', storeId: '$storeId', zoneName: '$zoneName',
+          },
+          pipeline: [
+            {
+              $match: {
+                $expr: {
+                  $and: [
+                    {
+                      $eq: [ '$fileDate', '$$fileDate' ],
+                    },
+                    {
+                      $eq: [ '$storeId', '$$storeId' ],
+                    },
+                    {
+                      $eq: [ '$zoneName', '$$zoneName' ],
+                    },
+                  ],
+                },
+              },
+            },
+            {
+              $project: {
+                message: '$sqs.Body',
+              },
+            },
+          ], as: 'sqs',
+        },
+      },
     ];
 
     const userDetails = await aggregateUserEmpDetection( userQuery );
@@ -3498,6 +3686,7 @@ export async function getDetectionAuditFile( req, res ) {
           auditId: userDetails[0]._id,
           storeId: userDetails[0].storeId,
           zoneName: userDetails[0].zoneName,
+          question: userDetails[0]?.sqs[0]?.message?.question,
           fileDate: userDetails[0].fileDate,
           auditType: userDetails[0].auditType,
           queueName: log.queueName,
@@ -3529,6 +3718,7 @@ export async function getDetectionAuditFile( req, res ) {
               fileDate: userDetails[0].fileDate,
               auditType: userDetails[0].auditType,
               storeId: userDetails[0].storeId,
+              question: userDetails[0]?.sqs[0]?.message?.question,
               clientName: log.queueName,
               auditId: userDetails[0]._id,
               moduleType: userDetails[0].moduleType,
@@ -3568,6 +3758,7 @@ export async function getDetectionAuditFile( req, res ) {
           fileCount: userDetails[0].beforeCount,
           inputBucketName: userDetails[0].inputBucketName,
           folderPath: userDetails[0].folderPath,
+          question: userDetails[0]?.sqs[0]?.message?.question,
         };
         break;
     }
@@ -3584,26 +3775,32 @@ export async function getDetectionAuditFile( req, res ) {
     if ( inputData.nextId ) {
       fetchData.ContinuationToken = decodeURIComponent( inputData.nextId );
     }
-    const list = await listFileByPath( fetchData );
-    const folderPath = list.data;
-    const nextQuery = list.pageToken;
+    const list = inputData.moduleType == 'hygiene'? await checkFileExist( {
+      Bucket: msg.inputBucketName,
+      Key: msg.folderPath,
+    } ) :
+     await listFileByPath( fetchData );
+    const folderPath = inputData.moduleType == 'hygiene'? list? [ {
+      Key: msg.folderPath,
+    } ] : [] : list.data;
+    const nextQuery = inputData.moduleType == 'hygiene'? null : list?.pageToken;
     const bucketCDN = url.traxAuditInput;
     if ( folderPath?.length > 0 ) {
       for ( let i = 0; i < folderPath.length; i++ ) {
         const img = folderPath[i].Key.split( '/' );
-        const image = inputData.moduleType=='hygiene'?img[4].split( '.' ): img[3].split( '.' );
+        const image = img[3].split( '.' );
         const indexes = image[0].split( '_' );
         const Key = folderPath[i].Key;
-        const data = `${bucketCDN}${Key}`;// await signedUrl( fetchData );
+        const data = `${bucketCDN}${Key}`;
         const mapimg = {
           img_path: data,
-          img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}` : inputData.moduleType=='hygiene'?`${indexes[2]}-${indexes[3]}`:image[0],
-          img_id: inputData.moduleType=='hygiene'? img[4] : img[3],
+          img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}`:image[0],
+          img_id: img[3],
         };
         files.push( {
           img_path: data,
           img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}`:image[0],
-          img_id: inputData.moduleType=='hygiene'? img[4] : img[3],
+          img_id: img[3],
           selected: false,
           dropped: false,
           singleDetection: false,
@@ -3692,6 +3889,7 @@ export async function getDetectionAuditFile( req, res ) {
           auditType: insertData.auditType,
           storeId: storeId,
           zoneName: insertData.zoneName,
+          question: msg.question,
           clientName: inputData.queueName,
           auditId: insertData._id,
           moduleType: inputData.moduleType,
@@ -3711,6 +3909,7 @@ export async function getDetectionAuditFile( req, res ) {
         queueName: inputData.queueName,
         storeId: storeId,
         zoneName: insertData.zoneName,
+        question: msg.question,
         fileDate: fileDate,
         auditType: msg.auditType || 'Audit',
         auditId: insertData._id,
@@ -3920,12 +4119,14 @@ export async function save( req, res ) {
 
 
       // trax output in open serach
+      const folderPath = getFilePath?.sqs?.Body?.folderPath;
       const output = {
         clientId: inputData.clientId,
         clientName: getClient?.clientName,
         storeId: inputData.storeId,
         storeName: getStore?.storeName,
         zoneName: inputData?.zoneName,
+        question: getFilePath?.sqs?.Body?.question,
         spocName: getStore?.spocDetails? getStore?.spocDetails[0]?.name : '',
         spocEmail: getStore?.spocDetails? getStore?.spocDetails[0]?.email:'',
         spocContact: getStore?.spocDetails? getStore?.spocDetails[0].contact:'',
@@ -3935,7 +4136,7 @@ export async function save( req, res ) {
         inputBucketName: getFilePath?.sqs?.Body?.inputBucketName,
         tempId: tempId,
         count: inputData.employeeCount,
-        folderPath: getFilePath?.sqs?.Body?.folderPath,
+        folderPath: folderPath.split( '/' ).slice( 0, -1 ).join( '/' ) + '/',
         createdAt: new Date(),
       };
       let filter= [
@@ -3985,6 +4186,7 @@ export async function save( req, res ) {
           auditType: getUserAuditData?.auditType,
           storeId: getUserAuditData?.storeId,
           zoneName: inputData?.zoneName,
+          question: getFilePath?.sqs?.Body?.question,
           moduleType: getUserAuditData?.moduleType,
           queueName: req.userAudit?.queueName,
           clientId: req.userAudit?.clientId,