tango-app-api-infra 3.8.7 → 3.8.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.8.7",
+    "version": "3.8.9",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/footfallDirectory.controllers.js

@@ -415,9 +415,9 @@ export async function ticketList( req, res ) {
           'Duplicates': item?._source?.status === 'closed'? item._source.duplicateACCount : item._source.duplicateCount,
           'Employee/Staff': item?._source?.status === 'closed'? item._source.employeeACCount : item._source.employeeCount,
           'HouseKeeping': item?._source?.status === 'closed'? item._source.houseKeepingACCount : item._source.houseKeepingCount,
-          'Junk': item?._source?.status === 'closed'? item._source.junkACCount : item._source.junkCount,
-          'Revised Footfall': item?._source?.status === 'closed'? item._source.footfallCount - ( item._source.duplicateACCount + item._source.employeeACCount + item._source.houseKeepingACCount + item._source.junkACCount ) : item._source.footfallCount - ( item._source.duplicateCount + item._source.employeeCount + item._source.houseKeepingCount + item._source.junkCount ),
-          'Ticket%': item?._source?.status === 'closed'?`${Math.round( ( ( item._source.duplicateACCount + item._source.employeeACCount + item._source.houseKeepingACCount + item._source.junkACCount )/ item._source.footfallCount )*100 ).toFixed( 0 )} %` : `${Math.round( ( ( item?._source?.duplicateCount + item?._source?.employeeCount + item?._source?.houseKeepingCount + item._source.junkCount )/ item?._source?.footfallCount )*100 ).toFixed( 0 )} %`,
+          'Junk': item?._source?.status === 'closed'? ( item._source.junkACCount || 0 ) : ( item._source.junkCount|| 0 ),
+          'Revised Footfall': item?._source?.status === 'closed'? item._source.footfallCount - ( item._source.duplicateACCount + item._source.employeeACCount + item._source.houseKeepingACCount +( item._source.junkACCount || 0 ) ) : item._source.footfallCount - ( item._source.duplicateCount + item._source.employeeCount + item._source.houseKeepingCount + ( item._source.junkCount || 0 ) ),
+          'Ticket%': item?._source?.status === 'closed'?`${Math.round( ( ( item._source.duplicateACCount + item._source.employeeACCount + item._source.houseKeepingACCount + ( item?._source?.junkACCount || 0 ) )/ item._source.footfallCount )*100 ).toFixed( 0 )} %` : `${Math.round( ( ( item?._source?.duplicateCount + item?._source?.employeeCount + item?._source?.houseKeepingCount + ( item?._source?.junkCount || 0 ) )/ item?._source?.footfallCount )*100 ).toFixed( 0 )} %`,
           'Status': item._source.status,
         } );
       }
@@ -1095,10 +1095,10 @@ export async function getTaggedStores( req, res ) {
               sum: {
                 script: {
                   source: `
-                  return (doc.containsKey('duplicateCount') ? doc['duplicateCount'].value : 0)
-                       + (doc.containsKey('houseKeepingCount') ? doc['houseKeepingCount'].value : 0)
-                       + (doc.containsKey('employeeCount') ? doc['employeeCount'].value : 0)
-                         + (doc.containsKey('junkCount') ? doc['junkCount'].value : 0);
+                  return (doc.containsKey('duplicateCount')&& !doc['duplicateCount'].empty ? doc['duplicateCount'].value : 0)
+                       + (doc.containsKey('houseKeepingCount') && !doc['houseKeepingCount'].empty ? doc['houseKeepingCount'].value : 0)
+                       + (doc.containsKey('employeeCount') && !doc['employeeCount'].empty ? doc['employeeCount'].value : 0)
+                          + (doc.containsKey('junkCount') && !doc['junkCount'].empty ? doc['junkCount'].value : 0);
               `,
                   lang: 'painless',
                 },
@@ -1116,10 +1116,10 @@ export async function getTaggedStores( req, res ) {
     }
 
     const response = geteDataCount?.body?.aggregations?.unique_stores?.buckets;
-    const sorted = sortByTotalCount( response, inputData.sortOrder );
-    sorted?.map( ( item ) => temp.push( { storeId: item.key.storeId, storeName: item.key.storeName, totalCount: item?.totalCount?.value } ) );
 
     if ( response?.length > 0 ) {
+      const sorted = sortByTotalCount( response, inputData.sortOrder );
+      sorted?.map( ( item ) => temp.push( { storeId: item.key.storeId, storeName: item.key.storeName, totalCount: item?.totalCount?.value } ) );
       return res.sendSuccess( { result: temp, count: response?.length } );
     } else {
       return res.sendError( 'NO Data', 204 );
@@ -1127,7 +1127,7 @@ export async function getTaggedStores( req, res ) {
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.error( { error: error, messgage: req.query } );
-    return res.sendSuccess( err, 500 );
+    return res.sendError( err, 500 );
   }
 }