tango-app-api-audit 3.3.0-alpha.7 → 3.3.0-alpha.9

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.3.0-alpha.7",
+    "version": "3.3.0-alpha.9",
     "description": "audit & audit metrics apis",
-    "main": "app.js",
+    "main": "index.js",
     "type": "module",
     "scripts": {
-        "start": "nodemon --exec \"eslint --fix . && node app.js\""
+        "start": "nodemon --exec \"eslint --fix . && node index.js\""
     },
     "engines": {
         "node": ">=18.10.0"

package/src/controllers/audit.controllers.js

@@ -54,7 +54,7 @@ import {
 } from '../validation/audit.validation.js';
 import mongoose from 'mongoose';
 import {
-  aggregateAuditStoreDataSchema,
+  aggregateAuditStoreData,
   findOneStoreData,
 } from '../service/auditStoreData.service.js';
 
@@ -1012,7 +1012,7 @@ export async function workSpace( req, res ) {
     const userAsignAuditCount = await aggregateAssignAudit( userAsignAudit );
     const completedStoresCount = await aggregateStoreAudit( completedStores );
     const clientAssignedCount = await aggregateAssignAudit( clientAssign );
-    const auditStoreData = await aggregateAuditStoreDataSchema(
+    const auditStoreData = await aggregateAuditStoreData(
         auditStoreDataQuery,
     );
 
@@ -1161,7 +1161,7 @@ export async function saveDraft( req, res ) {
         logType: 'audit',
         logSubType: 'auditDraft',
         logData: {
-          fileDate: insertData.fileDate,
+          fileDate: inputData.fileDate,
           auditType: inputData.auditType,
           storeId: inputData.storeId,
           clientName: inputData.queueName,
@@ -1857,7 +1857,7 @@ export async function clientMetrics( req, res ) {
       );
     }
 
-    const count = await aggregateAuditStoreDataSchema( query );
+    const count = await aggregateAuditStoreData( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -1889,7 +1889,7 @@ export async function clientMetrics( req, res ) {
     }
 
     logger.info( { query: query } );
-    const result = await aggregateAuditStoreDataSchema( query );
+    const result = await aggregateAuditStoreData( query );
     if ( result.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -2644,7 +2644,7 @@ export async function overAllAuditSummary( req, res ) {
         },
       },
     ];
-    const auditClientData = await aggregateAuditStoreDataSchema( auditClientDataQuery );
+    const auditClientData = await aggregateAuditStoreData( auditClientDataQuery );
     if ( auditClientData.length >0 ) {
       temp.auditStores = auditClientData[0].totalFilesCount;
     }
@@ -2875,6 +2875,7 @@ export async function overViewCard( req, res ) {
       ReAuditFileCount: 0,
       inprogressCount: 0,
       completedCount: 0,
+      pendingCount: 0,
     };
 
     const dateRange = await getUTC( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
@@ -2935,6 +2936,7 @@ export async function overViewCard( req, res ) {
           ReAuditFileCount: 1,
           inprogressCount: 1,
           completedCount: 1,
+          notAssigned: { $subtract: [ '$totalCount', { $add: [ '$inprogressCount', '$completedCount' ] } ] },
         },
       },
     ];
@@ -2952,14 +2954,13 @@ export async function summarySplit( req, res ) {
   try {
     const inputData = req.body;
     const temp = {
-      totalInprogress: 0,
+      total: 0,
       auditInprogress: 0,
       reAuditInprogress: 0,
       draft: 0,
       assigned: 0,
       auditCompleted: 0,
       reAuditCompleted: 0,
-      completedCount: 0,
     };
 
     const dateRange = await getUTC( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
@@ -2970,6 +2971,9 @@ export async function summarySplit( req, res ) {
     if ( inputData.clientId.length > 0 ) {
       filters.push( { clientId: { $in: inputData.clientId } } );
     }
+    if ( inputData?.moduleType?.length > 0 ) {
+      filters.push( { moduleType: { $in: inputData.moduleType } } );
+    }
     const query =[
       {
         $match: {
@@ -2999,11 +3003,7 @@ export async function summarySplit( req, res ) {
               { $ne: [ '$status', 'assigned' ] }, 1, 0,
             ],
           },
-          completedCount: {
-            $cond: [
-              { $eq: [ '$status', 'completed' ] }, 1, 0,
-            ],
-          },
+
           reAuditCompleted: {
             $cond: [
               { $and: [ { $eq: [ '$auditType', 'ReAudit' ] }, { $eq: [ '$status', 'completed' ] } ] }, 1, 0,
@@ -3019,15 +3019,12 @@ export async function summarySplit( req, res ) {
       {
         $group: {
           _id: { fileDate: '$fileDate', clientId: '$clientId' },
-          totalInprogress: { $sum: 1 },
           auditInprogress: { $sum: '$auditInprogress' },
           reAuditInprogress: { $sum: '$reAuditInprogress' },
           draft: { $sum: '$draft' },
           assigned: { $sum: 'assigned' },
-          completedCount: { $sum: '$completedCount' },
           reAuditCompleted: { $sum: '$reAuditCompleted' },
           auditCompleted: { $sum: '$auditCompleted' },
-          completedCount: { $sum: '$completedCount' },
 
         },
       },
@@ -3039,14 +3036,36 @@ export async function summarySplit( req, res ) {
           reAuditInprogress: 1,
           draft: 1,
           assigned: 1,
-          completedCount: 1,
           reAuditCompleted: 1,
           auditCompleted: 1,
+          totalCount: { $ifNull: [ 0, 0 ] },
+
+        },
+      },
+    ];
+    const totalQuery = [
+      {
+        $match: {
+          $and: filters,
+        },
 
+      },
+      {
+        $group: {
+          _id: null,
+          total: { $sum: 1 },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          total: 1,
         },
       },
     ];
     const result = await aggregateStoreAudit( query );
+    const totalCount = await aggregateAuditStoreData( totalQuery );
+    result[0].totalCount = totalCount[0]?.total? totalCount[0].total : delete result[0].totalCount;
     logger.info( { result: result } );
     return res.sendSuccess( { result: result.length> 0? result[0]: temp } );
   } catch ( error ) {

package/src/dtos/audit.dtos.js

@@ -296,6 +296,7 @@ export const summarySplitSchema = joi.object(
       fromDate: joi.string().required(),
       toDate: joi.string().required(),
       clientId: joi.array().optional(),
+      moduleType: joi.array().optional(),
     },
 );
 

package/src/routes/audit.routes.js

@@ -28,10 +28,9 @@ auditRouter.post( '/metrics/overview-table', isAllowedSessionHandler, validate(
 auditRouter.post( '/metrics/overall-audit-summary', isAllowedSessionHandler, validate( overAllAuditSummaryValid ), overAllAuditSummary );
 auditRouter.post( '/metrics/re-trigger', isAllowedSessionHandler, validate( reTriggerValid ), isAuditDocumentExist, isAuditInputFolderExist, reTrigger );
 auditRouter.get( '/audit-images', isAllowedSessionHandler, validate( auditImageValid ), isAuditInputFolderExist, auditImages );
-
-
-// hold
+// summary
 auditRouter.post( '/metrics/overview-card', isAllowedSessionHandler, validate( overViewCardValid ), overViewCard );
 auditRouter.post( '/metrics/summary-split-up', isAllowedSessionHandler, validate( summarySplitValid ), summarySplit );
 
+
 export default auditRouter;

package/src/service/auditStoreData.service.js

@@ -1,7 +1,7 @@
 import auditStoreDataModel from 'tango-api-schema/schema/auditStoreData.model.js';
 
 
-export function aggregateAuditStoreDataSchema( query ) {
+export function aggregateAuditStoreData( query ) {
   return auditStoreDataModel.aggregate( query, { collation: { locale: 'en', strength: 2 } } );
 }
 

package/app.js

@@ -1,38 +0,0 @@
-import express from 'express';
-import { auditRouter } from './index.js';
-import dotenv from 'dotenv';
-import { logger } from 'tango-app-api-middleware';
-import { connectdb } from './config/database/database.js';
-import responseMiddleware from './config/response/response.js';
-import errorMiddleware from './config/response/error.js';
-import pkg from 'body-parser';
-import { swaggerConfig } from './config/swagger/swagger.js';
-import swagger from 'swagger-ui-express';
-
-const { json, urlencoded } = pkg;
-const env=dotenv.config();
-
-const app = express();
-const PORT = process.env.PORT || 3000;
-
-
-app.use( json( { limit: '500mb' } ) );
-app.use(
-    urlencoded( {
-      extended: true,
-    } ),
-);
-app.use( responseMiddleware );
-app.use( errorMiddleware );
-if ( env.error ) {
-  logger.error( '.env not found' );
-  process.exit( 1 );
-}
-app.use( '/api-docs', swagger.serve, swagger.setup( swaggerConfig ) );
-app.use( '/v3/audit', auditRouter );
-
-app.listen( PORT, () => {
-  logger.info( `server is running on port= ${PORT} ` );
-  connectdb();
-} );
-