tango-app-api-audit 3.4.68-beta.17 → 3.4.68-beta.19

package/.eslintrc.cjs

@@ -36,7 +36,7 @@ module.exports = {
     'no-unused-vars': 'error',
     'new-cap': [ 'error', { 'newIsCap': true, 'capIsNew': false } ],
     'prefer-const': 'off',
-    'no-console': 'error',
+    // 'no-console': 'error',
   },
 };
 

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,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.4.68-beta.17",
+    "version": "3.4.68-beta.19",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",

package/src/controllers/eyeTestAudit.controllers.js

@@ -19,7 +19,7 @@ export async function getList( req, res ) {
     const limit = inputData.limit || 10;
     const offset = inputData.offset ? ( inputData.offset - 1 ) * limit : 0;
 
-    const sortBy = inputData?.sortBy ? inputData.sortBy === 'coveredStepsAI' ? inputData.sortBy :`${inputData.sortBy}.keyword` : 'storeName.keyword';
+    const sortBy = inputData?.sortBy ? inputData.sortBy === 'coveredStepsAI'||inputData.sortBy==='updatedAt' ? inputData.sortBy :`${inputData.sortBy}.keyword` : 'storeName.keyword';
     const order = inputData?.sortOrder || -1;
     let filter= [
       {
@@ -34,13 +34,13 @@ export async function getList( req, res ) {
     ];
 
 
-    // if ( inputData.demographics && inputData.demographics.length > 0 ) {
-    //   filter.push( {
-    //     'terms': {
-    //       'visitorsType.keyword': inputData.demographics,
-    //     },
-    //   } );
-    // }
+    if ( inputData.demographics && inputData.demographics.length > 0 ) {
+      filter.push( {
+        'terms': {
+          'visitorsType.keyword': inputData.demographics,
+        },
+      } );
+    }
     if ( inputData.type && inputData.type!='' ) {
       filter.push( {
         'term': {
@@ -97,7 +97,7 @@ export async function getList( req, res ) {
           {
             'wildcard': {
               'optumId.keyword': {
-                'value': `*${inputData.engagementId}*`,
+                'value': `*${inputData.searchValue}*`,
               },
             },
           },
@@ -260,7 +260,11 @@ export async function viewFile( req, res ) {
         'term': {
           'type.keyword': getData?.type,
         },
-
+      },
+      {
+        'terms': {
+          'auditStatus.keyword': [ 'Audited', 'Re-Audited' ],
+        },
       },
     ];
     if ( getData?.type == 'remote' ) {
@@ -275,7 +279,11 @@ export async function viewFile( req, res ) {
           'term': {
             'type.keyword': getData?.type,
           },
-
+        },
+        {
+          'terms': {
+            'auditStatus.keyword': [ 'Audited', 'Re-Audited' ],
+          },
         },
       ];
     }
@@ -293,6 +301,7 @@ export async function viewFile( req, res ) {
     };
 
     const searchRes= await getOpenSearchData( openSearch.EyeTestOutput, searchQuery );
+
     const temp = searchRes?.body?.hits?.hits?.length > 0? searchRes?.body?.hits?.hits[0] : [];
 
     const getUserName = await findOneUser( { _id: new mongoose.Types.ObjectId( temp?._source?.userId ) }, { userName: 1 } );
@@ -437,7 +446,7 @@ export async function getFile( req, res ) {
         if ( !searchData ) {
           const data1 = await insertOpenSearchData( openSearch.EyeTestOutput, record );
           logger.info( { data1: data1 } );
-          await updateOpenSearchData( openSearch.EyeTestInput, inputData.id, { doc: { auditStatus: 'In-Progress', auditType: 'Audit', userId: req?.user?._id } } );
+          await updateOpenSearchData( openSearch.EyeTestInput, inputData.id, { doc: { 'auditStatus': 'In-Progress', 'auditType': 'Audit', 'userId': req?.user?._id, 'updatedAt': dayjs().tz( 'Asia/Kolkata' ) } } );
         }
 
         break;
@@ -517,7 +526,11 @@ export async function save( req, res ) {
         },
 
       },
-
+      {
+        'term': {
+          'userId.keyword': req?.user?._id,
+        },
+      },
       {
         'term': {
           'auditStatus.keyword': 'In-Progress',
@@ -566,23 +579,24 @@ export async function save( req, res ) {
       return res.sendError( 'This file is currently being audited by another user. Any actions you perform will not be saved.', 400 );
     }
     const record ={
-      steps: inputData?.steps,
-      auditStatus: inputData?.auditStatus,
-      auditedSteps: inputData?.auditedSteps,
-      overRides: inputData?.overRides,
-      trustScore: Math.round( 100-( ( inputData?.overRides / inputData?.steps?.length ) * 100 ) ),
-      spokenLanguage: inputData?.spokenLanguage,
-      endTime: dayjs().tz( 'Asia/Kolkata' ),
-
+      'steps': inputData?.steps,
+      'auditStatus': inputData?.auditStatus,
+      'auditedSteps': inputData?.auditedSteps,
+      'overRides': inputData?.overRides,
+      'trustScore': Math.round( 100-( ( inputData?.overRides / inputData?.steps?.length ) * 100 ) ),
+      'spokenLanguage': inputData?.spokenLanguage,
+      'endTime': dayjs().tz( 'Asia/Kolkata' ),
+      'updatedAt': dayjs().tz( 'Asia/Kolkata' ),
     };
     const inputrecord ={
 
-      auditStatus: inputData?.auditStatus,
-      auditedSteps: inputData?.auditedSteps,
-      overRides: inputData?.overRides,
-      trustScore: Math.round( 100-( ( inputData?.overRides / inputData?.steps?.length ) * 100 ) ),
-      spokenLanguage: inputData?.spokenLanguage,
-      endTime: dayjs().tz( 'Asia/Kolkata' ),
+      'auditStatus': inputData?.auditStatus,
+      'auditedSteps': inputData?.auditedSteps,
+      'overRides': inputData?.overRides,
+      'trustScore': Math.round( 100-( ( inputData?.overRides / inputData?.steps?.length ) * 100 ) ),
+      'spokenLanguage': inputData?.spokenLanguage,
+      'endTime': dayjs().tz( 'Asia/Kolkata' ),
+      'updatedAt': dayjs().tz( 'Asia/Kolkata' ),
 
     };
     await updateOpenSearchData( openSearch.EyeTestOutput, output?._id, { doc: record } );
@@ -626,7 +640,11 @@ export async function cancel( req, res ) {
         },
 
       },
-
+      {
+        'term': {
+          'userId.keyword': req?.user?._id,
+        },
+      },
       {
         'term': {
           'auditStatus.keyword': 'In-Progress',
@@ -747,6 +765,9 @@ export async function getFileHistory( req, res ) {
             ],
           },
         },
+        'sort': [
+          { updatedAt: { order: 'desc' } },
+        ],
       };
     } else {
       Query = {
@@ -767,6 +788,9 @@ export async function getFileHistory( req, res ) {
             ],
           },
         },
+        'sort': [
+          { updatedAt: { order: 'desc' } },
+        ],
       };
     };