tango-app-api-infra 3.9.9 → 3.9.11

package/package.json

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

package/src/controllers/footfallDirectory.controllers.js

@@ -2604,6 +2604,12 @@ export async function ticketList( req, res ) {
       } else if ( inputData.sortBy === 'status' ) {
         sortKey = 'status';
         requestedSortType =( req.user.userType === 'tango' && inputData.tangoType === 'store' )? 'tangorevirew' : inputData?.permissionType === 'review' ? 'review' : ( ticketsFeature && !ticketsApproveFeature )? 'review':'approve';
+      } else if ( inputData.sortBy === 'comments' ) {
+        sortKey = 'comments';
+        requestedSortType = 'finalRevision';
+      } else if ( inputData.sortBy === 'subComments' ) {
+        sortKey = 'subComments';
+        requestedSortType ='finalRevision';
       } else {
         searchQuery.sort = [
           { [sortField]: { order: sortOrder } },
@@ -2861,20 +2867,100 @@ export async function ticketList( req, res ) {
               },
             ];
             break;
+          case 'comments':
+            searchQuery.sort = [
+              {
+                _script: {
+                  type: 'string',
+                  script: {
+                    lang: 'painless',
+                    source: `
+    try {
+      if (params._source != null && params._source.mappingInfo != null) {
+        String found = null;
+  
+        for (def item : params._source.mappingInfo) {
+          if (item != null && item.type == params.miType && item.comments != null) {
+            String value = item.comments.toString();
+  
+            if (found == null || value.compareTo(found) > 0) {
+              found = value;
+            }
+          }
+        }
+  
+        if (found != null) {
+          return found;
+        }
+      }
+    } catch (Exception e) {
+      // ignore and fallback
+    }
+  
+    // fallback to root-level comments
+    if (params._source != null && params._source.comments != null) {
+      return params._source.comments.toString();
+    }
+  
+    return "";
+  `,
+                    params: {
+                      miType: requestedSortType,
+                    },
+                  },
+                  order: sortOrder,
+                },
+              },
+            ];
+            break;
+          case 'subComments':
+            searchQuery.sort = [
+              {
+                _script: {
+                  type: 'string',
+                  script: {
+                    lang: 'painless',
+                    source: `
+      try {
+        if (params._source != null && params._source.mappingInfo != null) {
+          String found = null;
+    
+          for (def item : params._source.mappingInfo) {
+            if (item != null && item.type == params.miType && item.subComments != null) {
+              String value = item.subComments.toString();
+    
+              if (found == null || value.compareTo(found) > 0) {
+                found = value;
+              }
+            }
+          }
+    
+          if (found != null) {
+            return found;
+          }
+        }
+      } catch (Exception e) {
+        // ignore and fallback
+      }
+    
+      // fallback to root-level subComments
+      if (params._source != null && params._source.subComments != null) {
+        return params._source.subComments.toString();
+      }
+    
+      return "";
+    `,
+                    params: {
+                      miType: requestedSortType,
+                    },
+                  },
+                  order: sortOrder,
+                },
+              },
+            ];
+            break;
         }
       }
-
-
-      // else {
-      //   if ( stringKeywordFields.includes( sortField ) ) {
-      //     sortField = `${sortField}.keyword`;
-      //   }
-      // }
-
-      logger.info( { requestedSortType, msg: '......1' } );
-      // Remove default sort so we don't duplicate/conflict
-
-      logger.info( { searchQuery, msg: '......2' } );
     }
 
     // Example: Filtering by storeId if present in the query
@@ -3759,13 +3845,7 @@ export async function ticketList( req, res ) {
               'storeName': item?.storeName,
               'ticketRaised': item?.mappingInfo?.find( ( f ) => f?.type === 'tangoreview' )?.createdAt,
               'issueDate': item?.dateString,
-              'dueDate': ( () => {
-                if ( Array.isArray( item?.mappingInfo ) ) {
-                  const filtered = item.mappingInfo.filter( ( f ) => f?.dueDate && f?.type !== 'tangoreview' );
-                  return filtered.length > 0 ? filtered[filtered.length - 1].dueDate : '';
-                }
-                return '';
-              } )(),
+              'dueDate': item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.dueDate,
               'footfall': item?.footfallCount,
               'storeRevisedAccuracy': item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.revicedPerc || '--',
               'reviewerRevisedAccuracy': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.revicedPerc || '--',