tango-app-api-audit 3.4.3-alpha.0 → 3.4.3-alpha.1

package/package.json

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

package/src/controllers/traxAudit.controllers.js

@@ -334,13 +334,13 @@ import { findOneAuditLog } from '../service/auditLog.service.js';
 //         const data = await signedUrl( fetchData );
 //         const mapimg = {
 //           img_path: data,
-//           img_name: indexes[1],
-//           img_id: image[0],
+//           img_name: image[0],
+//           img_id: indexes[1],
 //         };
 //         files.push( {
 //           img_path: data,
-//           img_name: indexes[1],
-//           img_id: image[0],
+//          img_name: image[0],
+//           img_id: indexes[1],
 //           selected: false,
 //           dropped: false,
 //           count: 1,
@@ -709,7 +709,7 @@ export async function workSpace( req, res ) {
             { clientId: { $in: clientList } },
             { userId: { $eq: req.user._id } },
             { moduleType: { $eq: inputData.moduleType } },
-            { createdAt: { $gte: dateRange.start } },
+            { createdAt: { $gte: new Date( dayjs( fileDate ).format( 'YYYY-MM-DD' ) ) } },
             { createdAt: { $lte: dateRange.end } },
           ],
         },
@@ -742,6 +742,8 @@ export async function workSpace( req, res ) {
       },
     ];
 
+    logger.info( { moduleType: inputData.moduleType, key: inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] ), dateStart: new Date( dayjs( fileDate ).format( 'YYYY-MM-DD' ) ), end: dateRange.end, user: req.user._id, client: clientList } );
+
     const userAsignAudit = [
       {
         $match: {
@@ -796,6 +798,7 @@ export async function workSpace( req, res ) {
 
     const auditUserCount = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateUserEmpDetection( auditFiles ) : await aggregateBinaryAudit( auditFiles );
     const userIncompleteFilesCount = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateUserEmpDetection( userIncompleteFiles ) : await aggregateBinaryAudit( userIncompleteFiles );
+    logger.info( { moduleType: inputData.moduleType, userIncompleteFiles: userIncompleteFilesCount } );
     const userAsignAuditCount = await aggregateAssignAudit( userAsignAudit );
     const completedStoresCount = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )? await aggregateStoreEmpDetection( completedStores ) : await aggregateBinaryAudit( binarCompletedStores );
     const clientAssignedCount = await aggregateAssignAudit( clientAssign );
@@ -3809,13 +3812,13 @@ export async function getDetectionAuditFile( req, res ) {
         const data = await signedUrl( fetchData );
         const mapimg = {
           img_path: data,
-          img_name: indexes[1],
-          img_id: image[0],
+          img_name: image[0],
+          img_id: indexes[1],
         };
         files.push( {
           img_path: data,
-          img_name: indexes[1],
-          img_id: image[0],
+          img_name: image[0],
+          img_id: indexes[1],
           selected: false,
           dropped: false,
           count: 1,
@@ -4000,7 +4003,7 @@ export async function saveDraft( req, res ) {
       await insertOpenSearchData( openSearch.auditLog, logData );
     }
     await createAuditLog( inputData );
-    await updateOneUserEmp( userQuery, userRecord );
+    await updateOneUserEmpDetection( userQuery, userRecord );
     await updateOneStoreEmp( storeQuery, storeRecord );
     return res.sendSuccess( {
       result: 'The file has been drafted successfully',

package/src/docs/traxAudit.docs.js

@@ -1,5 +1,5 @@
 import j2s from 'joi-to-swagger';
-import { getFileSchema, userAuditHistorySchema, workSpaceSchema, saveSchema, clientMetricsSchema, storeMetricsSchema, userMetricsSchema, pendingSummaryTableSchema, overAllAuditSummarySchema, overviewTableSchema, summarySplitSchema, getUpdatedFileSchema, getDetectionFileValid } from '../dtos/traxAudit.dtos.js';
+import { getFileSchema, userAuditHistorySchema, workSpaceSchema, saveSchema, clientMetricsSchema, storeMetricsSchema, userMetricsSchema, pendingSummaryTableSchema, overAllAuditSummarySchema, overviewTableSchema, summarySplitSchema, getUpdatedFileSchema, getDetectionFileValid, saveBinarySchema, saveDraftSchema, getDraftedDataSchema } from '../dtos/traxAudit.dtos.js';
 
 export const traxAuditDocs = {
 
@@ -124,7 +124,7 @@ export const traxAuditDocs = {
       requestBody: {
         content: {
           'application/json': {
-            schema: j2s( saveSchema ).swagger,
+            schema: j2s( saveBinarySchema ).swagger,
           },
         },
       },
@@ -317,4 +317,90 @@ export const traxAuditDocs = {
       },
     },
   },
+  '/v3/trax-audit/save': {
+    post: {
+      tags: [ 'Trax Audit' ],
+      description: `submit the audit file. which is store in the bucket in the json format`,
+      operationId: 'save',
+      parameters: {},
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( saveSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'The Audited file has been submited successfully ' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+
+  '/v3/trax-audit/save-draft': {
+    post: {
+      tags: [ 'Trax Audit' ],
+      description: `save audited file. which is save in the mongo db`,
+      operationId: 'save-draft',
+      parameters: {},
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( saveDraftSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+
+  '/v3/reax-audit/get-drafted-data': {
+    get: {
+      tags: [ 'Trax Audit' ],
+      description: 'Get a saved file via DB',
+      operationId: 'get-drafted-data',
+      parameters: [
+        {
+          in: 'query',
+          name: 'fileDate',
+          scema: j2s( getDraftedDataSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'storeId',
+          scema: j2s( getDraftedDataSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'moduleType',
+          scema: j2s( getDraftedDataSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'userId',
+          scema: j2s( getDraftedDataSchema ).swagger,
+          require: false,
+        },
+      ],
+      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

@@ -96,8 +96,6 @@ 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(),
 } );
 
 export const saveValid = {

package/src/dtos/traxAudit.dtos.js

@@ -54,8 +54,6 @@ export const saveDraftSchema = joi.object(
       junk: joi.array().optional(),
       employeeCount: joi.number().optional(),
       employee: joi.array().optional(),
-      customerCount: joi.number().optional(),
-      customer: joi.array().optional(),
       retagCount: joi.number().optional(),
       retagImage: joi.array().optional(),
     },
@@ -71,7 +69,6 @@ export const getDraftedDataSchema = joi.object(
       fileDate: joi.string().required(),
       userId: joi.string().optional(),
       moduleType: joi.string().required(),
-      zoneName: joi.string().required(),
     },
 );
 
@@ -79,7 +76,7 @@ export const getDraftedDataValid = {
   query: getDraftedDataSchema,
 };
 
-export const saveSchema = joi.object(
+export const saveBinarySchema = joi.object(
     {
       auditId: joi.string().required(),
       storeId: joi.string().required(),
@@ -93,8 +90,8 @@ export const saveSchema = joi.object(
     },
 );
 
-export const saveValid = {
-  body: saveSchema,
+export const saveBinaryValid = {
+  body: saveBinarySchema,
 };
 
 export const workSpaceSchema = joi.object(
@@ -268,3 +265,20 @@ export const overviewTableSchema = joi.object(
 export const overviewTableValid= {
   body: overviewTableSchema,
 };
+
+export const saveSchema = joi.object( {
+  auditId: joi.string().required(),
+  storeId: joi.string().required(),
+  fileDate: joi.string().required(),
+  auditType: joi.string().required(),
+  moduleType: joi.string().required(),
+  beforeCount: joi.number().required(),
+  junkCount: joi.number().required(),
+  junk: joi.array().required(),
+  employeeCount: joi.number().required(),
+  employee: joi.array().required(),
+} );
+
+export const saveValid = {
+  body: saveSchema,
+};

package/src/routes/traxAudit.routes.js

@@ -1,27 +1,28 @@
 import { Router } from 'express';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { getDetectionFileValid, getFileValid, userAuditHistoryValid, workSpaceValid, saveValid, clientMetricsValid, storeMetricsValid, userMetricsValid, pendingSummaryTableValid, overAllAuditSummaryValid, summarySplitValid, overviewTableValid, getUpdatedFileValid } from '../dtos/traxAudit.dtos.js';
+import { getDetectionFileValid, getFileValid, userAuditHistoryValid, workSpaceValid, saveValid, clientMetricsValid, storeMetricsValid, userMetricsValid, pendingSummaryTableValid, overAllAuditSummaryValid, summarySplitValid, overviewTableValid, getUpdatedFileValid, saveBinaryValid, getDraftedDataValid } from '../dtos/traxAudit.dtos.js';
 import { isExistsQueue } from '../validation/audit.validation.js';
 import { clientMetrics, getAuditFile, getDetectionAuditFile, getUpdatedFile, overAllAuditSummary, overviewTable, pendingSummaryTable, saveBinary, storeMetrics, summarySplit, userAuditHistory, userMetrics, workSpace, saveDraft, getDraftedData, save } from '../controllers/traxAudit.controllers.js';
 import { isTraxAuditDocumentExist, validateBinaryAudit } from '../validation/traxAuditValidation.js';
+import { saveDraftValid } from '../dtos/audit.dtos.js';
 
 export const traxAuditRouter = Router();
 
 // Audit Mapping
 
-// traxAuditRouter.get( '/get-file-detection', isAllowedSessionHandler, validate( getDetectionFileValid ), isExistsQueue, getDetectionAuditFile );
-// traxAuditRouter.post( '/save-draft', isAllowedSessionHandler, validate( saveDraftValid ), saveDraft );
-// traxAuditRouter.get( '/get-drafted-data', isAllowedSessionHandler, validate( getDraftedDataValid ), getDraftedData );
-// traxAuditRouter.post( '/save', isAllowedSessionHandler, validate( saveValid ), validateUserEmpDetection, save );        use this validateuserEMpDetection
-traxAuditRouter.post( '/work-space', isAllowedSessionHandler, validate( workSpaceValid ), workSpace );
+traxAuditRouter.get( '/get-file-detection', isAllowedSessionHandler, validate( getDetectionFileValid ), isExistsQueue, getDetectionAuditFile );
+traxAuditRouter.post( '/save', validate( saveValid ), isAllowedSessionHandler, save );
+traxAuditRouter.post( '/save-draft', validate( saveDraftValid ), isAllowedSessionHandler, saveDraft );
+traxAuditRouter.get( '/get-drafted-data', validate( getDraftedDataValid ), isAllowedSessionHandler, getDraftedData );
 
 
 // Y/n
 traxAuditRouter.get( '/get-file', isAllowedSessionHandler, validate( getFileValid ), isExistsQueue, getAuditFile );
 traxAuditRouter.post( '/get-updated-file', isAllowedSessionHandler, validate( getUpdatedFileValid ), isTraxAuditDocumentExist, getUpdatedFile );
-traxAuditRouter.post( '/save-binary-audit', isAllowedSessionHandler, validate( saveValid ), validateBinaryAudit, saveBinary );
+traxAuditRouter.post( '/save-binary-audit', isAllowedSessionHandler, validate( saveBinaryValid ), validateBinaryAudit, saveBinary );
 
 // metrcis
+traxAuditRouter.post( '/work-space', isAllowedSessionHandler, validate( workSpaceValid ), workSpace );
 traxAuditRouter.post( '/metrics/user-audit-history', isAllowedSessionHandler, validate( userAuditHistoryValid ), userAuditHistory );
 traxAuditRouter.post( '/metrics/client-metrics', isAllowedSessionHandler, validate( clientMetricsValid ), clientMetrics );
 traxAuditRouter.post( '/metrics/store-metrics', isAllowedSessionHandler, validate( storeMetricsValid ), storeMetrics );
@@ -34,10 +35,4 @@ traxAuditRouter.post( '/metrics/overall-audit-summary', isAllowedSessionHandler,
 traxAuditRouter.post( '/metrics/summary-split-up', isAllowedSessionHandler, validate( summarySplitValid ), summarySplit );
 traxAuditRouter.post( '/metrics/overview-table', isAllowedSessionHandler, validate( overviewTableValid ), overviewTable );
 
-
-traxAuditRouter.get( '/get-file-detection', isAllowedSessionHandler, validate( getDetectionFileValid ), isExistsQueue, getDetectionAuditFile );
-traxAuditRouter.post( '/save', isAllowedSessionHandler, save );
-traxAuditRouter.post( '/save-draft', isAllowedSessionHandler, saveDraft );
-traxAuditRouter.get( '/get-drafted-data', isAllowedSessionHandler, getDraftedData );
-
 export default traxAuditRouter;

package/src/service/userEmpDetection.service.js

@@ -1,7 +1,9 @@
 import userEmpDetectionModel from 'tango-api-schema/schema/userEmpDetection.model.js';
+import { logger } from 'tango-app-api-middleware';
 
 
 export function aggregateUserEmpDetection( query ) {
+  logger.info( { seelevt: 'yryruteretwyyyyyyyyyyyyyyyyyyyyyyyyyyyyewe' } );
   return userEmpDetectionModel.aggregate( query, { collation: { locale: 'en', strength: 2 } } );
 }