tango-app-api-infra 3.0.81-dev → 3.0.83-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.81-dev",
+    "version": "3.0.83-dev",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -27,7 +27,7 @@
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
         "tango-api-schema": "^2.0.103",
-        "tango-app-api-middleware": "^1.0.70-test",
+        "tango-app-api-middleware": "^1.0.73-dev",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/infra.controllers.js

@@ -773,7 +773,7 @@ export async function getInfraIssues( req, res ) {
           _id: 0,
           streamName: 1,
           cameraNumber: 1,
-          thumbnailImage: await signedUrl( { Bucket: appConfig.cloud.aws.bucket.baseImage, file_path: '$thumbnailImage' } ),
+          thumbnailImage: '$thumbnailImage',
         },
       },
     ];
@@ -792,7 +792,7 @@ export async function getInfraIssues( req, res ) {
         $group: {
           _id: null,
           total: { $sum: 1 },
-          successRate: { $avg: '$successPercentage' },
+          successRate: { $avg: '$dataMismatch.successPercentage' },
         },
       },
       {
@@ -810,6 +810,11 @@ export async function getInfraIssues( req, res ) {
     const getHighCountTicket = await aggregateTangoTicket( highCountQuery );
     logger.info( { getHighCountTicket: getHighCountTicket } );
     const camera = await aggregateCamera( camQuery );
+    for ( let index = 0; index < camera.length; index++ ) {
+      if ( camera?.[index]?.thumbnailImage ) {
+        camera[index].thumbnailImage = await signedUrl( { Bucket: appConfig.cloud.aws.bucket.baseImage, file_path: camera[index].thumbnailImage } );
+      }
+    }
     logger.info( { message: camera } );
     return res.sendSuccess( { result: mergeValue, streams: camera, highCountTicketDetails: getHighCountTicket[0] || defaultValue } );
   } catch ( error ) {

package/src/controllers/userInfra.controller.js

@@ -534,14 +534,15 @@ export async function workHistory( req, res ) {
           'CLOSED ON': element.issueClosedDate,
           'STATUS': element.status,
         };
+        if ( req.body.issueType==='infra'||req.body.issueType==='installation' ) {
+          data = { ...data, ...{ 'ISSUE': element.infraIssue?element.infraIssue:'-', 'ISSUE IDENTIFIED DATE': element.issueIdentifiedDate } };
+        }
+        if ( req.body.issueType==='dataMismatch' ) {
+          data = { ...data, ...{ 'issueType': element.issueType?element.issueType:'-' } };
+        }
         exportdata.push( data );
       } );
-      if ( req.body.issueType==='infra'||req.body.issueType==='installation' ) {
-        data = { ...data, ...{ 'ISSUE': element.infraIssue?element.infraIssue:'-', 'ISSUE IDENTIFIED DATE': element.issueIdentifiedDate } };
-      }
-      if ( req.body.issueType==='dataMismatch' ) {
-        data = { ...data, ...{ 'issueType': element.issueType?element.issueType:'-' } };
-      }
+
       await download( exportdata, res );
       return;
     }