tango-app-api-infra 3.8.5 → 3.8.7

package/package.json

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

package/src/controllers/footfallDirectory.controllers.js

@@ -439,7 +439,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', 'junkCount', 'junkACCount', 'comments', 'employee', 'houseKeeping', 'junk', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'email', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus','junkStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'approverRole', 'approverUserName', 'approverEmail' ];
+    let source = [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'employeeCount', 'houseKeepingCount', 'duplicateCount', 'junkCount', 'junkACCount', 'comments', 'employee', 'houseKeeping', 'junk', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'email', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'junkStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'approverRole', 'approverUserName', 'approverEmail' ];
     let filter = [
 
       {
@@ -741,8 +741,9 @@ export async function updateTicketStatus( data, openSearch, temp, user ) {
     duplicateStatus,
     employeeStatus,
     houseKeepingStatus,
+    junkStatus,
   } = data;
-  const statusList = [ duplicateStatus, employeeStatus, houseKeepingStatus ];
+  const statusList = [ duplicateStatus, employeeStatus, houseKeepingStatus, junkStatus ];
   // Filter out undefined/null statuses
   const existingStatuses = statusList.filter( ( status ) => status != null );
 
@@ -762,7 +763,6 @@ export async function updateTicketStatus( data, openSearch, temp, user ) {
   let bulkBody = [];
   if ( data?.duplicateImages?.length > 0 ) {
     updateData.duplicateImages = await mergeDuplicateImagesWithUncheck( getExistingOne?.body?._source?.duplicateImages, data?.duplicateImages, data?.duplicateStatus );
-    logger.info( { updateData: updateData, existeg: getExistingOne?.body?._source?.duplicateImages, sttaus: data?.duplicateStatus } );
     await updateOpenSearchData( openSearch.footfallDirectory, _id, { doc: updateData } );
     for ( let duplicate of updateData?.duplicateImages ) {
       bulkBody.push(
@@ -816,6 +816,27 @@ export async function updateTicketStatus( data, openSearch, temp, user ) {
     }
     await updateOpenSearchData( openSearch.footfallDirectory, _id, { doc: { houseKeepingACCount: tempId?.length || 0 } } );
   }
+
+  if ( data?.junk?.length > 0 ) {
+    const updateJunk = updateEmployeeCheckFlags(
+        source?.junk,
+        updateData?.junk,
+        data.junkStatus,
+    );
+    updateData.junk = updateJunk;
+
+    await updateOpenSearchData( openSearch.footfallDirectory, _id, { doc: updateData } );
+
+
+    for ( let junk of updateData?.junk ) {
+      junk.isChecked == true ? tempId.push( { tempId: junk.tempId, timeRange: junk.timeRange } ) : null;
+      bulkBody.push(
+          { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${junk.timeRange}_${junk.tempId}` } },
+          { doc: { isChecked: junk.isChecked, status: junk?.isChecked == true? 'approved':'rejected' } },
+      );
+    }
+    await updateOpenSearchData( openSearch.footfallDirectory, _id, { doc: { junkACCount: tempId?.length || 0 } } );
+  }
   temp.push( storeId );
   if ( bulkBody.length > 0 ) {
     const res = await bulkUpdate( bulkBody );
@@ -835,7 +856,6 @@ export async function updateTicketStatus( data, openSearch, temp, user ) {
     const getStoreType = await countDocumnetsCamera( query );
     let getUpdateExistingOne = await getOpenSearchById( openSearch.footfallDirectory, _id );
     const tempIdList = await extractCheckedTempIds( getUpdateExistingOne?.body );
-    logger.info( { tempIdList: tempIdList } );
     const isSendMessge = await sendSqsMessage( data, tempIdList, getStoreType, storeId );
     if ( isSendMessge ==true ) {
       return true; // res.sendSuccess( 'Ticket has been updated successfully' );

package/src/dtos/footfallDirectory.dtos.js

@@ -287,6 +287,7 @@ export const updateStatusSchemea =Joi.object().keys( {
         duplicateACCount: Joi.number().optional(),
         employeeACCount: Joi.number().optional(),
         houseKeepingACCount: Joi.number().optional(),
+        junkACCount: Joi.number().optional(),
         comments: Joi.string().optional().allow( '' ),
         duplicateImages: Joi.array().items(
             Joi.object( {
@@ -329,6 +330,17 @@ export const updateStatusSchemea =Joi.object().keys( {
           selected: Joi.boolean().optional(),
 
         } ) ).optional(),
+        junk: Joi.array().items( Joi.object( {
+          tempId: Joi.number().required(),
+          filePath: Joi.string().required(),
+          entryTime: Joi.string().required(),
+          exitTime: Joi.string().required(),
+          timeRange: Joi.string().required(),
+          isChecked: Joi.boolean().required(),
+          selected: Joi.boolean().optional(),
+
+        } ) ).optional(),
+        junkStatus: Joi.string().optional(),
         duplicateStatus: Joi.string().optional(),
         employeeStatus: Joi.string().optional(),
         houseKeepingStatus: Joi.string().optional(),