tango-app-api-infra 3.8.1-beta.20 → 3.8.1-beta.22

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.8.1-beta.20",
+    "version": "3.8.1-beta.22",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/footfallDirectory.controllers.js

@@ -404,7 +404,7 @@ export async function getTickets( req, res ) {
     const skip = inputData.offset == 0 ? 0 : ( inputData.offset - 1 ) * limit || 0;
     inputData.storeId = inputData.storeId.split( ',' ); // convert strig to array
     logger.info( { inputData: inputData, limit: limit, skip: skip } );
-    let source = [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'employeeCount', 'houseKeepingCount', 'duplicateCount', 'comments', 'employee', 'houseKeeping', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus' ];
+    let source = [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'employeeCount', 'houseKeepingCount', 'duplicateCount', 'comments', 'employee', 'houseKeeping', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'approverRole', 'approverUserName', 'approverEmail' ];
     let filter = [
 
       {
@@ -477,9 +477,9 @@ export async function getTickets( req, res ) {
               },
             },
           } );
-      source = inputData.revopsType == 'employee' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'employeeCount', 'comments', 'employee', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus' ] :
-        inputData.revopsType == 'houseKeeping' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'houseKeepingCount', 'comments', 'houseKeeping', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus' ] :
-          inputData.revopsType == 'duplicateImages' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'duplicateCount', 'comments', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus' ] : [];
+      source = inputData.revopsType == 'employee' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'employeeCount', 'comments', 'employee', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCoun', 'duplicateACCount', 'approverRole', 'approverUserName', 'approverEmail' ] :
+        inputData.revopsType == 'houseKeeping' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'houseKeepingCount', 'comments', 'houseKeeping', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'approverRole', 'approverUserName', 'approverEmail' ] :
+          inputData.revopsType == 'duplicateImages' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'duplicateCount', 'comments', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'approverRole', 'approverUserName', 'approverEmail' ] : [];
     }
 
     if ( inputData.action ) {
@@ -586,6 +586,17 @@ export async function getTickets( req, res ) {
           createdAt: hit?._source?.createdAt,
           updatedAt: hit?._source?.updatedAt,
           tempId: hit?._source?.tempId,
+          houseKeepingCount: hit?._source?.houseKeepingCount,
+          employeeCount: hit?._source?.employeeCount,
+          duplicateCount: hit?._source?.duplicateCount,
+          houseKeepingACCount: hit?._source?.houseKeepingACCount,
+          employeeACCount: hit?._source?.employeeACCount,
+          duplicateACCount: hit?._source?.duplicateACCount,
+          approverUserName: hit?._source?.approverUserName,
+          approverEmail: hit?._source?.approverEmail,
+          approverRole: hit?._source?.approverRole,
+
+
         };
         let result;
 
@@ -912,10 +923,9 @@ export async function getTaggedStores( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.query;
-    logger.info( { inputData: inputData } );
     let filter = [
       {
-        term: { 'clientId.keyword': inputData.clientId },
+        terms: { 'clientId.keyword': inputData.clientId },
       },
       {
         range: {
@@ -1002,7 +1012,6 @@ export async function getTaggedStores( req, res ) {
         },
       },
     };
-
     let temp = [];
 
     const geteDataCount = await getOpenSearchData( openSearch.footfallDirectory, getCount );

package/src/validations/footfallDirectory.validation.js

@@ -44,11 +44,12 @@ export async function getClusters( req, res, next ) {
   try {
     const inputData=req.query;
     // const assignedStores = req.body.assignedStores;
+    inputData.clientId = inputData?.clientId?.split( ',' );
     const clusters = inputData?.clusters?.split( ',' ); // convert strig to array
     // logger.info( { assignedStores, clusters } );
     let filter =[
       {
-        clientId: inputData.clientId,
+        clientId: { $in: inputData.clientId },
       },
     ];
     if ( inputData?.clusters ) {