tango-app-api-infra 3.3.3-beta.0 → 3.3.3-beta.10

package/README.md

@@ -1,29 +1,29 @@
-# README #
-
-This README would normally document whatever steps are necessary to get your application up and running.
-
-### What is this repository for? ###
-
-* Quick summary
-* Version
-* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
-
-### How do I get set up? ###
-
-* Summary of set up
-* Configuration
-* Dependencies
-* Database configuration
-* How to run tests
-* Deployment instructions
-
-### Contribution guidelines ###
-
-* Writing tests
-* Code review
-* Other guidelines
-
-### Who do I talk to? ###
-
-* Repo owner or admin
+# README #
+
+This README would normally document whatever steps are necessary to get your application up and running.
+
+### What is this repository for? ###
+
+* Quick summary
+* Version
+* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
+
+### How do I get set up? ###
+
+* Summary of set up
+* Configuration
+* Dependencies
+* Database configuration
+* How to run tests
+* Deployment instructions
+
+### Contribution guidelines ###
+
+* Writing tests
+* Code review
+* Other guidelines
+
+### Who do I talk to? ###
+
+* Repo owner or admin
 * Other community or team contact

package/package.json

@@ -1,43 +1,43 @@
-{
-    "name": "tango-app-api-infra",
-    "version": "3.3.3-beta.0",
-    "description": "infra",
-    "main": "index.js",
-    "type": "module",
-    "scripts": {
-        "start": "nodemon --exec \"eslint --fix . && node index.js\""
-    },
-    "engines": {
-        "node": ">=18.10.0"
-    },
-    "author": "praveenraj",
-    "license": "ISC",
-    "dependencies": {
-        "aws-sdk": "^2.1571.0",
-        "cors": "^2.8.5",
-        "dayjs": "^1.11.13",
-        "dayjs-plugin-utc": "^0.1.2",
-        "dotenv": "^16.4.5",
-        "excel4node": "^1.8.2",
-        "express": "^4.18.3",
-        "express-fileupload": "^1.5.0",
-        "handlebars": "^4.7.8",
-        "html-pdf-node": "^1.0.8",
-        "joi-to-swagger": "^6.2.0",
-        "mongodb": "^6.4.0",
-        "nodemon": "^3.1.0",
-        "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.2.29",
-        "tango-app-api-middleware": "^3.1.50",
-        "winston": "^3.12.0",
-        "winston-daily-rotate-file": "^5.0.0"
-    },
-    "devDependencies": {
-        "eslint": "^8.57.0",
-        "eslint-config-google": "^0.14.0",
-        "eslint-config-semistandard": "^17.0.0",
-        "eslint-config-standard": "^17.1.0",
-        "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-promise": "^6.1.1"
-    }
-}
+{
+    "name": "tango-app-api-infra",
+    "version": "3.3.3-beta.10",
+    "description": "infra",
+    "main": "index.js",
+    "type": "module",
+    "scripts": {
+        "start": "nodemon --exec \"eslint --fix . && node index.js\""
+    },
+    "engines": {
+        "node": ">=18.10.0"
+    },
+    "author": "praveenraj",
+    "license": "ISC",
+    "dependencies": {
+        "aws-sdk": "^2.1571.0",
+        "cors": "^2.8.5",
+        "dayjs": "^1.11.13",
+        "dayjs-plugin-utc": "^0.1.2",
+        "dotenv": "^16.4.5",
+        "excel4node": "^1.8.2",
+        "express": "^4.18.3",
+        "express-fileupload": "^1.5.0",
+        "handlebars": "^4.7.8",
+        "html-pdf-node": "^1.0.8",
+        "joi-to-swagger": "^6.2.0",
+        "mongodb": "^6.4.0",
+        "nodemon": "^3.1.0",
+        "swagger-ui-express": "^5.0.0",
+        "tango-api-schema": "^2.2.29",
+        "tango-app-api-middleware": "^3.1.78",
+        "winston": "^3.12.0",
+        "winston-daily-rotate-file": "^5.0.0"
+    },
+    "devDependencies": {
+        "eslint": "^8.57.0",
+        "eslint-config-google": "^0.14.0",
+        "eslint-config-semistandard": "^17.0.0",
+        "eslint-config-standard": "^17.1.0",
+        "eslint-plugin-import": "^2.29.1",
+        "eslint-plugin-promise": "^6.1.1"
+    }
+}

package/src/controllers/dataMismatch.controller.js

@@ -1,6 +1,6 @@
 
 import { findOneTangoTicket, createTangoTicket, updateOneTangoTicket, aggregateTangoTicket, countDocumentsTangoTicket, findTangoTicket } from '../services/tangoTicket.service.js';
-import { logger, getUTC, fileUpload, signedUrl, sendMessageToQueue, listFileByPath } from 'tango-app-api-middleware';
+import { logger, getUTC, fileUpload, signedUrl, sendMessageToQueue, listFileByPath, getOpenSearchData } from 'tango-app-api-middleware';
 import dayjs from 'dayjs';
 import { findlowcountReason } from '../services/lowcountReason.service.js';
 
@@ -93,16 +93,38 @@ export async function createTicket( req, res ) {
       processType: ( auditInputData?.data?.length && auditOutputData?.data?.length ) ? 'audit' : 'reduction',
     };
 
-    const reqData = {
-      'dateString': dayjs( new Date( req.body.Date ) ).format( 'YYYY-MM-DD' ),
-      'storeId': req.body.storeId,
-    };
-
+    const getFootfall = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).auditData,
+        {
+          'query': {
+            'bool': {
+              'must': [
+                {
+                  'match': {
+                    'date_string': {
+                      'query': dayjs( req.body.Date ).format( 'YYYY-MM-DD' ),
+                      'operator': 'and',
+                    },
+                  },
+                },
+                {
+                  'match': {
+                    'store_id': {
+                      'query': req.body.storeId,
+                      'operator': 'and',
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        } );
 
-    const getFootfall = await postApi( `${JSON.parse( process.env.URL ).oldapidomain}/getFootfall`, reqData );
+    const footfallData = getFootfall?.body?.hits?.hits?.[0]?._source;
 
-    if ( getFootfall?.data?.length ) {
-      req.body.dataMismatch['reportedFootfall'] = getFootfall.data[0].footfall_count;
+    if ( footfallData ) {
+      req.body.dataMismatch['reportedFootfall'] = footfallData?.footfall_count;
+    } else {
+      req.body.dataMismatch['reportedFootfall'] = null;
     }
 
     req.body.issueDate = new Date( req.body.Date );
@@ -149,30 +171,12 @@ export async function createTicket( req, res ) {
       res.sendSuccess( 'Ticket Created Successfully' );
     }
   } catch ( error ) {
+    console.log( error );
     logger.error( { error: error, function: 'createTicket Data Mismatch' } );
     return res.sendError( error, 500 );
   }
 }
 
-async function postApi( url, data ) {
-  const requestOptions = {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      'Authorization': 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66',
-    },
-    body: JSON.stringify( data ),
-  };
-
-  try {
-    const response = await fetch( url, requestOptions );
-    const data = await response.json();
-    return data;
-  } catch ( error ) {
-    logger.error( { error: error, message: data, function: 'postApi' } );
-  }
-}
-
 export async function updateMat( req, res ) {
   try {
     let updateValue = {};