tango-app-api-infra 3.9.5-vms.7 → 3.9.5-vms.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.9.5-vms.7",
+    "version": "3.9.5-vms.8",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -27,7 +27,7 @@
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.4.20",
+        "tango-api-schema": "^2.4.28",
         "tango-app-api-middleware": "^3.1.93",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/validations/footfallDirectory.validation.js

@@ -228,14 +228,13 @@ export async function ticketCreation( req, res, next ) {
     // check the createtion permission from the user permission
     const userInfo = req?.user;
     const ticketsFeature = userInfo?.rolespermission?.some( ( f ) => f.featureName === 'FootfallDirectory' && ( f.modules.find( ( m ) => m.name =='creator' && ( m.isAdd==true || m.isEdit==true ) ) ) );
-    logger.info( { ticketsFeature } );
     if ( !ticketsFeature ) {
       return res.sendError( 'Forbidden to Create Ticket', 403 );
     }
 
     // get store info by the storeId into mongo db
     const getstoreName = await findOneStore( { storeId: inputData.storeId, status: 'active' }, { storeId: 1, storeName: 1, clientId: 1 } );
-    logger.info( { getstoreName } );
+
     if ( !getstoreName || getstoreName == null ) {
       return res.sendError( 'The store ID is either inActive or not found', 400 );
     }
@@ -261,22 +260,20 @@ export async function ticketCreation( req, res, next ) {
 
     const getFootfallCount = await getOpenSearchData( openSearch.footfall, getQuery );
     const hits = getFootfallCount?.body?.hits?.hits || [];
-    logger.info( { hits } );
     if ( hits?.[0]?._source?.footfall_count <= 0 ) {
       return res.sendError( 'You can’t create a ticket because this store has 0 footfall data' );
     }
 
     // get category details from the client level configuration
     const getConfig = await findOneClient( { clientId: getstoreName.clientId }, { footfallDirectoryConfigs: 1 } );
-    logger.info( { getConfig, ta123: getConfig?.footfallDirectoryConfigs } );
     if ( !getConfig || getConfig == null ) {
       return res.sendError( 'The Client ID is either not configured or not found', 400 );
     }
 
     // Get taggingLimitation from config (check both possible paths)
     const taggingLimitation = getConfig?.footfallDirectoryConfigs?.taggingLimitation;
-    logger.info( { taggingLimitation, tagginngs: getConfig?.footfallDirectoryConfigs } );
     // Initialize count object from taggingLimitation
+    const tempAcc = [];
     const getCategory = taggingLimitation?.reduce( ( acc, item ) => {
       if ( item?.type ) {
         // Convert type to camelCase with "Count" suffix
@@ -289,11 +286,21 @@ export async function ticketCreation( req, res, next ) {
           // Convert first letter to lowercase and append "Count"
           key = typeLower.charAt( 0 ) + typeLower.slice( 1 ) + 'Count';
         }
-        acc[key] = 0;
+
+
+        // To change from an object to the desired array structure, assemble an array of objects:
+        tempAcc.push( {
+          name: item.name,
+          value: 0,
+          key: key,
+          type: item.type,
+        } );
+
+
+        return acc;
       }
-      return acc;
     }, {} ) || {};
-    logger.info( { getCategory } );
+
     // Query OpenSearch revop index to get actual counts for each type
     if ( taggingLimitation && taggingLimitation.length > 0 ) {
       const revopQuery = {
@@ -324,51 +331,38 @@ export async function ticketCreation( req, res, next ) {
         },
       };
 
-      try {
-        const revopData = await getOpenSearchData( openSearch.revop, revopQuery );
-        logger.info( { revopData: revopData } );
-        const buckets = revopData?.body?.aggregations?.type_counts?.buckets || [];
-
-        // Map OpenSearch revopsType values to count object keys
-        buckets.forEach( ( bucket ) => {
-          const revopsType = bucket.key?.toLowerCase();
-          const count = bucket.doc_count || 0;
-
-          // Map the revopsType to the correct count key
-          // Handle variations: duplicate, duplicateImages, duplicateimages
-          if ( revopsType === 'duplicate' ) {
-            if ( getCategory.hasOwnProperty( 'duplicateCount' ) ) {
-              getCategory.duplicateCount = count;
-            }
-          } else if ( revopsType === 'employee' ) {
-            if ( getCategory.hasOwnProperty( 'employeeCount' ) ) {
-              getCategory.employeeCount = count;
-            }
-          } else if ( revopsType === 'housekeeping' ) {
-            if ( getCategory.hasOwnProperty( 'houseKeepingCount' ) ) {
-              getCategory.houseKeepingCount = count;
-            }
-          } else if ( revopsType === 'junk' ) {
-            if ( getCategory.hasOwnProperty( 'junkCount' ) ) {
-              getCategory.junkCount = count;
-            }
+
+      const revopData = await getOpenSearchData( openSearch.revop, revopQuery );
+      const buckets = revopData?.body?.aggregations?.type_counts?.buckets || [];
+
+      // Map OpenSearch revopsType values to count object keys
+      buckets.forEach( ( bucket ) => {
+        const revopsType = bucket.key;
+        const count = bucket.doc_count || 0;
+
+
+        if ( Array.isArray( tempAcc ) ) {
+          // Find the tempAcc entry whose type (case-insensitive) matches revopsType
+          const accMatch = tempAcc.find(
+              ( acc ) =>
+                acc.type &&
+              acc.type === revopsType,
+          );
+
+          if ( accMatch && accMatch.key ) {
+            tempAcc.find( ( a ) => a.key === accMatch.key ).value = count;
           }
-        } );
-      } catch ( error ) {
-        logger.error( { error: error, message: 'Error fetching revop counts', function: 'footfallDirectoryTicket-ticketCreation' } );
-        // Continue with default 0 values if query fails
-      }
+        }
+      } );
     }
 
-    logger.info( { getCategory: getCategory } );
 
     // Calculate revisedFootfall: footfallCount - (sum of all counts)
-    const totalCount = ( getCategory.duplicateCount || 0 ) +
-                      ( getCategory.employeeCount || 0 ) +
-                      ( getCategory.houseKeepingCount || 0 ) +
-                      ( getCategory.junkCount || 0 );
+
+    const totalCount = Array.isArray( tempAcc ) ?
+      tempAcc.reduce( ( sum, acc ) => sum + ( acc.value || 0 ), 0 ) :
+      0;
     const footfallCount = hits?.[0]?._source?.footfall_count || 0;
-    logger.info( { footfallCount, totalCount } );
     const revisedFootfall = Math.max( 0, footfallCount - totalCount );
     if ( footfallCount - revisedFootfall == 0 ) {
       return res.sendError( 'Cannot create a ticket because footfall hasn’t changed', 400 );
@@ -400,7 +394,6 @@ export async function ticketCreation( req, res, next ) {
       return res.sendError( 'You don’t have any tagged images right now', 400 );
     }
     const formattedTaggingData = formatRevopTaggingHits( taggingImages );
-    logger.info( { revopTaggingData: formattedTaggingData } );
 
     const record = {
       storeId: inputData.storeId,
@@ -420,12 +413,13 @@ export async function ticketCreation( req, res, next ) {
           type: 'tagging',
           mode: inputData.mode,
           revicedFootfall: revisedFootfall,
-          count: getCategory,
+          count: tempAcc,
           revisedDetail: formattedTaggingData,
           status: 'raised',
           createdByEmail: req?.user?.email,
           createdByUserName: req?.user?.userName,
           createdByRole: req?.user?.role,
+          createdAt: new Date(),
         },
       ],
     };