tango-app-api-audit 3.3.0-alpha.13 → 3.3.0-alpha.15

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.3.0-alpha.13",
+    "version": "3.3.0-alpha.15",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -24,7 +24,7 @@
         "mongodb": "^6.7.0",
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.0.154",
+        "tango-api-schema": "^2.0.157",
         "tango-app-api-middleware": "^3.3.0-alpha.0",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/audit.controllers.js

@@ -738,21 +738,24 @@ export const mapFunction = async ( chunk, filter ) => {
 
 export async function workSpace( req, res ) {
   try {
-    const inputData = req.query;
+    const inputData = req.body;
     const limit = inputData.limit || 10;
     const offset = inputData.offset ?
       ( inputData.offset - 1 ) * limit :
       0;
     const dateRange = await getUTC( new Date(), new Date() );
-
+    const filter =[
+      { status: { $in: [ 'active', 'hold' ] } },
+      { 'auditConfigs.audit': { $eq: true } },
+    ];
+    if ( inputData?.clientId?.length > 0 ) {
+      filter.push( { clientId: { $in: inputData.clientId } } );
+    }
     const temp = [];
     const clientQuery = [
       {
         $match: {
-          $and: [
-            { status: { $in: [ 'active', 'hold' ] } },
-            { 'auditConfigs.audit': { $eq: true } },
-          ],
+          $and: filter,
         },
       },
       {
@@ -777,7 +780,7 @@ export async function workSpace( req, res ) {
     if ( inputData.sortColumnName ) {
       const sortBy = inputData.sortBy || -1;
       const sortColumn = inputData.sortColumnName;
-      query.push( {
+      clientQuery.push( {
         $sort: { [sortColumn]: sortBy },
       },
       );
@@ -1475,7 +1478,9 @@ export async function userAuditHistory( req, res ) {
         auditStatus: { $in: inputData.filterByStatus },
       } );
     }
-
+    if ( inputData?.clientId?.length > 0 ) {
+      filter.push( { clientId: { $in: inputData.clientId } } );
+    }
     const query = [
       {
         $match: {
@@ -1639,18 +1644,18 @@ export async function userAuditHistory( req, res ) {
         chunk.forEach( ( element ) => {
           exportData.push( {
 
-            'Client ID': element.clientId,
-            'Client Name': element.clientName,
+            'Brand ID': element.clientId,
+            'Brand Name': element.clientName,
             'Store ID': element.storeId,
             'Store Name': element.storeName,
             'Zone Name': element.zoneName,
             'Audit Type': element.auditType,
             'Module Type': element.moduleType,
             'Before Count': element.beforeCount,
-            'After Count': element.afterCount,
-            'Accuracy': element.accuracy,
+            'After Count': element.afterCount || '',
+            'Accuracy': element.accuracy || '',
             'Start Time': element.startTime,
-            'End Time': element.endTime,
+            'End Time': element.endTime || '',
             'Time Spent': element.timeSpent,
             'Audit Status': element.auditStatus,
             'CreatedAt': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
@@ -1661,8 +1666,8 @@ export async function userAuditHistory( req, res ) {
       } );
       const mappedArrays = await Promise.all( promises );
       mappedArrays.flat();
-
-      await download( mappedArrays, res );
+      logger.info( { mappedArrays: mappedArrays[0] } );
+      await download( mappedArrays[0], res );
       return;
     }
 
@@ -1978,7 +1983,7 @@ export async function storeMetrics( req, res ) {
           _id: 0,
           fileDate: 1,
           storeId: 1,
-          storeName: '$store.storeName',
+          storeName: '$stores.storeName',
           clientName: '',
           clientId: 1,
           zoneName: 1,
@@ -2060,7 +2065,7 @@ export async function storeMetrics( req, res ) {
           _id: 0,
           fileDate: 1,
           storeId: 1,
-          storeName: '$stores.storeName',
+          storeName: 1,
           userName: '$users.userName',
           userEmail: '$users.userEmail',
           clientId: 1,
@@ -2419,9 +2424,8 @@ export async function userMetrics( req, res ) {
               '_id': 0,
               'File Date': '$fileDate',
               'User Name': '$userName',
-              'User Id': '$userId',
               'Total Completed Files Count': '$totalCompletedFiles',
-              'Total efore Count': '$beforeCount',
+              'Total Before Count': '$beforeCount',
               'Total After Count': '$afterCount',
               'check Intime': '$checkIntime',
               'check OutTime': '$checkOutTime',
@@ -2440,7 +2444,7 @@ export async function userMetrics( req, res ) {
     return res.sendSuccess( { result: result, count: count.length } );
   } catch ( error ) {
     const err = error.error || 'Internal Server Error';
-    logger.info( { error: error, message: req.body, function: 'clientMetrics' } );
+    logger.info( { error: error, message: req.body, function: 'userMetrics' } );
     return res.sendError( err, 500 );
   }
 }
@@ -2725,7 +2729,7 @@ export async function overAllAuditSummary( req, res ) {
     return res.sendSuccess( { result: temp } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
-    logger.error( { error: error, message: req.body, function: 'summarySplit' } );
+    logger.error( { error: error, message: req.body, function: 'overAllAuditSummary' } );
     return res.sendError( err, 500 );
   }
 }
@@ -2873,7 +2877,7 @@ export async function reTrigger( req, res ) {
     return res.sendSuccess( { result: 'The File has been Re Trigger Succesfully' } );
   } catch ( error ) {
     const err = error.message;
-    logger.error( { error: error, message: req.body } );
+    logger.error( { error: error, message: req.body, function: 'reTrigger' } );
     return res.sendError( err, 500 );
   }
 }
@@ -3254,6 +3258,117 @@ export async function overviewTable( req, res ) {
   }
 }
 
+export async function totalNotAssignedCount( req, res ) {
+  try {
+    let notAssignedCount = {
+      totalAuditCount: 0,
+      totalZoneCount: 0,
+      totalTrafficCount: 0,
+    };
+    const getStoreData = await findOneStoreData(
+        {},
+        { fileDate: 1 },
+        { createdAt: -1 },
+    );
+    const latestDate = getStoreData?.fileDate || dayjs( fileDate ).format( 'DD-MM-YYYY' );
+    const query =[
+      {
+        $match: {
+          fileDate: { $eq: latestDate },
+        },
+      },
+      {
+        $project: {
+          totalZoneCount: { $cond: [
+            { $eq: [ '$moduleType', 'zone' ] }, 1, 0,
+          ] },
+          totalTrafficCount: { $cond: [
+            { $eq: [ '$moduleType', 'traffic' ] }, 1, 0,
+          ] },
+
+        },
+      },
+      {
+        $group: {
+          _id: null,
+          totalAuditCount: { $sum: 1 },
+          totalZoneCount: { $sum: '$totalZoneCount' },
+          totalTrafficCount: { $sum: '$totalTrafficCount' },
+
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          totalAuditCount: 1,
+          totalZoneCount: 1,
+          totalTrafficCount: 1,
+        },
+      },
+    ];
+    const inprogressCount=[
+      {
+        $match: {
+          fileDate: { $eq: latestDate },
+        },
+      },
+      {
+        $project: {
+          inprogressAuditCount: {
+            $cond: [
+              { $in: [ '$status', [ 'completed', 'not_assign' ] ] }, 1, 0,
+            ],
+          },
+          inprogressZoneCount: { $cond: [
+            { $and: [ { $eq: [ '$moduleType', 'zone' ] }, { $in: [ '$status', [ 'completed', 'not_assign' ] ] } ] }, 1, 0,
+          ] },
+          inprogressTrafficCount: { $cond: [
+            { $and: [ { $eq: [ '$moduleType', 'traffic' ] }, { $in: [ '$status', [ 'completed', 'not_assign' ] ] } ] }, 1, 0,
+          ] },
+
+        },
+      },
+      {
+        $group: {
+          _id: null,
+          inprogressAuditCount: { $sum: '$inprogressAuditCount' },
+          inprogressZoneCount: { $sum: '$inprogressZoneCount' },
+          inprogressTrafficCount: { $sum: '$inprogressTrafficCount' },
+
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          inprogressAuditCount: { $ifNull: [ '$inprogressAuditCount', 0 ] },
+          inprogressZoneCount: { $ifNull: [ '$inprogressZoneCount', 0 ] },
+          inprogressTrafficCount: { $ifNull: [ '$inprogressTrafficCount', 0 ] },
+        },
+      },
+    ];
+    const getTotalcount = await aggregateAuditStoreData( query );
+
+    const getInprogressCount = await aggregateStoreAudit( inprogressCount );
+    if ( getTotalcount.length == 0 ) {
+      return res.sendError( 'No Data Found', 204 );
+    }
+
+    if ( getInprogressCount.length >0 ) {
+      notAssignedCount.totalAuditCount = getTotalcount[0].totalAuditCount - getInprogressCount[0]?.inprogressAuditCount;
+      notAssignedCount.totalZoneCount = getTotalcount[0].totalZoneCount - getInprogressCount[0]?.inprogressZoneCount;
+      notAssignedCount.totalTrafficCount = getTotalcount[0].totalTrafficCount - getInprogressCount[0]?.inprogressTrafficCount;
+    } else {
+      notAssignedCount.totalAuditCount = getTotalcount[0].totalAuditCount;
+      notAssignedCount.totalZoneCount = getTotalcount[0].totalZoneCount;
+      notAssignedCount.totalTrafficCount;
+    }
+    return res.sendSuccess( { result: notAssignedCount } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.info( { error: error, message: req.body, function: 'totalNotAssignedCount' } );
+    return res.sendError( err, 500 );
+  }
+}
 
 export async function auditImages( req, res ) {
   try {
@@ -3321,7 +3436,7 @@ export async function auditImages( req, res ) {
   //  return res.sendSuccess( { result: inputData } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
-    logger.info( { error: error, message: req.body, function: 'beforeCountImages' } );
+    logger.info( { error: error, message: req.body, function: 'auditImages' } );
     return res.sendError( err, 500 );
   }
 }

package/src/docs/audit.docs.js

@@ -223,54 +223,17 @@ export const auditDocs = {
     },
   },
   '/v3/audit/work-space': {
-    get: {
+    post: {
       tags: [ 'Audit Mapping' ],
       description: 'queue wise info of audit files ',
       operationId: 'work-space',
-      parameters: [
-        {
-          in: 'query',
-          name: 'moduleType',
-          scema: j2s( workSpaceSchema ).swagger,
-          require: true,
-        },
-        {
-          in: 'query',
-          name: 'searchValue',
-          scema: j2s( workSpaceSchema ).swagger,
-          require: false,
-        },
-        {
-          in: 'query',
-          name: 'offset',
-          scema: j2s( workSpaceSchema ).swagger,
-          require: false,
-        },
-        {
-          in: 'query',
-          name: 'limit',
-          scema: j2s( workSpaceSchema ).swagger,
-          require: false,
-        },
-        {
-          in: 'query',
-          name: 'isExport',
-          scema: j2s( workSpaceSchema ).swagger,
-          require: false,
-        },
-        {
-          in: 'query',
-          name: 'sortColumnName',
-          scema: j2s( workSpaceSchema ).swagger,
-          require: false,
-        },
-        {
-          in: 'query',
-          name: 'sortBy',
-          scema: j2s( workSpaceSchema ).swagger,
-          require: false,
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( workSpaceSchema ).swagger,
+          },
         },
-      ],
+      },
       responses: {
         200: { description: 'Successful' },
         401: { description: 'Unauthorized User' },
@@ -561,4 +524,18 @@ export const auditDocs = {
 
     },
   },
+  '/v3/audit/total-not-assigned-count': {
+    get: {
+      tags: [ 'Audit Mapping' ],
+      description: 'Get total Not Assigned Count',
+      operationId: 'clients',
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
 };

package/src/dtos/audit.dtos.js

@@ -125,6 +125,7 @@ export const workSpaceSchema = joi.object(
     {
       searchValue: joi.string().optional().allow( '' ),
       moduleType: joi.string().required(),
+      clientId: joi.array().optional(),
       offset: joi.number().optional(),
       limit: joi.number().optional(),
       isExport: joi.boolean().optional(),
@@ -134,7 +135,7 @@ export const workSpaceSchema = joi.object(
 );
 
 export const workSpaceValid = {
-  query: workSpaceSchema,
+  body: workSpaceSchema,
 };
 
 /*           < -- *** Audit Metrics ***   -->      */
@@ -145,6 +146,7 @@ export const userAuditHistorySchema = joi.object(
       fromDate: joi.string().required(),
       toDate: joi.string().required(),
       dateType: joi.string().required(),
+      clientId: joi.array().optional(),
       filterByStoreId: joi.array().required(),
       filterByModuleType: joi.array().optional(),
       filterByAuditType: joi.array().optional(),

package/src/routes/audit.routes.js

@@ -1,7 +1,7 @@
 import express from 'express';
 import { isAuditDocumentExist, isAuditInputFolderExist, 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, userAuditHistory, userMetrics, workSpace } from '../controllers/audit.controllers.js';
+import { auditImages, auditStoreList, auditUserList, clientMetrics, clients, getAuditFile, getDraftedData, overAllAuditSummary, overViewCard, overviewTable, pendingSummaryTable, reTrigger, save, saveDraft, storeMetrics, summarySplit, totalNotAssignedCount, userAuditHistory, userMetrics, workSpace } 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';
 
 export const auditRouter = express.Router();
@@ -17,7 +17,7 @@ auditRouter.get( '/get-file', isAllowedSessionHandler, validate( getFileValid ),
 auditRouter.post( '/save-draft', isAllowedSessionHandler, validate( saveDraftValid ), saveDraft );
 auditRouter.get( '/get-drafted-data', isAllowedSessionHandler, validate( getDraftedDataValid ), getDraftedData );
 auditRouter.post( '/save', isAllowedSessionHandler, validate( saveValid ), validateUserAudit, save );
-auditRouter.get( '/work-space', isAllowedSessionHandler, validate( workSpaceValid ), workSpace );
+auditRouter.post( '/work-space', isAllowedSessionHandler, validate( workSpaceValid ), workSpace );
 
 // Audit Metrics
 auditRouter.post( '/metrics/user-audit-history', isAllowedSessionHandler, validate( userAuditHistoryValid ), userAuditHistory );
@@ -33,4 +33,6 @@ auditRouter.post( '/metrics/overview-card', isAllowedSessionHandler, validate( o
 auditRouter.post( '/metrics/summary-split-up', isAllowedSessionHandler, validate( summarySplitValid ), summarySplit );
 auditRouter.post( '/metrics/overview-table', isAllowedSessionHandler, validate( overviewTableValid ), overviewTable );
 
+// ticket
+auditRouter.get( '/total-not-assigned-count', isAllowedSessionHandler, totalNotAssignedCount );
 export default auditRouter;