tango-app-api-infra 3.9.21 → 3.9.23

package/package.json

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

package/src/controllers/footfallDirectory.controllers.js

@@ -2611,7 +2611,7 @@ 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 == 'tangoStatus'? 'status' : inputData.sortBy;
+      let sortField = inputData.sortBy == 'footfall' ? 'footfallCount' :inputData.sortBy == 'revisedFF' ? 'revicedFootfall' : inputData.sortBy == 'issueDate' ? 'dateString': inputData.sortBy == 'tangoStatus'? 'status' : inputData.sortBy;
       if ( stringKeywordFields.includes( sortField ) ) {
         sortField = `${sortField}.keyword`;
       }
@@ -2624,6 +2624,9 @@ export async function ticketList( req, res ) {
       } else if ( inputData.sortBy === 'dueDate' ) {
         sortKey = 'dueDate';
         requestedSortType =( req.user.userType === 'tango' && inputData.tangoType === 'store' )? 'tangoreview' : inputData?.permissionType === 'review' ? 'review' : ( ticketsFeature && !ticketsApproveFeature )? 'review':'approve';
+      } else if ( inputData.sortBy === 'closedDate' ) {
+        sortKey = 'updatedAt';
+        requestedSortType =( req.user.userType === 'tango' && inputData.tangoType === 'store' )? 'tangoreview' : inputData?.permissionType === 'review' ? 'review' : ( ticketsFeature && !ticketsApproveFeature )? 'review':'approve';
       } else if ( inputData.sortBy === 'storeRevisedAccuracy' ) {
         sortKey = 'revicedPerc';
         requestedSortType = 'tagging';
@@ -2645,6 +2648,9 @@ export async function ticketList( req, res ) {
       } else if ( inputData.sortBy === 'ticketBy' ) {
         sortKey = 'createdByEmail';
         requestedSortType = 'tangoreview';
+      } else if ( inputData.sortBy === 'ticketCreatedBy' ) {
+        sortKey = 'createdByEmail';
+        requestedSortType = 'tagging';
       } else if ( inputData.sortBy === 'status' ) {
         sortKey = 'status';
         requestedSortType =( req.user.userType === 'tango' && inputData.tangoType === 'store' )? 'tangoreview' : inputData?.permissionType === 'review' ? 'review' : ( ticketsFeature && !ticketsApproveFeature )? 'review':'approve';
@@ -2713,6 +2719,55 @@ export async function ticketList( req, res ) {
               },
             ];
             break;
+          case 'updatedAt':
+            searchQuery.sort = [
+              {
+                _script: {
+                  type: 'number',
+                  script: {
+                    lang: 'painless',
+                    source: `
+                        try {
+                          if (params['_source']['mappingInfo'] != null) {
+                            def found = null;
+                            for (item in params['_source']['mappingInfo']) {
+                              if (item != null && item['type'] == params['miType'] && item['updatedAt'] != null) {
+                                def millis = 0;
+                                if (item['updatedAt'] instanceof String) {
+                                  // If string, attempt Date conversion (ISO8601)
+                                  millis = ZonedDateTime.parse(item['updatedAt']).toInstant().toEpochMilli();
+                                } else if (item['updatedAt'] instanceof def && item['updatedAt'].getMillis != null) {
+                                  millis = item['updatedAt'].getMillis();
+                                }
+                                if (found == null || millis > found) {
+                                  found = millis;
+                                }
+                              }
+                            }
+                            if (found != null) return found;
+                          }
+                        } catch (Exception e) {
+                          // Fallback below
+                        }
+                        // fallback: return record 
+                        if (params['_source']['updatedAt'] != null) {
+                          if (params['_source']['updatedAt'] instanceof String) {
+                            return ZonedDateTime.parse(params['_source']['updatedAt']).toInstant().toEpochMilli();
+                          } else if (params['_source']['updatedAt'] instanceof def && params['_source']['updatedAt'].getMillis != null) {
+                            return params['_source']['updatedAt'].getMillis();
+                          }
+                        }
+                        return 0;
+                      `,
+                    params: {
+                      miType: requestedSortType,
+                    },
+                  },
+                  order: sortOrder,
+                },
+              },
+            ];
+            break;
           case 'dueDate':
             searchQuery.sort = [
               {
@@ -4167,7 +4222,7 @@ export async function ticketList( req, res ) {
               storeRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.revicedPerc || '--',
               reviewerRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.revicedPerc || '--',
               ...( isApprover !== true? item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.revicedPerc : '' ),
-              revicedFF: item.status === 'Closed' || item.status === 'Tango Review Done' ?item?.revicedFootfall : '--',
+              revisedFF: item.status === 'Closed' || item.status === 'Tango Review Done' ?item?.revicedFootfall : '--',
 
               status: item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.status || '--',
               closedDate: item.status === 'Closed' || item.status === 'Tango Review Done' ? item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.updatedAt : '--',
@@ -4285,7 +4340,7 @@ export async function ticketList( req, res ) {
               storeRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.revicedPerc || '--',
               reviewerRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.revicedPerc || '--',
               ...( isApprover !== true? tangoRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.revicedPerc || '' ),
-              revicedFF: item.status === 'Closed' || item.status === 'Tango Review Done' ?item?.revicedFootfall : '--',
+              revisedFF: item.status === 'Closed' || item.status === 'Tango Review Done' ?item?.revicedFootfall : '--',
 
               status: item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.status || '--',
               closedDate: item.status === 'Closed' || item.status === 'Tango Review Done' ? item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.updatedAt : '--',