tango-app-api-infra 3.8.1-beta.8 → 3.8.1-beta.9

package/package.json

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

package/src/controllers/footfallDirectory.controllers.js

@@ -10,11 +10,12 @@ export async function createTicket( req, res ) {
     const getStoreName = await findOneStore( { storeId: inputData.storeId }, { storeName: 1, _id: 0 } );
     inputData.ticketId = 'TE_FDT_' + new Date().valueOf();
     inputData.clientId = inputData?.storeId?.split( '-' )[0];
-    inputData.storeName =getStoreName?.storeName;
+    inputData.storeName = getStoreName?.storeName;
     inputData.createdAt = new Date();
     inputData.updatedAt = new Date();
-    inputData.userName = req.user.userName;
-    inputData.role = req.user.role;
+    inputData.userName = req?.user?.userName;
+    inputData.email = req?.user?.email;
+    inputData.role = req?.user?.role;
     inputData.status = 'open';
     if ( inputData.houseKeepingCount > 0 ) {
       inputData.houseKeepingStatus = 'pending';
@@ -67,7 +68,7 @@ async function bulkUpdateStatusToPending( indexName, inputData ) {
 
   // 3. Duplicate Images > data[]
   if ( inputData.duplicateCount > 0 ) {
-    let updatedDuplicateImages =[];
+    let updatedDuplicateImages = [];
     for ( const dup of inputData.duplicateImages || [] ) {
       const id = `${inputData.storeId}_${inputData.dateString}_${dup.timeRange}_${dup.tempId}`;
       dup?.data?.map( ( item ) => {
@@ -184,13 +185,13 @@ export async function ticketList( req, res ) {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.query;
     const limit = inputData.limit || 10;
-    const offset= inputData.offset == 0? 0:( inputData.offset - 1 ) *limit || 0;
+    const offset = inputData.offset == 0 ? 0 : ( inputData.offset - 1 ) * limit || 0;
     const order = inputData?.sortOrder || -1;
 
     inputData.clientId = inputData.clientId.split( ',' ); // convert strig to array
 
 
-    let filter= [
+    let filter = [
       {
         'range': {
           'dateString': {
@@ -200,17 +201,33 @@ export async function ticketList( req, res ) {
           },
         },
       },
-      { terms: { 'clientId.keyword': Array.isArray( inputData.clientId ) ?
-              inputData.clientId :
-              inputData.clientId } },
+      {
+        terms: {
+          'clientId.keyword': Array.isArray( inputData.clientId ) ?
+            inputData.clientId :
+           [ inputData.clientId ],
+        },
+      },
     ];
 
-    let search ={
+    if ( inputData?.storeId ) {
+      filter.push(
+          {
+            terms: {
+              'storeId.keyword': Array.isArray( inputData.storeId ) ?
+              inputData.storeId :
+              [ inputData.storeId ],
+            },
+          },
+      );
+    }
+
+    let search = {
       'must': filter,
     };
 
     if ( inputData.searchValue && inputData.searchValue !== '' ) {
-      search ={
+      search = {
         'must': filter,
         'should': [
           {
@@ -247,12 +264,13 @@ export async function ticketList( req, res ) {
       };
     }
 
-    let searchQuery={
+    let searchQuery = {
       '_source': [
         'storeName',
         'storeId',
         'ticketId',
         'createdAt',
+        'updatedAt',
         'footfallCount',
         'duplicateCount',
         'employeeCount',
@@ -280,12 +298,13 @@ export async function ticketList( req, res ) {
       }
 
 
-      searchQuery={
+      searchQuery = {
         '_source': [
           'storeName',
           'storeId',
           'ticketId',
           'createdAt',
+          'updatedAt',
           'footfallCount',
           'duplicateCount',
           'employeeCount',
@@ -299,18 +318,19 @@ export async function ticketList( req, res ) {
           'bool': search,
         },
         'sort': [
-          { [sortByValue]: { order: order === -1 ?'desc':'asc' } },
+          { [sortByValue]: { order: order === -1 ? 'desc' : 'asc' } },
         ],
       };
     }
 
-    if ( inputData.isExport==true ) {
-      searchQuery={
+    if ( inputData.isExport == true ) {
+      searchQuery = {
         '_source': [
           'storeName',
           'storeId',
           'ticketId',
           'createdAt',
+          'updatedAt',
           'footfallCount',
           'duplicateCount',
           'employeeCount',
@@ -338,7 +358,7 @@ export async function ticketList( req, res ) {
       return res.sendError( 'No data found', 204 );
     }
 
-    if ( inputData.isExport==true ) {
+    if ( inputData.isExport == true ) {
       const exportData = [];
       for ( const item of searchValue ) {
         exportData.push( {
@@ -350,7 +370,7 @@ export async function ticketList( req, res ) {
           'Duplicates': item._source.duplicateCount,
           'Employee/Staff': item._source.employeeCount,
           'HouseKeeping': item._source.houseKeepingCount,
-          'Revised Footfalls': item._source.footfallCount-( item._source.duplicateCount+item._source.employeeCount+item._source.houseKeepingCount ),
+          'Revised Footfalls': item._source.footfallCount - ( item._source.duplicateCount + item._source.employeeCount + item._source.houseKeepingCount ),
           'Status': item._source.status,
         } );
       }
@@ -369,14 +389,17 @@ export async function getTickets( req, res ) {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.query;
     const limit = inputData.limit;
-    const skip= inputData.offset == 0? 0:( inputData.offset - 1 ) *limit || 0;
+    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 filter =[
-      { terms: { 'storeId.keyword': Array.isArray( inputData.storeId ) ?
-              inputData.storeId :
-              inputData.storeId },
+    let filter = [
+      {
+        terms: {
+          'storeId.keyword': Array.isArray( inputData.storeId ) ?
+            inputData.storeId :
+            inputData.storeId,
+        },
       },
       {
         range: {
@@ -405,32 +428,32 @@ export async function getTickets( req, res ) {
           field: inputData.revopsType,
         },
       } );
-      inputData.revopsType === 'employee'?
-      filter.push( {
-        range: {
-          employeeCount: {
-            gt: 0,
-          },
-        },
-      } ) :
-       inputData.revopsType === 'housekeeping'?
-      filter.push( {
-        range: {
-          housekeepingCount: {
-            gt: 0,
-          },
-        },
-      } ):
-      filter.push( {
-        range: {
-          duplicateCount: {
-            gt: 0,
+      inputData.revopsType === 'employee' ?
+        filter.push( {
+          range: {
+            employeeCount: {
+              gt: 0,
+            },
           },
-        },
-      } );
-      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' ] : [];
+        } ) :
+        inputData.revopsType === 'housekeeping' ?
+          filter.push( {
+            range: {
+              housekeepingCount: {
+                gt: 0,
+              },
+            },
+          } ) :
+          filter.push( {
+            range: {
+              duplicateCount: {
+                gt: 0,
+              },
+            },
+          } );
+      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' ] : [];
     }
 
     if ( inputData.action ) {
@@ -459,7 +482,7 @@ export async function getTickets( req, res ) {
     }
     let getRevCount = {};
     if ( inputData.revopsType ) {
-      getRevCount= {
+      getRevCount = {
         size: 0,
         query: {
           bool: {
@@ -469,13 +492,13 @@ export async function getTickets( req, res ) {
         aggs: {
           totalCount: {
             sum: {
-              field: inputData.revopsType == 'employee'? 'employeeCount':inputData.revopsType == 'houseKeeping'?'houseKeepingCount': 'duplicateCount',
+              field: inputData.revopsType == 'employee' ? 'employeeCount' : inputData.revopsType == 'houseKeeping' ? 'houseKeepingCount' : 'duplicateCount',
             },
           },
         },
       };
     }
-    const getCount= {
+    const getCount = {
       query: {
         bool: {
           filter: filter,
@@ -485,10 +508,10 @@ export async function getTickets( req, res ) {
 
 
     const geteDataCount = await getOpenSearchCount( openSearch.footfallDirectory, getCount );
-    const geteRevDataCount = inputData?.revopsType? await getOpenSearchData( openSearch.footfallDirectory, getRevCount ) : null;
-    const revCount = inputData?.revopsType? geteRevDataCount?.body?.aggregations?.totalCount?.value: 0;
+    const geteRevDataCount = inputData?.revopsType ? await getOpenSearchData( openSearch.footfallDirectory, getRevCount ) : null;
+    const revCount = inputData?.revopsType ? geteRevDataCount?.body?.aggregations?.totalCount?.value : 0;
     const count = geteDataCount?.body?.count;
-    if ( !geteDataCount || count==0 ) {
+    if ( !geteDataCount || count == 0 ) {
       return res.sendError( 'No data found', 204 );
     }
 
@@ -519,7 +542,7 @@ export async function getTickets( req, res ) {
     logger.info( { response: response, body: getData?.body, getData: getData, geteDataCount: geteDataCount } );
 
 
-    if ( inputData.isExport=== true ) {
+    if ( inputData.isExport === true ) {
       const temp = [];
       for ( const item of response ) {
         temp.push( {
@@ -531,7 +554,7 @@ export async function getTickets( req, res ) {
           'Duplicates': item.duplicateCount,
           'Employee/Staff': item.employeeCount,
           'HouseKeeping': item.houseKeepingCount,
-          'Revised Footfalls': item.footfallCount-( item.duplicateCount+item.employeeCount+item.houseKeepingCount ),
+          'Revised Footfalls': item.footfallCount - ( item.duplicateCount + item.employeeCount + item.houseKeepingCount ),
           'Status': item.status,
         } );
       }
@@ -539,7 +562,7 @@ export async function getTickets( req, res ) {
       return;
     }
 
-    return res.sendSuccess( { result: inputData.revopsType? response: response, count: count, revopCount: revCount } );
+    return res.sendSuccess( { result: inputData.revopsType ? response : response, count: count, revopCount: revCount } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.error( { error: error, messgage: req.query } );
@@ -567,7 +590,7 @@ export async function updateStatus( req, res ) {
           { doc: { duplicateImage: duplicate.duplicateImage } },
       );
       duplicate?.data?.map( ( item ) => {
-        item.isChecked == true? tempId.push( item.tempId ) : null;
+        item.isChecked == true ? tempId.push( item.tempId ) : null;
         bulkBody.push(
             { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${item.timeRange}_${item.tempId}` } },
             { doc: { isChecked: item.isChecked } },
@@ -575,18 +598,18 @@ export async function updateStatus( req, res ) {
       } );
     }
     for ( let employee of inputData.employee ) {
-       employee.isChecked == true? tempId.push( employee.tempId ) : null;
-       bulkBody.push(
-           { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${employee.timeRange}_${employee.tempId}` } },
-           { doc: { isChecked: employee.isChecked } },
-       );
+      employee.isChecked == true ? tempId.push( employee.tempId ) : null;
+      bulkBody.push(
+          { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${employee.timeRange}_${employee.tempId}` } },
+          { doc: { isChecked: employee.isChecked } },
+      );
     }
     for ( let houseKeeping of inputData.houseKeeping ) {
-       houseKeeping.isChecked == true? tempId.push( houseKeeping.tempId ) : null;
-       bulkBody.push(
-           { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${houseKeeping.timeRange}_${houseKeeping.tempId}` } },
-           { doc: { isChecked: houseKeeping.isChecked } },
-       );
+      houseKeeping.isChecked == true ? tempId.push( houseKeeping.tempId ) : null;
+      bulkBody.push(
+          { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${houseKeeping.timeRange}_${houseKeeping.tempId}` } },
+          { doc: { isChecked: houseKeeping.isChecked } },
+      );
     }
     // if ( inputData.status == 'closed' ) {
     //   const isSendMessge = await sendSqsMessage( inputData, tempId );
@@ -637,7 +660,7 @@ export async function getTaggedStores( req, res ) {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.query;
     logger.info( { inputData: inputData } );
-    let filter= [
+    let filter = [
       {
         term: { 'clientId.keyword': inputData.clientId },
       },

package/src/docs/footfallDirectory.docs.js

@@ -71,6 +71,12 @@ export const footfallDirectoryDocs = {
           scema: j2s( ticketListSchema ).swagger,
           required: true,
         },
+        {
+          in: 'query',
+          name: 'storeId',
+          scema: j2s( ticketListSchema ).swagger,
+          required: false,
+        },
         {
           in: 'query',
           name: 'fromDate',

package/src/dtos/footfallDirectory.dtos.js

@@ -121,6 +121,7 @@ export const ticketSummaryValid = {
 
 export const ticketListSchema = Joi.object().keys( {
   clientId: Joi.string().required(),
+  storeId: Joi.string().optional(),
   searchValue: Joi.string().optional().allow( '' ),
   limit: Joi.number().optional(),
   offset: Joi.number().optional(),