tango-app-api-infra 3.9.8 → 3.9.10

package/package.json

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

package/src/controllers/footfallDirectory.controllers.js

@@ -2570,13 +2570,11 @@ export async function ticketList( req, res ) {
     if ( inputData.sortBy ) {
       let sortOrder = inputData.sortOrder === 1 ? 'asc' : 'desc';
       const stringKeywordFields = [ 'storeName', 'storeId', 'ticketId', 'status', 'type', 'clientId' ];
-      let sortField = inputData.sortBy == 'footfall' ? 'footfallCount' : inputData.sortBy == 'issueDate' ? 'dateString' : inputData.sortBy;
+      let sortField = inputData.sortBy == 'footfall' ? 'footfallCount' : inputData.sortBy == 'issueDate' ? 'dateString': inputData.sortBy == 'tangoStatus'? 'status' : inputData.sortBy;
       if ( stringKeywordFields.includes( sortField ) ) {
         sortField = `${sortField}.keyword`;
       }
-      // sortBy mappingInfo.createdAt for types "review", "approve", "tagging" based on user permission
-      // If sortBy is 'reviewedOn', 'approvedOn', or 'taggedOn', sort by mappingInfo[?].createdAt where type matches the right value
-      // fallback: newest item with correct mappingInfo.type for each ticket
+
       let requestedSortType = null;
       let sortKey = null;
       if ( inputData.sortBy === 'ticketRaised' ) {
@@ -2606,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 } },
@@ -2863,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