tango-app-api-audit 3.4.68-beta.1 → 3.4.68-beta.10

package/package.json

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

package/src/controllers/eyeTestAudit.controllers.js

@@ -1,4 +1,4 @@
-import { getOpenSearchData, getOpenSearchById, logger, insertOpenSearchData, updateOpenSearchData } from 'tango-app-api-middleware';
+import { getOpenSearchData, getOpenSearchById, logger, insertOpenSearchData, updateOpenSearchData, download, chunkArray } from 'tango-app-api-middleware';
 import { findOneUser } from '../service/user.service.js';
 import mongoose from 'mongoose';
 import dayjs from 'dayjs';
@@ -16,7 +16,8 @@ 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}.keyword` : 'storeName.keyword';
+    const order = inputData?.sortOrder || -1;
     let filter= [
       {
         'range': {
@@ -28,21 +29,24 @@ export async function getList( req, res ) {
       },
 
     ];
-    let search ={
-      'must': filter,
-    };
 
-    if ( inputData.visitorsType && inputData.visitorsType.lenght > 0 ) {
-      filter.push( {
 
-        'terms': {
-          'visitorsType.keyword': inputData.visitorsType,
+    // if ( inputData.demographics && inputData.demographics.length > 0 ) {
+    //   filter.push( {
+    //     'terms': {
+    //       'visitorsType.keyword': inputData.demographics,
+    //     },
+    //   } );
+    // }
+    if ( inputData.type && inputData.type!='' ) {
+      filter.push( {
+        'term': {
+          'type.keyword': inputData.type,
         },
 
       } );
     }
-
-    if ( inputData.storeId && inputData.storeId.lenght > 0 ) {
+    if ( inputData.storeId && inputData.storeId.length > 0 ) {
       filter.push( {
 
         'terms': {
@@ -51,6 +55,9 @@ export async function getList( req, res ) {
 
       } );
     }
+    let search ={
+      'must': filter,
+    };
 
     if ( inputData.searchValue && inputData.searchValue !== '' ) {
       search ={
@@ -109,14 +116,41 @@ export async function getList( req, res ) {
         'minimum_should_match': 1,
       };
     }
-
     let searchQuery={
       'from': offset,
       'size': limit,
       'query': {
         'bool': search,
       },
+      'sort': [
+        { date: { order: 'desc' } },
+      ],
     };
+    if ( sortBy && sortBy !== '' ) {
+      searchQuery={
+        'from': offset,
+        'size': limit,
+        'query': {
+          'bool': search,
+        },
+        'sort': [
+          { [sortBy]: { order: order === -1 ?'desc':'asc' } },
+        ],
+      };
+    }
+
+    if ( inputData.isExport==true ) {
+      searchQuery={
+        'from': 0,
+        'size': 10000,
+        'query': {
+          'bool': search,
+        },
+        'sort': [
+          { 'storeName.keyword': { order: 'desc' } },
+        ],
+      };
+    }
     const result = await getOpenSearchData( openSearch.EyeTestInput, searchQuery );
     const count = result?.body?.hits?.total?.value;
     if ( !count || count == 0 ) {
@@ -126,6 +160,70 @@ export async function getList( req, res ) {
     if ( !searchValue || searchValue?.length == 0 ) {
       return res.sendError( 'No data found', 204 );
     }
+    if ( inputData.isExport == true ) {
+      const chunkedMappingData = await chunkArray( searchValue, 10 );
+      const promises = chunkedMappingData.map( async ( chunk ) => {
+        const exportData = [];
+        for ( const element of chunk ) {
+          const testDuration = element?._source?.testDuration;
+          const minutes = Math.floor( testDuration / 60 );
+          const seconds = testDuration % 60;
+          const minutes1 =minutes> 1? `${minutes} mins` : `${minutes} min`;
+          const seconds1 = seconds > 1? `${minutes} secs`: seconds == 1? `${minutes} sec` : '';
+          const duration =`${minutes1} ${seconds1}`;
+          const userName = await findOneUser( { _id: element?._source?.userId }, { _id: 0, userName: 1 } );
+          if ( element?._source?.type == 'physical' ) {
+            exportData.push( {
+              'Date': dayjs( element?._source?.date ).format( 'YYYY,MMM D' ),
+              'Store Name': element?._source?.storeName,
+              'Store ID': element?._source?.storeId || 'Un Assigned',
+              'Store Name': element?._source?.storeName ||'Un Assigned',
+              'Optum ID': element?._source?.optumId,
+              'Queue ID': element?._source?.queueId,
+              'Compliance Score': element?._source?.totalSteps>0 ? Math.round( ( element?._source?.coveredStepsAI/ element?._source?.totalSteps )*100 ): 0,
+              'Steps Covered By AI': element?._source?.coveredStepsAI || 0,
+              'Visitor Type': element?._source?.visitorsType,
+              'Test Duration': duration || '',
+              'Audit Status': element?._source?.auditStatus || '',
+              'Audited By': userName?.userName || '',
+
+            } );
+          } else {
+            exportData.push( {
+              'Date': dayjs( element?._source?.date ).format( 'YYYY,MMM D' ),
+              'Store Name': element?._source?.storeName,
+              'Store ID': element?._source?.storeId || 'Un Assigned',
+              'Store Name': element?._source?.storeName ||'Un Assigned',
+              'Engagement ID': element?._source?.engagementId,
+              'Compliance Score': element?._source?.complianceScore || 0,
+              'Steps Covered By AI': element?._source?.coveredStepsAI || 0,
+              'Visitor Type': element?._source?.visitorsType,
+              'Test Duration': duration || '',
+              'Audit Status': element?._source?.auditStatus || '',
+              'Audited By': userName?.userName || '',
+
+            } );
+          }
+        }
+        return exportData;
+      } );
+      const mappedArrays = await Promise.all( promises );
+      const result = mappedArrays.flat();
+      await download( result, res );
+      return;
+    } else {
+      for ( const [ i, item ] of searchValue.entries() ) {
+        const userName = await findOneUser( { _id: item?._source?.userId }, { _id: 0, userName: 1 } );
+        const testDuration = searchValue[i]?._source?.testDuration;
+        const minutes = Math.floor( testDuration / 60 );
+        const seconds = testDuration % 60;
+        searchValue[i]._source.complianceScore = searchValue[i]?._source?.totalSteps>0 ? Math.round( ( searchValue[i]?._source?.coveredStepsAI/ searchValue[i]?._source?.totalSteps )*100 ): 0;
+        searchValue[i]._source.min = minutes;
+        searchValue[i]._source.sec = seconds;
+        searchValue[i]._source.auditedBy = userName?.userName || '';
+      }
+    }
+
     return res.sendSuccess( { result: searchValue, count: count } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
@@ -150,13 +248,13 @@ export async function viewFile( req, res ) {
 
     let searchFilter =[
       {
-        'terms': {
+        'term': {
           'queueId.keyword': getData?.queueId,
         },
 
       },
       {
-        'terms': {
+        'term': {
           'type.keyword': getData?.type,
         },
 
@@ -165,13 +263,13 @@ export async function viewFile( req, res ) {
     if ( getData?.type == 'remote' ) {
       searchFilter =[
         {
-          'terms': {
+          'term': {
             'engagementId.keyword': getData?.engagementId,
           },
 
         },
         {
-          'terms': {
+          'term': {
             'type.keyword': getData?.type,
           },
 
@@ -190,21 +288,25 @@ export async function viewFile( req, res ) {
         { createdAt: { order: 'desc' } },
       ],
     };
+
     const searchRes= await getOpenSearchData( openSearch.EyeTestOutput, searchQuery );
-    const temp = searchRes?.body?.hits?.hits?.lenght > 0? searchRes?.body?.hits?.hits[0] : [];
-    const getUserName = await findOneUser( { _id: new mongoose.Types.ObjectId( temp?.userId ) }, { userName: 1 } );
+    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 } );
 
     const searchData = temp?
     getData['lastAuditedDetails']= {
       'auditedBy': getUserName?.userName || '',
-      'completionTime': temp?.startTime? new Date( temp?.startTime ).toLocaleTimeString( 'en-IN', { hour12: false } ): '',
+      'completionTime': temp?._source?.startTime? dayjs.utc( temp?._source?.startTime ).tz( 'Asia/Kolkata' ).format( 'HH:ss:mm' ): '',
       'timeZone': temp?.timeZone || '',
     } : null;
     getData['complianceScore'] = getData.complianceScore || getData?.totalSteps>0 ? Math.round( ( getData?.coveredStepsAI/ getData?.totalSteps )*100 ): 0;
     getData['trustScore'] = getData?.trustScore || 0;
     getData['testDuration'] = Math.round( getData?.testDuration/60 ) || 0;
     getData['filePath'] = `${url[getData?.type]}${getData?.filePath}`;
+    getData['auditType'] = getData.auditType || 'Audit';
     const response = getData;
+
     switch ( getData?.auditStatus ) {
       case 'Yet-to-Audit':
         isEnable=true;
@@ -216,17 +318,19 @@ export async function viewFile( req, res ) {
         if ( searchData.userId !== req.user._id ) {
           isEnable=false;
         }
-        return res.sendSuccess( { result: result } );
         break;
       case 'Audited':
+        response['steps']= temp._source?.steps;
+        isEnable=true;
       case 'Re-Audited':
+        response['steps']= temp._source?.steps;
         isEnable=true;
     }
 
     return res.sendSuccess( { result: response, isEnable: isEnable } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
-    logger.error( { message: error, data: req.body, function: 'eyetestAudit-controller-viewFile' } );
+    logger.error( { message: error, data: req.params, function: 'eyetestAudit-controller-viewFile' } );
     return res.sendError( err, 500 );
   }
 }
@@ -321,6 +425,7 @@ export async function getFile( req, res ) {
           'startTime': dayjs().tz( 'Asia/Kolkata' ),
           'createdAt': dayjs().tz( 'Asia/Kolkata' ),
           'updatedAt': dayjs().tz( 'Asia/Kolkata' ),
+          'auditType': 'Audit',
 
         };
         record?.steps?.map( ( item, i ) => {
@@ -329,7 +434,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', userId: req?.user?._id } } );
+          await updateOpenSearchData( openSearch.EyeTestInput, inputData.id, { doc: { auditStatus: 'In-Progress', auditType: 'Audit', userId: req?.user?._id } } );
         }
 
         break;
@@ -370,13 +475,14 @@ export async function getFile( req, res ) {
           'totalSteps': getData?.totalSteps,
           'filePath': `${url[getData?.type]}${getData?.filePath}`,
           'steps': getData?.steps,
+          'auditType': 'Re-Audit',
           'startTime': dayjs().tz( 'Asia/Kolkata' ),
           'createdAt': dayjs().tz( 'Asia/Kolkata' ),
           'updatedAt': dayjs().tz( 'Asia/Kolkata' ),
 
         };
         await insertOpenSearchData( openSearch.EyeTestOutput, newRecord );
-        await updateOpenSearchData( openSearch.EyeTestInput, inputData.id, { doc: { auditStatus: 'In-Progress' } } );
+        await updateOpenSearchData( openSearch.EyeTestInput, inputData.id, { doc: { auditStatus: 'In-Progress', auditType: 'Re-Audit' } } );
 
         break;
       default:
@@ -390,6 +496,189 @@ export async function getFile( req, res ) {
     return res.sendError( err, 500 );
   }
 }
+export async function save( 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 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' ),
+
+    };
+    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' ),
+
+    };
+    await updateOpenSearchData( openSearch.EyeTestOutput, output?._id, { doc: record } );
+    await updateOpenSearchData( openSearch.EyeTestInput, inputData.id, { doc: inputrecord } );
+    return res.sendSuccess( 'The file has been submited successfully' );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { message: error, data: req.params, function: 'eyetestAudit-controller-save' } );
+    return res.sendError( err, 500 );
+  }
+}
+
+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 {
@@ -407,7 +696,11 @@ export async function getFileHistory( req, res ) {
                   'queueId.keyword': inputData.id,
                 },
               },
-
+              {
+                'terms': {
+                  'auditStatus.keyword': [ 'Audited', 'Re-Audited' ],
+                },
+              },
             ],
           },
         },
@@ -423,7 +716,11 @@ export async function getFileHistory( req, res ) {
                   'engagementId.keyword': inputData.id,
                 },
               },
-
+              {
+                'terms': {
+                  'auditStatus.keyword': [ 'Audited', 'Re-Audited' ],
+                },
+              },
             ],
           },
         },
@@ -435,13 +732,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: dayjs.utc( data._source.endTime ).tz( 'Asia/Kolkata' ).format( 'HH:ss:mm' ),
         } );
       }
 
@@ -460,7 +758,9 @@ export async function userAuditedData( req, res ) {
   try {
     const parsedOpenSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.params;
+
     const resposnse = await getOpenSearchById( parsedOpenSearch.EyeTestOutput, inputData.id );
+
     if ( resposnse.body&&resposnse.body._source ) {
       return res.sendSuccess( { result: resposnse.body._source.steps } );
     } else {

package/src/docs/eyeTestAudit.docs.js

@@ -1,5 +1,5 @@
 import j2s from 'joi-to-swagger';
-import { getListSchema, getFileSchema, getFileHistorySchema, userAuditedDataSchema, viewFileSchema } from '../dtos/eyeTestAudit.dtos.js';
+import { getListSchema, getFileSchema, getFileHistorySchema, userAuditedDataSchema, viewFileSchema, saveSchema, cancelSchema } from '../dtos/eyeTestAudit.dtos.js';
 
 export const eyeTestAuditDocs = {
 
@@ -71,6 +71,50 @@ export const eyeTestAuditDocs = {
     },
   },
 
+  '/v3/eye-test-audit/save': {
+    post: {
+      tags: [ 'Eye Test Audit' ],
+      description: 'submit eytest audit',
+      operationId: 'save',
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( saveSchema ).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/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

@@ -11,6 +11,8 @@ export const getListSchema = joi.object(
       offset: joi.number().optional(),
       searchValue: joi.string().optional().allow( '' ),
       isExport: joi.boolean().optional(),
+      sortBy: joi.string().optional(),
+      sortOrder: joi.number().optional(),
     },
 );
 
@@ -35,6 +37,33 @@ export const getFileValid = {
   params: getFileSchema,
 };
 
+export const saveSchema = joi.object( {
+  type: joi.string().required(),
+  fileId: joi.string().required(),
+  id: joi.string().required(),
+  steps: joi.array().required(),
+  auditedSteps: joi.number().required(),
+  auditStatus: joi.string().required(),
+  overRides: joi.number().required(),
+  spokenLanguage: joi.string().optional(),
+} );
+
+export const saveValid = {
+  body: saveSchema,
+};
+
+
+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,15 +1,16 @@
 import { Router } from 'express';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 import { accessVerification } from 'tango-app-api-middleware';
-import { getFileHistoryValid, getFileValid, getListValid, userAuditedDataValid, viewFileValid } from '../dtos/eyeTestAudit.dtos.js';
-import { getFile, getFileHistory, getList, 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();
 
 eyeTestAuditRouter.post( '/get-list', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( getListValid ), getList );
 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 );
+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 );