tango-app-api-audit 3.4.11-alpha.22 → 3.4.11-alpha.24

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -2320,11 +2320,17 @@ export async function userMetrics( req, res ) {
           userId: 1,
           fileDate: 1,
           startTime: 1,
-          endTime: 1,
+          endTime: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, '$endTime', '$$REMOVE' ] },
           totalCompletedFiles: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, 1, 0 ] },
           beforeCount: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, '$beforeCount', 0 ] },
           afterCount: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, '$afterCount', 0 ] },
           createdAt: 1,
+          // to: '$createdAt',
+        },
+      },
+      {
+        $sort: {
+          endTime: -1,
         },
       },
       {
@@ -2336,8 +2342,9 @@ export async function userMetrics( req, res ) {
           beforeCount: { $sum: '$beforeCount' },
           afterCount: { $sum: '$afterCount' },
           checkIntime: { $first: '$startTime' },
-          checkOutTime: { $last: '$endTime' },
+          checkOutTime: { $first: '$endTime' },
           createdAt: { $first: '$createdAt' },
+          to: { $last: '$createdAt' },
 
         },
       },
@@ -2373,6 +2380,7 @@ export async function userMetrics( req, res ) {
             $divide: [ { $subtract: [ '$checkOutTime', '$checkIntime' ] }, 1000 ],
           },
           createdAt: 1,
+          to: 1,
         },
       },
       {
@@ -2389,6 +2397,7 @@ export async function userMetrics( req, res ) {
           minutes: { $floor: { $divide: [ { $mod: [ '$differenceInSeconds', 3600 ] }, 60 ] } },
           seconds: { $mod: [ '$differenceInSeconds', 60 ] },
           createdAt: 1,
+          to: 1,
         },
       },
       {
@@ -2424,6 +2433,7 @@ export async function userMetrics( req, res ) {
             },
           },
           createdAt: 1,
+          to: 1,
         },
       },
       {
@@ -2442,6 +2452,7 @@ export async function userMetrics( req, res ) {
             $concat: [ '$hours', ':', '$minutes', ':', '$seconds' ],
           },
           createdAt: 1,
+          to: 1,
         },
       },
       {
@@ -2496,6 +2507,7 @@ export async function userMetrics( req, res ) {
           },
           workingHours: 1,
           createdAt: 1,
+          to: 1,
         },
       },
     ];
@@ -4734,6 +4746,7 @@ export async function auditViewLogs( req, res ) {
             },
           };
           break;
+        case 'uniform-detection':
         case 'mobile-detection':
           logsQuery = {
             'size': 100,

package/src/controllers/traxAudit.controllers.js

@@ -4535,39 +4535,42 @@ export async function save( req, res ) {
       if ( !getFilePath ) {
         return res.sendError( ' SQS is not sent due to Inserted Data is not there', 400 );
       }
+      const [ getStore, getClient ] = await Promise.all( [ findOneStore( { storeId: inputData.storeId }, { storeName: 1, storeProfile: 1, spocDetails: 1 } ), findOneClient( { clientId: inputData.clientId }, { clientName: 1 } ) ] );
+
       const tempId=[];
       if ( inputData.employeeCount > 0 ) {
         for ( let i =0; i<inputData?.employee.length; i++ ) {
           tempId.push( inputData?.employee[i].img_id );
         }
-      }
-      const [ getStore, getClient ] = await Promise.all( [ findOneStore( { storeId: inputData.storeId }, { storeName: 1, storeProfile: 1, spocDetails: 1 } ), findOneClient( { clientId: inputData.clientId }, { clientName: 1 } ) ] );
-      const sqsProduceQueue = {
-        QueueUrl: `${sqs.url}${sqs.uniformOutput}`,
-        MessageBody: JSON.stringify( {
-          storeId: inputData.storeId,
-          storeName: getStore?.storeName,
-          fileDate: inputData.fileDate,
-          moduleType: inputData.moduleType,
-          inputBucketName: getFilePath?.sqs?.Body?.inputBucketName,
-          tempId: tempId,
-          count: inputData.employeeCount,
-          folderPath: getFilePath?.sqs?.Body?.folderPath,
-        } ),
-      };
-      const sqsQueue = await sendMessageToQueue(
-          sqsProduceQueue.QueueUrl,
-          sqsProduceQueue.MessageBody,
-      );
 
-      if ( sqsQueue.statusCode ) {
-        logger.error( {
-          error: `${sqsQueue}`,
-          type: 'UPLOAD_ERROR',
-        } );
-        return res.sendError( 'SQS not sent', 500 );
+        const sqsProduceQueue = {
+          QueueUrl: `${sqs.url}${sqs.uniformOutput}`,
+          MessageBody: JSON.stringify( {
+            storeId: inputData.storeId,
+            storeName: getStore?.storeName,
+            fileDate: inputData.fileDate,
+            moduleType: inputData.moduleType,
+            inputBucketName: getFilePath?.sqs?.Body?.inputBucketName,
+            tempId: tempId,
+            count: inputData.employeeCount,
+            folderPath: getFilePath?.sqs?.Body?.folderPath,
+          } ),
+        };
+        const sqsQueue = await sendMessageToQueue(
+            sqsProduceQueue.QueueUrl,
+            sqsProduceQueue.MessageBody,
+        );
+
+        if ( sqsQueue.statusCode ) {
+          logger.error( {
+            error: `${sqsQueue}`,
+            type: 'UPLOAD_ERROR',
+          } );
+          return res.sendError( 'SQS not sent', 500 );
+        }
       }
 
+
       // trax output in open serach
       const output = {
         clientId: inputData.clientId,

package/src/docs/audit.docs.js

@@ -1,4 +1,4 @@
-import { auditStoreSchema, clientMetricsSchema, clientSchema, getDraftedDataSchema, getFileSchema, overAllAuditSummarySchema, overViewCardSchema, reTriggerValidSchema, saveDraftSchema, saveSchema, storeMetricsSchema, summarySplitSchema, userAuditHistorySchema, userMetricsSchema, userSchema, workSpaceSchema, auditImageValidSchema, pendingSummaryTableSchema, overviewTableSchema } from '../dtos/audit.dtos.js';
+import { auditStoreSchema, clientMetricsSchema, clientSchema, getDraftedDataSchema, getFileSchema, overAllAuditSummarySchema, overViewCardSchema, reTriggerValidSchema, saveDraftSchema, saveSchema, storeMetricsSchema, summarySplitSchema, userAuditHistorySchema, userMetricsSchema, userSchema, workSpaceSchema, auditImageValidSchema, pendingSummaryTableSchema, overviewTableSchema, auditViewlogSchema } from '../dtos/audit.dtos.js';
 import j2s from 'joi-to-swagger';
 
 export const auditDocs = {
@@ -544,6 +544,47 @@ export const auditDocs = {
       },
     },
   },
+  '/v3/audit/audit-view-logs': {
+    get: {
+      tags: [ 'Audit Mapping' ],
+      description: `Get log for a store audit details`,
+      operationId: 'audit-view-logs',
+      parameters: [
+        {
+          in: 'query',
+          name: 'fileDate',
+          scema: j2s( auditViewlogSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'storeId',
+          scema: j2s( auditViewlogSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'moduleType',
+          scema: j2s( auditViewlogSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'zoneName',
+          scema: j2s( auditViewlogSchema ).swagger,
+          require: false,
+        },
+      ],
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+
+    },
+  },
   '/v3/audit/get-user-credit': {
     get: {
       tags: [ 'Audit User Wallet' ],

package/src/dtos/audit.dtos.js

@@ -239,6 +239,17 @@ export const overviewTableValid = {
   body: overviewTableSchema,
 };
 
+export const auditViewlogSchema = joi.object( {
+  fileDate: joi.string().required(),
+  storeId: joi.string().required(),
+  moduleType: joi.string().required(),
+  zoneName: joi.string().optional(),
+} );
+
+export const auditViewLogValid = {
+  query: auditViewlogSchema,
+};
+
 export const overAllAuditSummarySchema = joi.object( {
   fromDate: joi.string().required(),
   toDate: joi.string().required(),

package/src/routes/audit.routes.js

@@ -2,7 +2,7 @@ import express from 'express';
 import { isAuditDocumentExist, isAuditInputFolderExist, isAuditUser, isExistsQueue, validateUserAudit } from '../validation/audit.validation.js';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 import { auditImages, auditStoreList, auditUserList, clientMetrics, clients, getAuditFile, getDraftedData, overAllAuditSummary, overViewCard, overviewTable, pendingSummaryTable, reTrigger, save, saveDraft, storeMetrics, summarySplit, totalNotAssignedCount, userAuditHistory, userMetrics, workSpace, getUserAuditCount, getUserAuditCountMTD, auditViewLogs, getUserCredit } from '../controllers/audit.controllers.js';
-import { auditStoreValid, clientMetricsValid, clientValid, getDraftedDataValid, getFileValid, overAllAuditSummaryValid, overViewCardValid, pendingSummaryTableValid, reTriggerValid, saveDraftValid, saveValid, storeMetricsValid, summarySplitValid, userAuditHistoryValid, userMetricsValid, workSpaceValid, auditImageValid, overviewTableValid } from '../dtos/audit.dtos.js';
+import { auditStoreValid, clientMetricsValid, clientValid, getDraftedDataValid, getFileValid, overAllAuditSummaryValid, overViewCardValid, pendingSummaryTableValid, reTriggerValid, saveDraftValid, saveValid, storeMetricsValid, summarySplitValid, userAuditHistoryValid, userMetricsValid, workSpaceValid, auditImageValid, overviewTableValid, auditViewLogValid } from '../dtos/audit.dtos.js';
 
 export const auditRouter = express.Router();
 
@@ -42,5 +42,5 @@ auditRouter.get( '/get-user-audit-count', isAllowedSessionHandler, getUserAuditC
 auditRouter.get( '/get-user-audit-count-mtd', isAllowedSessionHandler, getUserAuditCountMTD );
 
 // audit log
-auditRouter.get( '/audit-view-logs', isAllowedSessionHandler, auditViewLogs );
+auditRouter.get( '/audit-view-logs', isAllowedSessionHandler, validate( auditViewLogValid ), auditViewLogs );
 export default auditRouter;