tango-app-api-infra 3.9.5-vms.67 → 3.9.5-vms.69

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.9.5-vms.67",
+    "version": "3.9.5-vms.69",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/footfallDirectory.controllers.js

@@ -182,11 +182,25 @@ export async function tangoReviewTicket( req, res ) {
       },
     };
     if ( Ticket[0]?._source?.type != 'internal' ) {
-      getTicket.query.bool.must.push( {
-        term: {
-          'mappingInfo.type': 'tangoreview',
-        },
-      } );
+      getTicket.query.bool.must.push(
+          {
+            nested: {
+              path: 'mappingInfo',
+              query: {
+                bool: {
+                  must: [
+                    {
+                      term: {
+                        'mappingInfo.type': 'tangoreview',
+                      },
+                    },
+
+                  ],
+                },
+              },
+            },
+          },
+      );
     }
     const getFootfallticketData = await getOpenSearchData( openSearch.footfallDirectory, getTicket );
     const ticketData = getFootfallticketData?.body?.hits?.hits;
@@ -394,9 +408,7 @@ export async function tangoReviewTicket( req, res ) {
 
     if ( Ticket[0]?._source?.type==='store' ) {
       let findTagging = Ticket[0]?._source?.mappingInfo.filter( ( data ) => data.type==='tagging' );
-      console.log( '🚀 ~ tangoReviewTicket ~ findTgging:', findTagging[0] );
       if ( findTagging?.length>0&&findTagging[0].createdByEmail!='' ) {
-        console.log( '🚀 ~ tangoReviewTicket ~ findTgging.mappingInfo[0]?.createdByEmail:', findTagging[0]?.createdByEmail );
         let userData = await findOneUser( { email: findTagging[0]?.createdByEmail } );
         let title = `Received response for the Footfall ticket raised.`;
         let createdOn = dayjs( Ticket[0]?._source?.dateString ).format( 'DD MMM YYYY' );
@@ -940,7 +952,7 @@ export async function ticketList( req, res ) {
         },
       } );
     }
-    if ( inputData.status ) {
+    if ( inputData.status && inputData.status!=='' ) {
       inputData.status = inputData?.status?.split( ',' );
       if ( req.user.userType === 'tango' ) {
         searchQuery.query.bool.must.push( {
@@ -1042,40 +1054,83 @@ export async function ticketList( req, res ) {
     }
 
     if ( req?.user?.userType == 'tango' && inputData.tangoType !== 'internal' ) {
-      searchQuery.query.bool.must.push( {
-        term: {
-          'mappingInfo.type': 'tangoreview',
-        },
-      },
-      {
-        term: {
-          'type.keyword': 'store',
-        },
-      },
+      searchQuery.query.bool.must.push(
+          {
+            term: {
+              'type.keyword': 'store',
+            },
+          },
+          {
+            nested: {
+              path: 'mappingInfo',
+              query: {
+                bool: {
+                  must: [
+                    {
+                      term: {
+                        'mappingInfo.type': 'tangoreview',
+                      },
+                    },
+
+                  ],
+                },
+              },
+            },
+
+          },
 
 
       );
     } else if ( inputData.tangoType !== 'internal' ) {
-      searchQuery.query.bool.must.push( {
-        term: {
-          'mappingInfo.type': ticketsFeature ? 'review' : ticketsApproveFeature ?
-            'approve' : 'tagging',
-        },
-      },
-      {
-        term: {
-          'type.keyword': 'store',
-        },
-      } );
+      searchQuery.query.bool.must.push(
+          {
+            term: {
+              'type.keyword': 'store',
+            },
+          },
+          {
+            nested: {
+              path: 'mappingInfo',
+              query: {
+                bool: {
+                  must: [
+                    {
+                      term: {
+                        'mappingInfo.type': ticketsFeature ? 'review' : ticketsApproveFeature ?
+                    'approve' : 'tagging',
+                      },
+                    },
+
+                  ],
+                },
+              },
+            },
+          },
+
+      );
     }
 
     if ( inputData?.permissionType ) {
-      searchQuery.query.bool.must.push( {
-        term: {
-          'mappingInfo.type': inputData?.permissionType == 'review' ? 'review' :
-            'approve',
-        },
-      } );
+      searchQuery.query.bool.must.push(
+          {
+            nested: {
+              path: 'mappingInfo',
+              query: {
+                bool: {
+                  must: [
+                    {
+                      term: {
+                        'mappingInfo.type': inputData?.permissionType == 'review' ? 'review' :
+                        'approve',
+                      },
+                    },
+
+                  ],
+                },
+              },
+            },
+          },
+      );
     }
 
     if ( inputData.searchValue && inputData.searchValue !== '' ) {
@@ -1110,7 +1165,6 @@ export async function ticketList( req, res ) {
     }
     // You can add more filters as needed
     const searchResult = await getOpenSearchData( openSearch.footfallDirectory, searchQuery );
-    logger.info( { searchResult } );
     const count = searchResult?.body?.hits?.total?.value || 0;
 
     if ( count === 0 ) {
@@ -2402,7 +2456,6 @@ export async function downloadTickets( req, res ) {
 }
 
 async function extractTempIds( document ) {
-  logger.info( { document: document } );
   const source = document?._source || {};
   const result = [];
 
@@ -2522,7 +2575,6 @@ export async function openTicketList( req, res ) {
 
     // Assuming getOpenSearchData and openSearch.footfallDirectoryTagging are available
     const result = await getOpenSearchData( openSearch.footfallDirectory, openSearchQuery );
-    logger.info( { result } );
     const getUserlist = result?.body?.hits?.hits?.map( ( hit ) => hit._source ) || [];
     return res.sendSuccess( getUserlist || [] );
   } catch ( error ) {
@@ -2537,8 +2589,7 @@ export async function assignTicket( req, res ) {
     const inputData = req.body;
     const openSearch = JSON.parse( process.env.OPENSEARCH );
 
-    const { email, userName, role, actionType, storeId, dateString } = inputData;
-    logger.info( { actionType } );
+    const { email, userName, role, storeId, dateString } = inputData;
     const _id = `${storeId}_${dateString}_footfall-directory-tagging`;
 
     const getTicket = await getOpenSearchById( openSearch.footfallDirectory, _id );