tango-app-api-audit 1.0.47 → 1.0.49

package/src/controllers/auditMetrics.controllers.js

@@ -1,5 +1,4 @@
 import { chunkArray, download, getUTC, insertOpenSearchData, logger, sendMessageToQueue } from 'tango-app-api-middleware';
-import { aggregateAuditClientData } from '../service/auditClientData.service.js';
 import { aggregateUserAudit, updateOneUserAudit } from '../service/userAudit.service.js';
 import mongoose from 'mongoose';
 import { aggregateStoreAudit, updateOneStoreAudit } from '../service/storeAudit.service.js';
@@ -10,7 +9,6 @@ import { countDocumentsStore } from '../service/store.service.js';
 import { findOneClient } from '../service/client.service.js';
 import { getAuditFilterData, getAuditImageData, zipDownloadImage } from '../validation/audit.validation.js';
 import { getReauditImg } from './audit.controllers.js';
-import { aggregateStoreZoneAudit } from '../service/storeZoneAudit.service.js';
 // import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
 
 export async function userAuditHistory( req, res ) {
@@ -663,8 +661,8 @@ export async function clientMetrics( req, res ) {
       },
       );
     }
-
-    const count = await aggregateAuditClientData( query );
+    logger.info( { query: query } );
+    const count = [];// await aggregateAuditClientData( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -694,8 +692,8 @@ export async function clientMetrics( req, res ) {
       );
     }
 
-
-    const result = await aggregateAuditClientData( query );
+    logger.info( { query: query } );
+    const result = [];// await aggregateAuditClientData( query );
     if ( inputData.isExport ) {
       await download( result, res );
       return;
@@ -1339,21 +1337,21 @@ export async function overAllAuditSummary( req, res ) {
     }
     const storeQuery = inputData.clientId.length? { 'edge.firstFile': true, 'clientId': { $in: inputData. clientId } } : { 'edge.firstFile': true };
     temp.installedStores = await countDocumentsStore( storeQuery );
-    const auditClientDataQuery =[
-      {
-        $match: {
-          $and: filters,
-        },
-
-      },
-      {
-        $group: {
-          _id: null,
-          totalFilesCount: { $sum: '$totalFilesCount' },
-        },
-      },
-    ];
-    const auditClientData = await aggregateAuditClientData( auditClientDataQuery );
+    // const auditClientDataQuery =[
+    //   {
+    //     $match: {
+    //       $and: filters,
+    //     },
+
+    //   },
+    //   {
+    //     $group: {
+    //       _id: null,
+    //       totalFilesCount: { $sum: '$totalFilesCount' },
+    //     },
+    //   },
+    // ];
+    const auditClientData = [];// await aggregateAuditClientData( auditClientDataQuery );
     if ( auditClientData.length >0 ) {
       temp.auditStores = auditClientData[0].totalFilesCount;
     }
@@ -1405,7 +1403,7 @@ export async function overAllAuditSummary( req, res ) {
         },
       },
     ];
-    const storeAudit = inputData.moduleType == 'zone'?await aggregateStoreZoneAudit( storeAuditQuery ) : await aggregateStoreAudit( storeAuditQuery );
+    const storeAudit = await aggregateStoreAudit( storeAuditQuery );
     if ( storeAudit.length > 0 ) {
       temp.inprogreseStores= storeAudit[0].inprogreseStores;
       temp.completedStores = storeAudit[0].completedStores;

package/src/controllers/zoneAudit.controller.js

@@ -1,8 +1,6 @@
 import { download, fileUpload, getJsonFileData, getUTC, insertOpenSearchData, listFileByPath, listFileWithoutLimit, sendMessageToQueue, signedUrl, sqsReceive } from 'tango-app-api-middleware';
 import { aggregateZoneUserAudit, createZoneUserAudit, findOneZoneUserAudit, updateOneZoneUserAudit } from '../service/zoneUserAudit.service.js';
 import { logger } from 'tango-app-api-middleware';
-import { aggregateAssignZoneAudit } from '../service/assignZoneAudit.service.js';
-import { aggregateStoreZoneAudit, createStoreZoneAudit, findOneStoreZoneAudit, updateOneStoreZoneAudit } from '../service/storeZoneAudit.service.js';
 import { findOneUser } from '../service/user.service.js';
 import { findOneStore } from '../service/store.service.js';
 import dayjs from 'dayjs';
@@ -11,7 +9,6 @@ import { aggregateAssignAudit, createAssignAudit } from '../service/assignAudit.
 import { createAuditLog, findOneAuditLog } from '../service/auditLog.service.js';
 import { mapCustomer, mapEmployee, mapJunk, splitB20000, splitE0, splitG20000, zipDownloadImage } from '../validation/audit.validation.js';
 import { aggregateClient, findClient, findOneClient } from '../service/client.service.js';
-import { aggregateAuditClientData } from '../service/auditClientData.service.js';
 import _ from 'lodash';
 import mongoose from 'mongoose';
 import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
@@ -73,7 +70,7 @@ export async function getZoneAuditFile( req, res ) {
           },
         ];
 
-        const userAssign = await aggregateAssignZoneAudit( query );
+        const userAssign = await aggregateAssignAudit( query );
         if ( userAssign.length > 0 ) {
           logger.info( 'Hit in user assign', { inputData } );
         } else {
@@ -776,38 +773,38 @@ export async function workSpace( req, res ) {
 
     const clientDetails = await aggregateClient( clientQuery );
     const clientList = clientDetails.map( ( i ) => i.clientId );
-    const query = [
-      {
-        $match: {
-          $and: [
-            {
-              clientId: { $in: clientList },
-            },
-            {
-              moduleType: 'zone',
-            },
-          ],
-
-        },
-      },
-      {
-        $group: {
-          _id: '$clientId',
-          clientId: { $last: '$clientId' },
-          totalFilesCount: { $last: '$totalFilesCount' },
-          clientName: { $last: '$clientName' },
-          queueName: { $last: '$queueName' },
-        },
-      },
-      {
-        $project: {
-          clientId: 1,
-          totalFilesCount: 1,
-          clientName: 1,
-          queueName: 1,
-        },
-      },
-    ];
+    // const query = [
+    //   {
+    //     $match: {
+    //       $and: [
+    //         {
+    //           clientId: { $in: clientList },
+    //         },
+    //         {
+    //           moduleType: 'zone',
+    //         },
+    //       ],
+
+    //     },
+    //   },
+    //   {
+    //     $group: {
+    //       _id: '$clientId',
+    //       clientId: { $last: '$clientId' },
+    //       totalFilesCount: { $last: '$totalFilesCount' },
+    //       clientName: { $last: '$clientName' },
+    //       queueName: { $last: '$queueName' },
+    //     },
+    //   },
+    //   {
+    //     $project: {
+    //       clientId: 1,
+    //       totalFilesCount: 1,
+    //       clientName: 1,
+    //       queueName: 1,
+    //     },
+    //   },
+    // ];
 
     const fileDate = dayjs( dateRange.start ).subtract( 1, 'days' );
 
@@ -977,7 +974,7 @@ export async function workSpace( req, res ) {
       },
     ];
 
-    const auditDetails = await aggregateAuditClientData( query );
+    const auditDetails = [];// await aggregateAuditClientData( query );
     const auditCount = await aggregateUserAudit( auditFiles );
     const draftedCount = await aggregateUserAudit( draftedFiles );
     const CompletedCount = await aggregateStoreZoneAudit( completedFiles );
@@ -1626,8 +1623,8 @@ export async function clientMetrics( req, res ) {
       },
       );
     }
-
-    const count = await aggregateAuditClientData( query );
+    logger.info( { query: query } );
+    const count = [];// await aggregateAuditClientData( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -1657,8 +1654,8 @@ export async function clientMetrics( req, res ) {
       );
     }
 
-
-    const result = await aggregateAuditClientData( query );
+    logger.info( { query: query } );
+    const result = [];// await aggregateAuditClientData( query );
     if ( inputData.isExport ) {
       await download( result, res );
       return;

package/src/docs/audit.docs.js

@@ -1,10 +1,99 @@
-import { getDraftedDataSchema, getFileSchema, saveDraftSchema, saveSchema, workSpaceSchema } from '../dtos/audit.dtos.js';
+import { auditStoreSchema, clientSchema, getDraftedDataSchema, getFileSchema, saveDraftSchema, saveSchema, userSchema, workSpaceSchema } from '../dtos/audit.dtos.js';
 import j2s from 'joi-to-swagger';
 
 export const auditDocs = {
+
+
+  /*           < -- *** Configuration ***   -->      */
+
+  // client
+  '/v3/audit/clients': {
+    get: {
+      tags: [ 'Client' ],
+      description: 'Get client list which is enable for audit',
+      operationId: 'clients',
+      parameters: [
+        {
+          in: 'query',
+          name: 'limit',
+          scema: j2s( clientSchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'offset',
+          scema: j2s( clientSchema ).swagger,
+          require: false,
+        },
+      ],
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+
+  // store
+
+  '/v3/audit/audit-stores': {
+    post: {
+      tags: [ 'Stores' ],
+      description: `sGet list of stores`,
+      operationId: 'audit-stores',
+      parameters: {},
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( auditStoreSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+
+  // user
+  '/v3/audit/tango-users': {
+    get: {
+      tags: [ 'User' ],
+      description: 'Get user list',
+      operationId: 'tango-users',
+      parameters: [
+        {
+          in: 'query',
+          name: 'limit',
+          scema: j2s( userSchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'offset',
+          scema: j2s( userSchema ).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-file': {
     get: {
-      tags: [ 'Audit' ],
+      tags: [ 'Audit Mapping' ],
       description: 'Get a file via queue message',
       operationId: 'get-file',
       parameters: [
@@ -26,6 +115,12 @@ export const auditDocs = {
           scema: j2s( getFileSchema ).swagger,
           require: false,
         },
+        {
+          in: 'query',
+          name: 'moduleType',
+          scema: j2s( getFileSchema ).swagger,
+          require: true,
+        },
       ],
       responses: {
         200: { description: 'Successful' },
@@ -38,7 +133,7 @@ export const auditDocs = {
   },
   '/v3/audit/save-draft': {
     post: {
-      tags: [ 'Audit' ],
+      tags: [ 'Audit Mapping' ],
       description: `save audited file. which is save in the mongo db`,
       operationId: 'save-draft',
       parameters: {},
@@ -60,7 +155,7 @@ export const auditDocs = {
   },
   '/v3/audit/get-drafted-data': {
     get: {
-      tags: [ 'Audit' ],
+      tags: [ 'Audit Mapping' ],
       description: 'Get a saved file via DB',
       operationId: 'get-drafted-data',
       parameters: [
@@ -88,7 +183,7 @@ export const auditDocs = {
   },
   '/v3/audit/save': {
     post: {
-      tags: [ 'Audit' ],
+      tags: [ 'Audit Mapping' ],
       description: `submit the audit file. which is store in the bucket in the json format`,
       operationId: 'save',
       parameters: {},
@@ -110,10 +205,16 @@ export const auditDocs = {
   },
   '/v3/audit/work-space': {
     get: {
-      tags: [ 'Audit' ],
+      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',

package/src/dtos/audit.dtos.js

@@ -1,11 +1,55 @@
 import joi from 'joi';
 
 
+/*           < -- *** Configurations ***   -->      */
+
+// client
+export const clientSchema = joi.object(
+    {
+      limit: joi.number().optional(),
+      offset: joi.number().optional(),
+    },
+);
+
+export const clientValid = {
+  query: clientSchema,
+};
+
+// store
+export const auditStoreSchema = joi.object(
+    {
+      clientId: joi.array().required(),
+      limit: joi.number().optional(),
+      offset: joi.number().optional(),
+    },
+);
+
+export const auditStoreValid = {
+  body: auditStoreSchema,
+};
+
+// user
+export const userSchema = joi.object(
+    {
+
+      limit: joi.number().optional(),
+      offset: joi.number().optional(),
+    },
+);
+
+export const userValid = {
+  query: userSchema,
+};
+
+/*           < -- *** Audit  Mapping ***   -->      */
+
+
 export const getFileSchema = joi.object(
     {
       queueName: joi.string().required(),
       nextId: joi.string().optional().allow( '' ),
       limit: joi.number().optional(),
+      moduleType: joi.string().required(),
     },
 );
 
@@ -18,6 +62,8 @@ export const saveDraftSchema = joi.object(
       userCommands: joi.string().optional().allow( '' ),
       storeId: joi.string().required(),
       auditId: joi.string().required(),
+      moduleType: joi.string().required(),
+      zoneName: joi.string().required(),
       auditType: joi.string().required(),
       fileDate: joi.string().required(),
       queueName: joi.string().required(),
@@ -42,6 +88,8 @@ export const getDraftedDataSchema = joi.object(
       storeId: joi.string().required(),
       fileDate: joi.string().required(),
       userId: joi.string().optional(),
+      moduleType: joi.string().required(),
+      zoneName: joi.string().required(),
     },
 );
 
@@ -55,6 +103,8 @@ export const saveSchema = joi.object(
       storeId: joi.string().required(),
       fileDate: joi.string().required(),
       auditType: joi.string().required(),
+      moduleType: joi.string().required(),
+      zoneName: joi.string().required(),
       beforeCount: joi.number().required(),
       junkCount: joi.number().required(),
       junk: joi.array().required(),
@@ -62,6 +112,8 @@ export const saveSchema = joi.object(
       employee: joi.array().required(),
       customerCount: joi.number().required(),
       customer: joi.array().required(),
+      moduleType: joi.string().required(),
+      zoneName: joi.string().required(),
     },
 );
 
@@ -72,6 +124,7 @@ export const saveValid = {
 export const workSpaceSchema = joi.object(
     {
       searchValue: joi.string().optional().allow( '' ),
+      moduleType: joi.string().required(),
       offset: joi.string().optional(),
       limit: joi.number().optional(),
       isExport: joi.boolean().optional(),

package/src/routes/audit.routes.js

@@ -1,11 +1,18 @@
 import express from 'express';
 import { isExistsQueue, validateUserAudit } from '../validation/audit.validation.js';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { getAuditFile, getDraftedData, save, saveDraft, workSpace } from '../controllers/audit.controllers.js';
-import { getDraftedDataValid, getFileValid, saveDraftValid, saveValid, workSpaceValid } from '../dtos/audit.dtos.js';
+import { auditStoreList, auditUserList, clients, getAuditFile, getDraftedData, save, saveDraft, workSpace } from '../controllers/audit.controllers.js';
+import { auditStoreValid, clientValid, getDraftedDataValid, getFileValid, saveDraftValid, saveValid, workSpaceValid } from '../dtos/audit.dtos.js';
 
 export const auditRouter = express.Router();
 
+// Configuration
+
+auditRouter.get( '/clients', isAllowedSessionHandler, validate( clientValid ), clients );
+auditRouter.post( '/audit-stores', isAllowedSessionHandler, validate( auditStoreValid ), auditStoreList );
+auditRouter.get( '/tango-users', isAllowedSessionHandler, auditUserList );
+
+//  Audit Mapping
 auditRouter.get( '/get-file', isAllowedSessionHandler, validate( getFileValid ), isExistsQueue, getAuditFile );
 auditRouter.post( '/save-draft', isAllowedSessionHandler, validate( saveDraftValid ), saveDraft );
 auditRouter.get( '/get-drafted-data', isAllowedSessionHandler, validate( getDraftedDataValid ), getDraftedData );

package/src/service/auditStoreData.service.js

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

package/src/validation/zoneAudit.validation.js

@@ -1,5 +1,5 @@
 import { checkFileExist, getJsonFileData, listFileWithoutLimit, signedUrl } from 'tango-app-api-middleware';
-import { findOneStoreZoneAudit } from '../service/storeZoneAudit.service.js';
+import { findOneStoreAudit } from '../service/storeAudit.service.js';
 
 export async function isAuditDocumentExist( req, res, next ) {
   try {
@@ -9,7 +9,7 @@ export async function isAuditDocumentExist( req, res, next ) {
       fileDate: inputData.fileDate,
       zoneName: inputData.zoneName,
     };
-    const auditInfo = await findOneStoreZoneAudit( query );
+    const auditInfo = await findOneStoreAudit( query );
     if ( auditInfo ) {
       req.audit = auditInfo;
       return next();

package/src/controllers/client.controllers.js

@@ -1,42 +0,0 @@
-import { logger } from 'tango-app-api-middleware';
-import { aggregateClient } from '../service/client.service.js';
-
-export async function clients( req, res ) {
-  try {
-    const inputData = req.query;
-    const query =[
-      {
-        $match: {
-          'status': { $in: [ 'active', 'hold' ] },
-          'auditConfigs.audit': true,
-        },
-      },
-      {
-        $project: {
-          _id: 0,
-          clientName: 1,
-          clientId: 1,
-        },
-      },
-    ];
-
-    const count = await aggregateClient( query );
-    if ( count.length == 0 ) {
-      return res.sendSuccess( { result: [], count: 0 } );
-    }
-    if ( inputData.limit ) {
-      const offset = inputData.offset ? ( inputData.offset - 1 ) * inputData.limit : 0;
-      query.push(
-          { $skip: offset },
-          { $limit: limit },
-      );
-    }
-    const getAuditClients = await aggregateClient( query );
-
-    return res.sendSuccess( { result: getAuditClients, count: count.length } );
-  } catch ( error ) {
-    const err = error.message || 'Internal Server Error';
-    logger.info( { error: error, messgae: req.query, function: 'clients' } );
-    return res.sendError( err, 500 );
-  }
-}

package/src/controllers/store.controllers.js

@@ -1,42 +0,0 @@
-import { logger } from 'tango-app-api-middleware';
-import { aggregateStore } from '../service/store.service.js';
-
-export async function auditStoreList( req, res ) {
-  try {
-    const inputData = req.body;
-    const query =[
-      {
-        $match: {
-          clientId: { $in: inputData.clientId },
-        },
-      },
-      {
-        $project: {
-          _id: 0,
-          clientId: 1,
-          storeId: 1,
-          storeName: 1,
-        },
-      },
-    ];
-
-    const count = await aggregateStore( query );
-    if ( count.length == 0 ) {
-      return res.sendSuccess( { result: [], count: 0 } );
-    }
-    if ( inputData.limit ) {
-      const offset = inputData.offset ? ( inputData.offset - 1 ) * inputData.limit : 0;
-      query.push(
-          { $skip: offset },
-          { $limit: limit },
-      );
-    }
-    const result = await aggregateStore( query );
-
-    return res.sendSuccess( { result: result, count: count.length } );
-  } catch ( error ) {
-    const err = error.message || 'Internal Server Error';
-    logger.info( { error: error, messgae: req.body, function: 'auditStoreList' } );
-    return res.sendError( err, 500 );
-  }
-}

package/src/controllers/user.controllers.js

@@ -1,41 +0,0 @@
-import { logger } from 'tango-app-api-middleware';
-import { aggregateUser } from '../service/user.service.js';
-
-export async function auditUserList( req, res ) {
-  try {
-    const inputData = req.query;
-    const query =[
-      {
-        $match: {
-          userType: { $eq: 'tango' },
-        },
-      },
-      {
-        $project: {
-          userName: 1,
-          userId: '$_id',
-          _id: 0,
-        },
-      },
-    ];
-
-    const count = await aggregateUser( query );
-    if ( count.length == 0 ) {
-      return res.sendSuccess( { result: [], count: 0 } );
-    }
-    if ( inputData.limit ) {
-      const offset = inputData.offset ? ( inputData.offset - 1 ) * inputData.limit : 0;
-      query.push(
-          { $skip: offset },
-          { $limit: limit },
-      );
-    }
-    const result = await aggregateUser( query );
-
-    return res.sendSuccess( { result: result, count: count.length } );
-  } catch ( error ) {
-    const err = error.message || 'Internal Server Error';
-    logger.info( { error: error, messgae: req.query, function: 'auditUserList' } );
-    return res.sendError( err, 500 );
-  }
-}

package/src/docs/client.docs.js

@@ -1,33 +0,0 @@
-import j2s from 'joi-to-swagger';
-import { clientSchema } from '../dtos/client.dtos.js';
-
-export const clientDocs = {
-  '/v3/audit/client/clients': {
-    get: {
-      tags: [ 'Audit/Client' ],
-      description: 'Get client list which is enable for audit',
-      operationId: 'clients',
-      parameters: [
-        {
-          in: 'query',
-          name: 'limit',
-          scema: j2s( clientSchema ).swagger,
-          require: false,
-        },
-        {
-          in: 'query',
-          name: 'offset',
-          scema: j2s( clientSchema ).swagger,
-          require: false,
-        },
-      ],
-      responses: {
-        200: { description: 'Successful' },
-        401: { description: 'Unauthorized User' },
-        422: { description: 'Field Error' },
-        500: { description: 'Server Error' },
-        204: { description: 'Not Found' },
-      },
-    },
-  },
-};