tango-app-api-audit 3.4.37 → 3.4.39

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.4.37",
+    "version": "3.4.39",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",

package/src/controllers/audit.controllers.js

@@ -972,30 +972,30 @@ 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: [
+            // { clientId: { $in: clientList } },
+            { 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 +1053,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 +1103,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 ) ||

package/src/controllers/traxAudit.controllers.js

@@ -3456,46 +3456,6 @@ export async function getDetectionAuditFile( req, res ) {
     const auditStatus = userDetails && userDetails.length > 0 ? userDetails[0].auditStatus : null;
     switch ( auditStatus ) {
       case null:
-        // const query = [
-        //   {
-        //     $match: {
-        //       $and: [
-        //         { userId: { $eq: req.user._id } },
-        //         { isCompleted: { $eq: false } },
-        //         { queueName: inputData.queueName },
-        //         { moduleType: inputData.moduleType },
-        //       ],
-        //     },
-        //   },
-        // ];
-        // const userAssign = await aggregateAssignAudit( query );
-        // if ( userAssign.length > 0 ) {
-        //   logger.info( 'Hit in user assign', { inputData } );
-        //   userAssign[0].auditType == 'Audit' ?
-        //     ( msg = {
-        //       storeId: userAssign[0].storeId,
-        //       fileDate: userAssign[0].fileDate,
-        //       fileCount: userAssign[0].fileCount,
-        //       inputBucketName: userAssign[0].inputBucketName,
-        //       folderPath: userAssign[0].folderPath,
-        //     } ) :
-        //     ( msg = {
-        //       storeId: userAssign[0].storeId,
-        //       fileDate: userAssign[0].fileDate,
-        //       auditType: userAssign[0].auditType,
-        //       fileCount: userAssign[0].fileCount,
-        //       inputBucketName: userAssign[0].inputBucketName,
-        //       folderPath: userAssign[0].folderPath,
-        //     } );
-        //   await updateOneAssignAudit(
-        //       { _id: userAssign[0]._id },
-        //       { isCompleted: true },
-        //   );
-        //   logger.info( 'Hit in auditUserAssignModel updateOne', {
-        //     _id: userAssign[0]._id,
-        //     isCompleted: true,
-        //   } );
-        // } else {
         logger.info( 'Hit in new file', { inputData } );
         const consumer = await sqsReceive( inputData.queueName );
         if ( !consumer ) {
@@ -3507,7 +3467,6 @@ export async function getDetectionAuditFile( req, res ) {
           return res.sendError( `${inputData.queueName} is Empty`, 204 );
         }
         msg = JSON.parse( consumer );
-        // }
         break;
 
       case 'drafted':
@@ -3643,7 +3602,7 @@ export async function getDetectionAuditFile( req, res ) {
         };
         files.push( {
           img_path: data,
-          img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}`: inputData.moduleType=='hygiene'?`${indexes[2]}-${indexes[3]}`:image[0],
+          img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}`:image[0],
           img_id: inputData.moduleType=='hygiene'? img[4] : img[3],
           selected: false,
           dropped: false,