tango-app-api-analysis-traffic 3.0.0-alpha.48 → 3.0.0-alpha.49

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.0.0-alpha.48",
+    "version": "3.0.0-alpha.49",
     "description": "Traffic Analysis",
     "main": "index.js",
     "type": "module",

package/src/controllers/nob.controllers.js

@@ -227,7 +227,28 @@ export async function getNobData( req, res ) {
     const getNobData=await getOpenSearchData( openSearch.nob, nobQuery );
     const nobData = getNobData?.body?.hits?.hits;
     if ( !nobData ||nobData?.length == 0 ) {
-      return res.sendError( 'No Data Found', 204 );
+      const initialQuery={
+        'size': 1,
+        'query': {
+          'bool': {
+            'must': [
+              {
+                'term': {
+                  'clientId.keyword': req.clientId,
+                },
+              },
+            ],
+          },
+        },
+      };
+      const getInitialData=await getOpenSearchData( openSearch.nob, initialQuery );
+      const initialData = getInitialData?.body?.hits?.hits;
+      logger.info( { initialData: initialData, clientId: req.clientId } );
+      if ( initialData && initialData.length > 0 ) {
+        return res.sendError( 'No Data Found', 204 );
+      } else {
+        return res.sendSuccess( { initialInsert: false } );
+      }
     }
 
     const footfallQuery={

package/src/routes/nob.routes.js

@@ -2,14 +2,14 @@ import express from 'express';
 import { accessVerification, getAssinedStore, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 import { addBillsValid, getNobDataValid, storeListValid } from '../dtos/nob.dtos.js';
 import { addBills, getNobData, storeList } from '../controllers/nob.controllers.js';
-import { clientValidations } from '../validations/nob.validations.js';
+import { clientValidations, roleVerification } from '../validations/nob.validations.js';
 
 const nobRouter=express.Router();
 
 // store list
 nobRouter.get( '/store-list', isAllowedSessionHandler, accessVerification( { userType: [ 'client', 'tango' ] } ), validate( storeListValid ), clientValidations, getAssinedStore, storeList );
 
-nobRouter.post( '/add-bills', isAllowedSessionHandler, accessVerification( { userType: [ 'client', 'tango' ] } ), validate( addBillsValid ), clientValidations, addBills );
+nobRouter.post( '/add-bills', isAllowedSessionHandler, accessVerification( { userType: [ 'client', 'tango' ] } ), validate( addBillsValid ), roleVerification, clientValidations, addBills );
 
 nobRouter.post( '/get-nob-data', isAllowedSessionHandler, accessVerification( { userType: [ 'client', 'tango' ] } ), validate( getNobDataValid ), clientValidations, getAssinedStore, getNobData );
 

package/src/validations/nob.validations.js

@@ -13,3 +13,16 @@ export async function clientValidations( req, res, next ) {
     return res.sendError( err, 500 );
   }
 }
+
+export async function roleVerification( req, res, next ) {
+  try {
+    if ( [ 'admin', 'superadmin' ].includes( req?.user?.role ) ) {
+      return next();
+    } else {
+      return res.sendError( 'access forbidden', 403 );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, message: req.body, function: 'nob-roleVerification' } );
+    return res.sendError( error, 500 );
+  }
+}