tango-app-api-audit 3.4.68-beta.3 → 3.4.68-beta.5

package/package.json

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

package/src/controllers/eyeTestAudit.controllers.js

@@ -147,7 +147,7 @@ export async function getList( req, res ) {
           'bool': search,
         },
         'sort': [
-          { createdAt: { order: 'desc' } },
+          { 'storeName.keyword': { order: 'desc' } },
         ],
       };
     }
@@ -164,7 +164,7 @@ export async function getList( req, res ) {
       const chunkedMappingData = await chunkArray( searchValue, 10 );
       const promises = chunkedMappingData.map( async ( chunk ) => {
         const exportData = [];
-        chunk.forEach( async ( element ) => {
+        for ( const element of chunk ) {
           const testDuration = element?._source?.testDuration;
           const minutes = Math.floor( testDuration / 60 );
           const seconds = testDuration % 60;
@@ -200,11 +200,11 @@ export async function getList( req, res ) {
               'Visitor Type': element?._source?.visitorsType,
               'Test Duration': duration || '',
               'Audit Status': element?._source?.auditStatus || '',
-              'Audited By': userName.userName || '',
+              'Audited By': userName?.userName || '',
 
             } );
           }
-        } );
+        }
         return exportData;
       } );
       const mappedArrays = await Promise.all( promises );
@@ -590,6 +590,94 @@ export async function save( req, res ) {
   }
 }
 
+export async function cancel( req, res ) {
+  try {
+    const inputData = req.body;
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
+
+    let searchFilter =[
+      {
+        'term': {
+          'queueId.keyword': inputData?.fileId,
+        },
+
+      },
+      {
+        'term': {
+          'type.keyword': inputData?.type,
+        },
+
+      },
+
+      {
+        'term': {
+          'auditStatus.keyword': 'In-Progress',
+        },
+      },
+    ];
+    if ( inputData?.type == 'remote' ) {
+      searchFilter =[
+        {
+          'term': {
+            'engagementId.keyword': inputData?.fileId,
+          },
+
+        },
+        {
+          'term': {
+            'type.keyword': inputData?.type,
+          },
+
+        },
+        {
+          'term': {
+            'userId.keyword': req?.user?._id,
+          },
+        },
+        {
+          'term': {
+            'auditStatus.keyword': 'In-Progress',
+          },
+        },
+      ];
+    }
+
+    let searchQuery={
+      'size': 1,
+      'query': {
+        'bool': {
+          'must': searchFilter,
+        },
+      },
+    };
+    const getOutput = await getOpenSearchData( openSearch.EyeTestOutput, searchQuery );
+    logger.info( { getOutput: getOutput } );
+    const output = getOutput?.body?.hits?.hits?.length > 0 ? getOutput?.body?.hits?.hits[0] : null;
+    if ( !output ) {
+      return res.sendError( 'No saved records found', 400 );
+    }
+    const record1 ={
+
+      auditStatus: 'Skipped',
+      endTime: dayjs().tz( 'Asia/Kolkata' ),
+
+    };
+    const record2 ={
+
+      auditStatus: 'Yet-to-Audit',
+      endTime: dayjs().tz( 'Asia/Kolkata' ),
+
+    };
+    await updateOpenSearchData( openSearch.EyeTestOutput, output?._id, { doc: record1 } );
+    await updateOpenSearchData( openSearch.EyeTestInput, inputData.id, { doc: record2 } );
+    return res.sendSuccess( 'The file has canceled ' );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { message: error, data: req.params, function: 'eyetestAudit-controller-cancel' } );
+    return res.sendError( err, 500 );
+  }
+}
+
 export async function getFileHistory( req, res ) {
   try {
     const parsedOpenSearch = JSON.parse( process.env.OPENSEARCH );
@@ -606,7 +694,11 @@ export async function getFileHistory( req, res ) {
                   'queueId.keyword': inputData.id,
                 },
               },
-
+              {
+                'terms': {
+                  'auditStatus.keyword': [ 'Audited', 'Re-Audited' ],
+                },
+              },
             ],
           },
         },
@@ -622,7 +714,11 @@ export async function getFileHistory( req, res ) {
                   'engagementId.keyword': inputData.id,
                 },
               },
-
+              {
+                'terms': {
+                  'auditStatus.keyword': [ 'Audited', 'Re-Audited' ],
+                },
+              },
             ],
           },
         },
@@ -634,13 +730,14 @@ export async function getFileHistory( req, res ) {
       let sourcesArray = resposnse.body.hits.hits.map( ( hit ) => hit );
       let outputData=[];
       for ( let data of sourcesArray ) {
+        // console.log( data._source.endTime );
         let findUser= await findOneUser( { _id: new mongoose.Types.ObjectId( data._source.userId ) } );
         outputData.push( {
           _id: data._id,
           userId: data._source.userId,
           userName: findUser.userName,
           Date: dayjs( data._source.endTime ).format( 'DD/MM/YYYY' ),
-          Time: dayjs( data._source.endTime ).format( 'HH:MM:ss' ),
+          Time: data._source.endTime?new Date( data._source.endTime ).toLocaleTimeString( 'en-IN', { hour12: false } ):'-',
         } );
       }
 

package/src/docs/eyeTestAudit.docs.js

@@ -1,5 +1,5 @@
 import j2s from 'joi-to-swagger';
-import { getListSchema, getFileSchema, getFileHistorySchema, userAuditedDataSchema, viewFileSchema, saveSchema } from '../dtos/eyeTestAudit.dtos.js';
+import { getListSchema, getFileSchema, getFileHistorySchema, userAuditedDataSchema, viewFileSchema, saveSchema, cancelSchema } from '../dtos/eyeTestAudit.dtos.js';
 
 export const eyeTestAuditDocs = {
 
@@ -93,6 +93,28 @@ export const eyeTestAuditDocs = {
     },
   },
 
+  '/v3/eye-test-audit/cancel': {
+    post: {
+      tags: [ 'Eye Test Audit' ],
+      description: 'cancel eytest audit',
+      operationId: 'cancel',
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( cancelSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+
   '/v3/eye-test-audit/get-file-history/{id}': {
     get: {
       tags: [ 'Eye Test Audit' ],

package/src/dtos/eyeTestAudit.dtos.js

@@ -53,6 +53,17 @@ export const saveValid = {
 };
 
 
+export const cancelSchema = joi.object( {
+  type: joi.string().required(),
+  fileId: joi.string().required(),
+  id: joi.string().required(),
+} );
+
+export const cancelValid = {
+  body: cancelSchema,
+};
+
+
 export const getFileHistorySchema = joi.object( {
   id: joi.string().required(),
   type: joi.string().required(),

package/src/routes/eyeTestAudit.routes.js

@@ -1,8 +1,8 @@
 import { Router } from 'express';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 import { accessVerification } from 'tango-app-api-middleware';
-import { getFileHistoryValid, getFileValid, getListValid, saveValid, userAuditedDataValid, viewFileValid } from '../dtos/eyeTestAudit.dtos.js';
-import { getFile, getFileHistory, getList, save, userAuditedData, viewFile } from '../controllers/eyeTestAudit.controllers.js';
+import { cancelValid, getFileHistoryValid, getFileValid, getListValid, saveValid, userAuditedDataValid, viewFileValid } from '../dtos/eyeTestAudit.dtos.js';
+import { cancel, getFile, getFileHistory, getList, save, userAuditedData, viewFile } from '../controllers/eyeTestAudit.controllers.js';
 
 export const eyeTestAuditRouter = Router();
 
@@ -10,6 +10,7 @@ eyeTestAuditRouter.post( '/get-list', isAllowedSessionHandler, accessVerificatio
 eyeTestAuditRouter.get( '/view-file/:id', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( viewFileValid ), viewFile );
 eyeTestAuditRouter.get( '/get-file/:id', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( getFileValid ), getFile );
 eyeTestAuditRouter.post( '/save', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( saveValid ), save );
+eyeTestAuditRouter.post( '/cancel', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( cancelValid ), cancel );
 eyeTestAuditRouter.get( '/get-file-history/:id/:type', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( getFileHistoryValid ), getFileHistory );
 eyeTestAuditRouter.get( '/user-audited-data/:id', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( userAuditedDataValid ), userAuditedData );