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

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -9,6 +9,7 @@ import {
   signedUrl,
   getDate, getDateWithCustomizeTime,
   getUTC,
+  getOpenSearchData,
 } from 'tango-app-api-middleware';
 import {
   aggregateUserAudit,
@@ -3567,6 +3568,43 @@ export async function totalNotAssignedCount( req, res ) {
         },
       },
     ];
+
+    const mappingInprogressCount = [
+      {
+        $match: {
+          fileDate: { $eq: latestTraxDate },
+        },
+      },
+      {
+        $project: {
+          inprogressAuditCount: {
+            $cond: [
+              { $in: [ '$status', [ 'completed', 'not_assign', 'skipped' ] ] }, 1, 0,
+            ],
+          },
+          inprogressTraxCount: {
+            $cond: [
+              { $and: [ { $in: [ '$status', [ 'completed', 'not_assign', 'skipped' ] ] } ] }, 1, 0,
+            ],
+          },
+
+        },
+      },
+      {
+        $group: {
+          _id: null,
+          inprogressAuditCount: { $sum: '$inprogressAuditCount' },
+          inprogressTraxCount: { $sum: '$inprogressTraxCount' },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          inprogressAuditCount: { $ifNull: [ '$inprogressAuditCount', 0 ] },
+          inprogressTraxCount: { $ifNull: [ '$inprogressTraxCount', 0 ] },
+        },
+      },
+    ];
     // const binaryInprogressCount=[
     //   {
     //     $match: {
@@ -3651,6 +3689,8 @@ export async function totalNotAssignedCount( req, res ) {
     const getTotalTraxAudit = await aggregateTraxAuditData( traxQuery );
     const getInprogressCount = await aggregateStoreAudit( inprogressCount );
     const getBinaryInprogressCount = await aggregateBinaryAudit( binaryInprogressCount );
+    const getMappingInprogressCount = await aggregateStoreEmpDetection( mappingInprogressCount );
+    logger.info( { getMappingInprogressCount: getMappingInprogressCount } );
     // const getMappingInprogressCount = await aggregateStoreEmpDetection( mappingInprogressCount );
     if ( getTotalcount.length == 0 && getTotalTraxAudit.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
@@ -3671,6 +3711,12 @@ export async function totalNotAssignedCount( req, res ) {
     } else {
       notAssignedCount.totalTraxAuditCount = getTotalTraxAudit[0]?.totalTraxAuditCount;
     }
+
+    if ( getMappingInprogressCount.length > 0 ) {
+      notAssignedCount.totalTraxAuditCount = getTotalTraxAudit[0].totalTraxAuditCount > getMappingInprogressCount[0].inprogressTraxCount ? getTotalTraxAudit[0].totalTraxAuditCount - getMappingInprogressCount[0].inprogressTraxCount : 0;
+    } else {
+      notAssignedCount.totalTraxAuditCount = getTotalTraxAudit[0]?.totalTraxAuditCount;
+    }
     return res.sendSuccess( { result: notAssignedCount } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
@@ -4302,3 +4348,39 @@ export async function getUserAuditCountMTD( req, res ) {
   }
 }
 
+export async function auditViewLogs( req, res ) {
+  try {
+    const inputData = req.query;
+    const parsedOpenSearch = JSON.parse( process.env.OPENSEARCH );
+    let downTimeQuery = {
+      'size': 100,
+      'query': {
+        'bool': {
+          'must': [
+            {
+              'term': {
+                'doc.logData.fileDate.keyword': dayjs( inputData.fileDate ).format( 'DD-MM-YYYY' ),
+              },
+            },
+            {
+              'term': {
+                'doc.logData.storeId.keyword': inputData.storeId,
+              },
+            },
+            {
+              'term': {
+                'doc.logData.moduleType.keyword': inputData.moduleType,
+              },
+            },
+          ],
+
+        },
+      },
+    };
+    const downtime = await getOpenSearchData( parsedOpenSearch.auditLog, downTimeQuery );
+    return res.sendSuccess( downtime );
+  } catch ( err ) {
+
+  }
+}
+

package/src/controllers/traxAudit.controllers.js

@@ -4,16 +4,19 @@ import { countDocumentsStore, findOneStore } from '../service/store.service.js';
 import { findOneUser } from '../service/user.service.js';
 import { aggregateUserEmpDetection, createUserEmpDetection, updateOneUserEmpDetection } from '../service/userEmpDetection.service.js';
 import { aggregateTraxAuditData, findOneTraxAuditData } from '../service/traxAuditData.service.js';
-import { aggregateClient } from '../service/client.service.js';
+import { aggregateClient, findOneClient } from '../service/client.service.js';
 import dayjs from 'dayjs';
 import { aggregateAssignAudit } from '../service/assignAudit.service.js';
-import { aggregateStoreEmpDetection, updateManyStoreEmpDetection } from '../service/storeEmpDetection.service.js';
-import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
+import { aggregateStoreEmpDetection, updateManyStoreEmpDetection, updateOneStoreEmpDetection } from '../service/storeEmpDetection.service.js';
+import { listQueue, sendMessageToQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
 import _ from 'lodash';
 import mongoose from 'mongoose';
-import { findOneAuditLog } from '../service/auditLog.service.js';
-
-
+import { findOneAuditLog, createAuditLog,
+} from '../service/auditLog.service.js';
+import {
+  findOneUserEmpDetection,
+} from '../service/userEmpDetection.service.js';
+import { updateOneEmpDetectionOutput } from '../service/empDetectionOutput.service.js';
 // export async function getDetectionAuditFile( req, res ) {
 //   try {
 //     const bucket = JSON.parse( process.env.BUCKET );
@@ -334,13 +337,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: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}` :image[0],
+//           img_id: img[3],
 //         };
 //         files.push( {
 //           img_path: data,
-//           img_name: indexes[1],
-//           img_id: image[0],
+//          img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}` :image[0],
+//           img_id: img[3],
 //           selected: false,
 //           dropped: false,
 //           count: 1,
@@ -709,7 +712,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 +745,8 @@ export async function workSpace( req, res ) {
       },
     ];
 
+    logger.info( { moduleType: inputData.moduleType, key: [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType ), dateStart: new Date( dayjs( fileDate ).format( 'YYYY-MM-DD' ) ), end: dateRange.end, user: req.user._id, client: clientList } );
+
     const userAsignAudit = [
       {
         $match: {
@@ -794,10 +799,11 @@ 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 );
+    const auditUserCount = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( auditFiles ) : await aggregateBinaryAudit( auditFiles );
+    const userIncompleteFilesCount = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?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 completedStoresCount = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( completedStores ) : await aggregateBinaryAudit( binarCompletedStores );
     const clientAssignedCount = await aggregateAssignAudit( clientAssign );
     const auditStoreData = await aggregateTraxAuditData(
         auditStoreDataQuery,
@@ -1694,7 +1700,7 @@ export async function userAuditHistory( req, res ) {
       },
       );
     }
-    const count = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -1764,7 +1770,7 @@ export async function userAuditHistory( req, res ) {
     {
       $limit: limit,
     } );
-    const result = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
 
     return res.sendSuccess( { result: result, count: count.length } );
   } catch ( error ) {
@@ -1916,6 +1922,125 @@ export async function clientMetrics( req, res ) {
       },
     ];
 
+    const MappingQuery =[
+      {
+        $match: {
+          $and: filter,
+        },
+      },
+      {
+        $group: {
+          _id: { clientId: '$clientId', fileDate: '$fileDate', moduleType: '$moduleType' },
+          fileDate: { $last: '$fileDate' },
+          clientId: { $last: '$clientId' },
+          clientName: { $last: '$clientName' },
+          moduleType: { $last: '$moduleType' },
+          installedStore: { $last: '$installedStore' },
+          queueName: { $last: '$queueName' },
+          totalFilesCount: { $sum: 1 },
+        },
+      },
+      {
+        $project: {
+          fileDate: 1,
+          clientId: 1,
+          clientName: 1,
+          queueName: 1,
+          installedStore: 1,
+          totalFilesCount: 1,
+          moduleType: 1,
+          notAssignedCount: { $ifNull: [ 0, 0 ] },
+          clientStatus: { $ifNull: [ '', '' ] },
+        },
+      },
+      {
+        $lookup: {
+          'from': 'storeEmpDetection',
+          'let': { clientId: '$clientId', fileDate: '$fileDate', totalAuditFiles: '$totalFilesCount' },
+          'pipeline': [
+
+            {
+              $match: {
+                $expr: {
+                  $and: storeAuditFilter,
+                },
+              },
+            },
+            {
+              $project: {
+                completedStores: { $cond: [ { $eq: [ '$status', 'completed' ] }, 1, 0 ] },
+                notAssignedStores: { $cond: [ { $eq: [ '$status', 'not_assign' ] }, 1, 0 ] },
+                inprogressStores: { $cond: [ { $in: [ '$status', [ 'inprogress', 'drafted', 'assigned' ] ] }, 1, 0 ] },
+              },
+            },
+            {
+              $group: {
+                _id: { clientId: '$clientId', fileDate: '$fileDate' },
+                completedStores: { $sum: '$completedStores' },
+                inprogressStores: { $sum: '$inprogressStores' },
+                notAssignedStores: { $sum: '$notAssignedStores' },
+                fileCount: { $sum: 1 },
+              },
+            },
+            {
+              $project: {
+                _id: 0,
+                completedStores: 1,
+                inprogressStores: 1,
+                notAssignedStores: 1,
+                fileCount: { $ifNull: [ '$fileCount', 0 ] },
+                completionPercentage: { $ifNull: [
+                  {
+                    $round: [ {
+                      $multiply: [
+                        100, {
+                          $divide: [
+                            '$completedStores', '$$totalAuditFiles',
+                          ],
+                        },
+                      ],
+                    }, 1 ],
+
+                  },
+                  0,
+                ],
+                },
+              },
+            },
+          ], 'as': 'binaryAudit',
+        },
+      },
+      {
+        $unwind: {
+          path: '$binaryAudit',
+          preserveNullAndEmptyArrays: true,
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          fileDate: 1,
+          clientId: 1,
+          clientName: 1,
+          totalFilesCount: 1,
+          moduleType: 1,
+          value: {
+            $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' }, // Replacing "-" with " "
+          },
+          installedStore: 1,
+          // notAssignedStores: '$binaryAudit.notAssignedStores',
+          inprogressStoresCount: '$binaryAudit.inprogressStores',
+          // fileCount: '$binaryAudit.fileCount',
+          notAssignedCount: { $subtract: [ '$totalFilesCount', { $subtract: [ { $ifNull: [ '$binaryAudit.fileCount', 0 ] }, { $ifNull: [ '$binaryAudit.notAssignedStores', 0 ] } ] } ] },
+          clientStatus: { $cond: [ { $eq: [ { $ifNull: [ '$binaryAudit.fileCount', 0 ] }, 0 ] }, 'not-taken', { $cond: [ { $gte: [ '$binaryAudit.completedStores', '$totalFilesCount' ] }, 'completed', 'pending' ] } ] }, // { $cond: [ { $or: [ { $gt: [ '$notAssignedCount', 0 ] }, { $gt: [ '$binaryAudit.notAssignedStores', 0 ] } ] }
+          completedStores: '$binaryAudit.completedStores',
+          completionPercentage: '$binaryAudit.completionPercentage',
+
+        },
+      },
+    ];
+
+
     if ( inputData?.filterByStatus?.length> 0 ) {
       query.push(
           {
@@ -1947,7 +2072,7 @@ export async function clientMetrics( req, res ) {
       );
     }
 
-    const count = await aggregateTraxAuditData( query );
+    const count = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateTraxAuditData( MappingQuery ) : await aggregateTraxAuditData( query );
     logger.info( { count: count } );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
@@ -1980,7 +2105,7 @@ export async function clientMetrics( req, res ) {
     }
 
     logger.info( { query: query } );
-    const result = await aggregateTraxAuditData( query );
+    const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateTraxAuditData( MappingQuery ) : await aggregateTraxAuditData( query );
     if ( result.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -2423,7 +2548,9 @@ export async function storeMetrics( req, res ) {
       },
       );
     }
-    const count = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
+    logger.info( { keyss: [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType ) } );
+    const count = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
+
 
     if ( count.length == 0 ) {
       return res.sendError( 'No data Found', 204 );
@@ -2438,7 +2565,7 @@ export async function storeMetrics( req, res ) {
     } else {
       query.push( { $limit: 10000 } );
     }
-    const result = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
@@ -2741,7 +2868,7 @@ export async function userMetrics( req, res ) {
       );
     }
 
-    const count = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -2775,7 +2902,7 @@ export async function userMetrics( req, res ) {
         'Product Type': '$value',
         // 'Mapping Percentage': '$mappingPerc',
       };
-      inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?
+      [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?
       query.push(
           {
             $project: detection,
@@ -2789,7 +2916,7 @@ export async function userMetrics( req, res ) {
     }
 
 
-    const result = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( inputData.isExport ) {
       await download( result, res );
       return;
@@ -2933,7 +3060,7 @@ export async function pendingSummaryTable( req, res ) {
       },
       );
     }
-    const count = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -2949,7 +3076,7 @@ export async function pendingSummaryTable( req, res ) {
       } );
     }
 
-    const result = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
@@ -3143,7 +3270,7 @@ export async function overAllAuditSummary( req, res ) {
       },
     ];
 
-    const storeAudit = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateStoreEmpDetection( storeAuditQuery ) : await aggregateBinaryAudit( binaryAuditQuery );
+    const storeAudit = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( storeAuditQuery ) : await aggregateBinaryAudit( binaryAuditQuery );
     if ( storeAudit.length > 0 ) {
       temp.inprogressStores= storeAudit[0].inprogressStores;
       temp.completedStores = storeAudit[0].completedStores;
@@ -3274,7 +3401,7 @@ export async function summarySplit( req, res ) {
         },
       },
     ];
-    const result = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
     const totalCount = await aggregateTraxAuditData( totalQuery );
     result[0].totalCount = totalCount[0]?.total;
     return res.sendSuccess( { result: result.length> 0? result[0]: temp } );
@@ -3421,7 +3548,7 @@ export async function overviewTable( req, res ) {
       },
       );
     }
-    const count = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -3436,7 +3563,7 @@ export async function overviewTable( req, res ) {
         $limit: limit,
       } );
     }
-    const result = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
@@ -3809,13 +3936,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: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}` :image[0],
+          img_id: img[3],
         };
         files.push( {
           img_path: data,
-          img_name: indexes[1],
-          img_id: image[0],
+          img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}` :image[0],
+          img_id: img[3],
           selected: false,
           dropped: false,
           count: 1,
@@ -3834,7 +3961,7 @@ export async function getDetectionAuditFile( req, res ) {
           userId: req.user._id,
           storeId: msg.storeId,
           clientId: msg.storeId.split( '-' )[0],
-          auditType: 'Audit',
+          auditType: msg.auditType || 'Audit',
           fileDate: msg.fileDate,
           inputBucketName: msg.inputBucketName,
           folderPath: msg.folderPath,
@@ -3855,7 +3982,7 @@ export async function getDetectionAuditFile( req, res ) {
           userId: req.user._id,
           storeId: msg.storeId,
           clientId: msg.storeId.split( '-' )[0],
-          auditType: 'Audit',
+          auditType: msg.auditType || 'Audit',
           fileDate: msg.fileDate,
           folderPath: msg.folderPath,
           inputBucketName: msg.inputBucketName,
@@ -3918,7 +4045,7 @@ export async function getDetectionAuditFile( req, res ) {
         queueName: inputData.queueName,
         storeId: storeId,
         fileDate: fileDate,
-        auditType: 'Audit',
+        auditType: msg.auditType || 'Audit',
         auditId: insertData._id,
         userId: insertData.userId,
         moduleType: inputData.moduleType,
@@ -3942,7 +4069,7 @@ export async function saveDraft( req, res ) {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.body;
     inputData.userId = req.user._id;
-    const getUserAuditData = await findOneUserAudit( { _id: inputData.auditId } );
+    const getUserAuditData = await findOneUserEmpDetection( { _id: inputData.auditId } );
     if ( !getUserAuditData ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -3960,7 +4087,6 @@ export async function saveDraft( req, res ) {
     const storeQuery = {
       storeId: inputData.storeId,
       fileDate: inputData.fileDate,
-      zoneName: inputData.zoneName,
     };
 
     let storeRecord = {
@@ -4000,8 +4126,8 @@ export async function saveDraft( req, res ) {
       await insertOpenSearchData( openSearch.auditLog, logData );
     }
     await createAuditLog( inputData );
-    await updateOneUserEmp( userQuery, userRecord );
-    await updateOneStoreEmp( storeQuery, storeRecord );
+    await updateOneUserEmpDetection( userQuery, userRecord );
+    await updateOneStoreEmpDetection( storeQuery, storeRecord );
     return res.sendSuccess( {
       result: 'The file has been drafted successfully',
     } );
@@ -4045,8 +4171,13 @@ export async function getDraftedData( req, res ) {
 export async function save( req, res ) {
   try {
     const inputData = req.body;
-    const data = await createEmpDetection( inputData );
+    const getUserAuditData = await findOneUserEmpDetection( { _id: inputData.auditId } );
+    inputData.clientId = getUserAuditData.clientId;
+    const query ={ storeId: inputData.storeId, moduleType: inputData.moduleType, fileDate: inputData.fileDate };
+    const data = await updateOneEmpDetectionOutput( query, { $set: inputData }, { upsert: true } );
     if ( data ) {
+      await updateOneUserEmpDetection( { _id: inputData.auditId }, { auditStatus: 'completed', afterCount: inputData.employeeCount } );
+      await updateOneStoreEmpDetection( query, { status: 'completed', afterCount: inputData.employeeCount } );
       return res.sendSuccess( { result: 'Updated Successfully' } );
     } else {
       return res.sendError( 'something went wrong', 403 );
@@ -4061,3 +4192,89 @@ export async function save( req, res ) {
     return res.sendError( err, 500 );
   }
 }
+
+export async function reTrigger( req, res ) {
+  try {
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
+    const inputData = req.body;
+    const message = req.sqs;
+    const sqs = JSON.parse( process.env.SQS );
+    const getQueueName = await findOneClient( { clientId: req.audit.clientId }, { 'auditConfigs': 1 } );
+    const queueName = inputData.moduleType == 'uniform-detection' ? getQueueName?.auditConfigs?.traxQueueName?.uniformDetection : getQueueName?.auditConfigs?.traxQueueName?.mobileDetection;
+    if ( !getQueueName || queueName == '' ) {
+      return res.sendError( 'queueName does not create', 400 );
+    }
+    const msg = {
+      storeId: message.storeId,
+      fileDate: message.fileDate,
+      moduleType: message.moduleType,
+      inputBucketName: message.inputBucketName,
+      questionType: message.questionType,
+      question: message.question,
+      folderPath: message.folderPath,
+      fileCount: message.fileCount,
+    };
+    const sqsProduceQueue = {
+      QueueUrl: `${sqs.url}${queueName}`,
+      MessageBody: JSON.stringify( msg ),
+    };
+    const sqsQueue = await sendMessageToQueue( sqsProduceQueue.QueueUrl, sqsProduceQueue.MessageBody );
+    if ( sqsQueue?.errorCode ) {
+      const error = sqsQueue?.errorMsg;
+      const code = sqsQueue?.errorCode;
+      return res.sendError( error, code );
+    } else {
+      if ( req.audit.status !== 'completed' ) {
+        const userRecord = {
+          auditStatus: 'skipped',
+          isDraft: false,
+        };
+        const query = {
+          storeId: inputData.storeId,
+          fileDate: inputData.fileDate,
+          auditStatus: req.audit.status,
+          moduleType: inputData.moduleType,
+
+        };
+        await updateOneUserEmpDetection( query, userRecord );
+      }
+
+      const storeQuery = {
+        storeId: inputData.storeId,
+        fileDate: inputData.fileDate,
+        moduleType: inputData.moduleType,
+
+      };
+
+      const storeRecord = {
+        status: 'not_assign',
+      };
+
+      await updateOneStoreEmpDetection( storeQuery, storeRecord );
+      const logData = {
+        userId: req.user._id,
+        userName: req.user.userName,
+        logType: 'traxAudit',
+        logSubType: 'reTrigger',
+        logData: {
+          beforeCount: message.fileCount,
+          afterCount: '',
+          fileDate: inputData.fileDate,
+          auditType: req.audit.auditType,
+          storeId: inputData.storeId,
+          moduleType: inputData.moduleType,
+          queueName: queueName,
+          triggerBy: req.user.userName,
+          triggerId: req.user._id,
+        },
+        createdAt: new Date(),
+      };
+      await insertOpenSearchData( openSearch.auditLog, logData );
+    }
+    return res.sendSuccess( { result: 'The File has been Re-Triggered Succesfully' } );
+  } catch ( error ) {
+    const err = error.message;
+    logger.error( { error: error, message: req.body, function: 'reTrigger' } );
+    return res.sendError( err, 500 );
+  }
+}

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, reTriggerValidSchema } 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,112 @@ 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/trax-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' },
+      },
+    },
+  },
+  '/v3/trax-audit/metrics/re-trigger': {
+    post: {
+      tags: [ 'Trax Audit' ],
+      description: `Manual re trigger a file`,
+      operationId: 'metrics/re-trigger',
+      parameters: {},
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( reTriggerValidSchema ).swagger,
+          },
+        },
+      },
+      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

@@ -45,7 +45,6 @@ export const saveDraftSchema = joi.object(
       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(),
@@ -54,8 +53,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 +68,6 @@ export const getDraftedDataSchema = joi.object(
       fileDate: joi.string().required(),
       userId: joi.string().optional(),
       moduleType: joi.string().required(),
-      zoneName: joi.string().required(),
     },
 );
 
@@ -79,7 +75,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 +89,8 @@ export const saveSchema = joi.object(
     },
 );
 
-export const saveValid = {
-  body: saveSchema,
+export const saveBinaryValid = {
+  body: saveBinarySchema,
 };
 
 export const workSpaceSchema = joi.object(
@@ -268,3 +264,30 @@ 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(),
+  employeeCount: joi.number().required(),
+  employee: joi.array().required(),
+} );
+
+export const saveValid = {
+  body: saveSchema,
+};
+
+
+export const reTriggerValidSchema = joi.object( {
+  fileDate: joi.string().required(),
+  storeId: joi.string().required(),
+  moduleType: joi.string().required(),
+
+} );
+
+export const reTriggerValid = {
+  body: reTriggerValidSchema,
+};

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, totalNotAssignedCount, userAuditHistory, userMetrics, workSpace, getUserAuditCount, getUserAuditCountMTD } 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, getUserAuditCount, getUserAuditCountMTD, auditViewLogs } 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();
@@ -39,4 +39,7 @@ auditRouter.get( '/total-not-assigned-count', isAllowedSessionHandler, totalNotA
 // audit user wallet
 auditRouter.get( '/get-user-audit-count', isAllowedSessionHandler, getUserAuditCount );
 auditRouter.get( '/get-user-audit-count-mtd', isAllowedSessionHandler, getUserAuditCountMTD );
+
+// audit log
+auditRouter.get( '/audit-view-logs', isAllowedSessionHandler, auditViewLogs );
 export default auditRouter;

package/src/routes/traxAudit.routes.js

@@ -1,43 +1,38 @@
 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, saveDraftValid, reTriggerValidSchema } 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 { clientMetrics, getAuditFile, getDetectionAuditFile, getUpdatedFile, overAllAuditSummary, overviewTable, pendingSummaryTable, saveBinary, storeMetrics, summarySplit, userAuditHistory, userMetrics, workSpace, saveDraft, getDraftedData, save, reTrigger } from '../controllers/traxAudit.controllers.js';
+import { isMappingAuditInputFolderExist, isTraxAuditDocumentExist, isuserEmpDocumentExist, validateBinaryAudit } from '../validation/traxAuditValidation.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 );
 traxAuditRouter.post( '/metrics/user-metrics', isAllowedSessionHandler, validate( userMetricsValid ), userMetrics );
 traxAuditRouter.post( '/metrics/pending-summary-table', isAllowedSessionHandler, validate( pendingSummaryTableValid ), pendingSummaryTable );
 traxAuditRouter.post( '/metrics/overall-audit-summary', isAllowedSessionHandler, validate( overAllAuditSummaryValid ), overAllAuditSummary );
+traxAuditRouter.post( '/metrics/re-trigger', isAllowedSessionHandler, validate( reTriggerValidSchema ), isuserEmpDocumentExist, isMappingAuditInputFolderExist, reTrigger );
 
 // summary
 
 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/auditUserWallet.service.js

@@ -1,5 +1,5 @@
 import auditUserWalletModel from 'tango-api-schema/schema/auditUserWallet.model.js';
-
+import empDetectionOutputModel from 'tango-api-schema/schema/empDetectionOutput.model.js';
 
 export function createAuditUserWallet( record ) {
   return auditUserWalletModel.create( record );
@@ -8,3 +8,6 @@ export function createAuditUserWallet( record ) {
 export function updateManyAuditUserWallet( query, record ) {
   return auditUserWalletModel.updateMany( query, record, { upsert: true } );
 };
+export function createempDetectionOutput( query, field, option ) {
+  return empDetectionOutputModel.updateOne( query, field, option );
+};

package/src/service/empDetectionOutput.service.js

@@ -1,5 +1,5 @@
 
 import empDetectionOutputModel from 'tango-api-schema/schema/empDetectionOutput.model.js';
-export function createAuditLog( record ) {
-  return empDetectionOutputModel.create( record );
+export function updateOneEmpDetectionOutput( query, record, upsert ) {
+  return empDetectionOutputModel.updateOne( query, record, upsert );
 }

package/src/service/storeEmpDetection.service.js

@@ -5,9 +5,14 @@ export function aggregateStoreEmpDetection( query ) {
   return storeEmpDetectionModel.aggregate( query, { collation: { locale: 'en', strength: 2 } } );
 }
 
+export function findOneStoreEmpDetection( query ) {
+  return storeEmpDetectionModel.findOne( query );
+}
+
 export function updateOneStoreEmpDetection( query, record ) {
   return storeEmpDetectionModel.updateOne( query, { $set: record } );
 }
+
 export function updateManyStoreEmpDetection( query, record ) {
   return storeEmpDetectionModel.updateMany( query, { $set: record }, { upsert: true } );
 }

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 } } );
 }
 

package/src/validation/traxAuditValidation.js

@@ -1,7 +1,8 @@
-import { logger } from 'tango-app-api-middleware';
+import { checkFileExist, logger } from 'tango-app-api-middleware';
 import { findOneBinaryAudit, updateOneBinaryAuditModel } from '../service/binaryAudit.service.js';
 import { findOneUserEmpDetection } from '../service/userEmpDetection.service.js';
 import { findOneTraxAuditData } from '../service/traxAuditData.service.js';
+import { findOneStoreEmpDetection } from '../service/storeEmpDetection.service.js';
 
 export async function validateUserEmpDetection( req, res, next ) {
   try {
@@ -116,3 +117,48 @@ export async function isTraxAuditDocumentExist( req, res, next ) {
     return res.sendError( err, 500 );
   }
 }
+
+export async function isuserEmpDocumentExist( req, res, next ) {
+  try {
+    const inputData = req.body;
+    const query={
+      storeId: inputData.storeId,
+      fileDate: inputData.fileDate,
+      moduleType: inputData.moduleType,
+    };
+    const auditInfo = await findOneStoreEmpDetection( query );
+    if ( auditInfo ) {
+      const sqs = await findOneTraxAuditData( query, { sqs: 1 } );
+      req.sqs = sqs.sqs.Body;
+      req.audit = auditInfo;
+      return next();
+    } else {
+      return res.sendError( 'No audited Record', 400 );
+    }
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, message: req.body, function: 'isAuditFileExist' } );
+    return res.sendError( err, 500 );
+  }
+}
+
+
+export async function isMappingAuditInputFolderExist( req, res, next ) {
+  try {
+    // const inputData = req.method === 'POST' ? req.body : req.query;
+    const params={
+      Bucket: req.sqs.inputBucketName,
+      Key: req.sqs.folderPath.replace( /\/$/, '' ),
+    };
+    const isExist = await checkFileExist( params );
+    if ( isExist ) {
+      next();
+    } else {
+      return res.sendError( `Audit Input folder not available : ${req.sqs.folderPath}`, 400 );
+    }
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, message: req.query, function: 'isAuidtInputFolderExist' } );
+    return res.sendError( err, 500 );
+  }
+}