tango-app-api-analysis-traffic 3.0.0-alpha.43 → 3.0.0-alpha.45

package/package.json

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

package/src/controllers/nob.controllers.js

@@ -61,6 +61,7 @@ export async function storeList( req, res ) {
 export async function addBills( req, res ) {
   try {
     let resData=[];
+    let errorData=[];
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.body;
     for ( let i=0; i<inputData?.bills?.length; i++ ) {
@@ -68,21 +69,29 @@ export async function addBills( req, res ) {
         {
           $match: {
             $and: [
-              { clientId: { $eq: req.user.clientId } },
+              { clientId: { $eq: req.clientId } },
               { status: { $eq: 'active' } },
               {
                 $or: [
-                  { 'storeId': inputData?.bills[i]?.storeId },
-                  { 'storeProfile.storeCode': inputData?.bills[i]?.storeId },
+                  { 'storeId': inputData?.bills[i]?.storeCode },
+                  { 'storeProfile.storeCode': inputData?.bills[i]?.storeCode },
                 ],
               },
             ],
           },
         },
+        {
+          $project: {
+            storeId: 1,
+            storeName: 1,
+            storeCode: '$storeProfile.storeCode',
+
+          },
+        },
       ];
       let storeData= await aggregateStore( query );
       if ( storeData?.length ==0 ) {
-        resData.push( { code: 400, storeId: inputData?.bills[i]?.storeId, message: 'Store code is not mapped with tango' } );
+        errorData.push( { code: 400, storeId: inputData?.bills[i]?.storeId, message: 'Store code is not mapped with tango' } );
       } else {
         let searchQuery={
           'size': 1,
@@ -107,10 +116,10 @@ export async function addBills( req, res ) {
         let nobDateIso =new Date( inputData?.bills[i]?.nobDate );
         nobDateIso.setUTCHours( 0, 0, 0, 0 );
         let inserData={
-          clientId: req?.user?.clientId,
+          clientId: req?.clientId,
           storeId: storeData[0]?.storeId,
-          storeCode: storeData[0]?.storeProfile?.storeCode,
-          storeName: inputData?.bills[i]?.storeName,
+          storeCode: storeData[0]?.storeCode,
+          storeName: storeData[0]?.storeName,
           nobDate: nobDateIso,
           nobCount: inputData?.bills[i]?.nobCount,
           dateString: inputData?.bills[i]?.nobDate,
@@ -119,18 +128,20 @@ export async function addBills( req, res ) {
         const query ={ storeId: storeData[0]?.storeId, nobDate: inputData?.bills[i]?.nobDate };
         await updateOneNobBilling( query, inserData );
         const getData = await findOneNobBilling( query, { _id: 0 } );
-        logger.info( { searchData: searchData } );
         if ( searchData?.body?.hits?.hits?.length==0 || searchData?.body==undefined ) {
-          logger.info( { getData: getData } );
           await insertOpenSearchData( openSearch.nob, getData );
-          resData.push( { code: 200, tangoCode: getData.storeId, storeId: inputData?.bills[i]?.storeId, message: 'Data Inserted Successfully' } );
+          resData.push( { code: 200, tangoCode: getData.storeId, storeId: inputData?.bills[i]?.storeCode, message: 'Data Inserted Successfully' } );
         } else {
           await updateOpenSearchData( openSearch.nob, searchData.body.hits.hits[0]._id, { doc: getData } );
-          resData.push( { code: 200, tangoCode: storeData.id, storeId: inputData?.bills[i]?.storeId, message: 'Data Updated Successfully' } );
+          resData.push( { code: 200, tangoCode: storeData[0]?.storeId, storeId: inputData?.bills[i]?.storeCode, message: 'Data Updated Successfully' } );
         }
       }
     }
-    return res.sendSuccess( { result: resData } );
+    if ( errorData.length > 0 && resData.length == 0 ) {
+      return res.sendError( 'Store code is not mapped with tango', 400 );
+    }
+    logger.info( { resData: resData, errorData: errorData, function: 'nob-addbills' } );
+    return res.sendSuccess( 'Data has been inserted successfully' );
   } catch ( error ) {
     const err= error.message || 'Internal Server Error';
     logger.error( { error: error, message: req.body, function: 'nob-addBills' } );
@@ -172,6 +183,12 @@ export async function getNobData( req, res ) {
               'storeId.keyword': {
                 'value': `${searchValue}*`,
               },
+              'storeCode.keyword': {
+                'value': `${searchValue}*`,
+              },
+              'storeName.keyword': {
+                'value': `${searchValue}*`,
+              },
             },
           },
       );

package/src/dtos/nob.dtos.js

@@ -4,9 +4,7 @@ export const addBillsSchema = joi.object( {
 
   bills: joi.array().items(
       joi.object( {
-        storeId: joi.string().required(),
         storeCode: joi.string().required(),
-        storeName: joi.string().required(),
         nobDate: joi.string().required(),
         nobCount: joi.number().required(),
       } ),

package/src/routes/nob.routes.js

@@ -9,7 +9,7 @@ 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 ), addBills );
+nobRouter.post( '/add-bills', isAllowedSessionHandler, accessVerification( { userType: [ 'client', 'tango' ] } ), validate( addBillsValid ), clientValidations, addBills );
 
 nobRouter.post( '/get-nob-data', isAllowedSessionHandler, accessVerification( { userType: [ 'client', 'tango' ] } ), validate( getNobDataValid ), clientValidations, getAssinedStore, getNobData );