tango-app-api-infra 3.9.12 → 3.9.14

package/package.json

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

package/src/controllers/footfallDirectory.controllers.js

@@ -2603,7 +2603,7 @@ export async function ticketList( req, res ) {
         requestedSortType = 'approve';
       } else if ( inputData.sortBy === 'status' ) {
         sortKey = 'status';
-        requestedSortType =( req.user.userType === 'tango' && inputData.tangoType === 'store' )? 'tangorevirew' : inputData?.permissionType === 'review' ? 'review' : ( ticketsFeature && !ticketsApproveFeature )? 'review':'approve';
+        requestedSortType =( req.user.userType === 'tango' && inputData.tangoType === 'store' )? 'tangoreview' : inputData?.permissionType === 'review' ? 'review' : ( ticketsFeature && !ticketsApproveFeature )? 'review':'approve';
       } else if ( inputData.sortBy === 'comments' ) {
         sortKey = 'comments';
         requestedSortType = 'finalRevision';
@@ -2615,16 +2615,7 @@ export async function ticketList( req, res ) {
           { [sortField]: { order: sortOrder } },
         ];
       }
-      // else if ( inputData.sortBy === 'status' ) {
-      //   sortKey = 'status';
-      //   requestedSortType = inputData?.permissionType === 'review' ? 'review' : 'approve';
-      // } else if ( inputData.sortBy === 'status' ) {
-      //   sortKey = 'status';
-      //   requestedSortType = inputData?.permissionType === 'review' ? 'review' : 'approve';
-      // } else if ( inputData.sortBy === 'status' ) {
-      //   sortKey = 'status';
-      //   requestedSortType = inputData?.permissionType === 'review' ? 'review' : 'approve';
-      // }
+
 
       if ( requestedSortType ) {
         // const fallbackField = 'createdAt';
@@ -2727,48 +2718,84 @@ export async function ticketList( req, res ) {
               },
             ];
             break;
+            //           case 'revicedPerc':
+            //             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.revicedPerc != null) {
+            //           String value = item.revicedPerc.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 revicedPerc
+            //   if (params._source != null && params._source.revicedPerc != null) {
+            //     return params._source.revicedPerc.toString();
+            //   }
+
+            //   return "";
+            // `,
+            //                     params: {
+            //                       miType: requestedSortType,
+            //                     },
+            //                   },
+            //                   order: sortOrder,
+            //                 },
+            //               },
+            //             ];
+            //             break;
           case 'revicedPerc':
             searchQuery.sort = [
               {
                 _script: {
-                  type: 'string',
+                  type: 'number',
+                  order: sortOrder,
                   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.revicedPerc != null) {
-          String value = item.revicedPerc.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 revicedPerc
-  if (params._source != null && params._source.revicedPerc != null) {
-    return params._source.revicedPerc.toString();
-  }
+            try {
+              if (params._source != null && params._source.mappingInfo != null) {
+                for (def item : params._source.mappingInfo) {
+                  if (item != null &&
+                      item.type == params.miType &&
+                      item.revicedPerc != null) {
+
+                    String p = item.revicedPerc.toString().replace('%', '').trim();
+                    if (p.length() > 0) {
+                      return Double.parseDouble(p);
+                    }
+                  }
+                }
+              }
+            } catch (Exception e) {}
 
-  return "";
-`,
+            // IMPORTANT: return null-equivalent for missing types
+            return -1;
+          `,
                     params: {
                       miType: requestedSortType,
                     },
                   },
-                  order: sortOrder,
                 },
               },
             ];
@@ -3867,30 +3894,10 @@ export async function ticketList( req, res ) {
               'Ticket ID': item?.ticketId,
               'Store Name': item?.storeName,
               'Store ID': item?.storeId,
-              'Ticket Raised': item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.createdAt ? dayjs( item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.createdAt ).format( 'DD MMM, YYYY' ) : '',
+              'Ticket Raised': item?.createdAt ? dayjs( item?.createdAt ).format( 'DD MMM, YYYY' ) : '',
               'Issue Date': item?.dateString ? dayjs( item.dateString ).format( 'DD MMM, YYYY' ) : '',
               'Ticket Type': item?.type,
               'Actual FF': item?.footfallCount,
-
-              'Due Date (Formatted)': ( () => {
-                if ( Array.isArray( item?.mappingInfo ) ) {
-                  // Find last mappingInfo whose type is NOT 'finalRevison'
-                  const filtered = item.mappingInfo.filter(
-                      ( f ) => f.dueDate && f.type !== 'finalRevison',
-                  );
-                  if ( filtered.length > 0 ) {
-                    const lastDueDate = filtered[filtered.length - 1].dueDate;
-                    if ( lastDueDate ) {
-                      if ( dayjs( lastDueDate ).isSame( dayjs(), 'day' ) ) {
-                        return 'Due Today';
-                      }
-                      return dayjs( lastDueDate ).format( 'DD MMM, YYYY' );
-                    }
-                  }
-                }
-                return '';
-              } )(),
-
               'Store (Accuracy%)': item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.revicedPerc || '--',
               'Reviewer (Accuracy%)': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.revicedPerc || '--',
               'Approver (Accuracy%)': item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.revicedPerc || '--',
@@ -3908,16 +3915,9 @@ export async function ticketList( req, res ) {
               ticketId: item?.ticketId,
               storeId: item?.storeId,
               storeName: item?.storeName,
-              ticketRaised: item?.type==='store'? item?.mappingInfo?.find( ( f ) => f?.type === 'tagging' )?.createdAt:item?.createdAt,
+              ticketRaised: item?.createdAt,
               issueDate: item?.dateString,
               footfall: item?.footfallCount,
-              dueDate: ( () => {
-                if ( Array.isArray( item?.mappingInfo ) ) {
-                  const filtered = item.mappingInfo.filter( ( f ) => f?.dueDate && f?.type !== 'finalRevisoon' );
-                  return filtered.length > 0 ? filtered[filtered.length - 1].dueDate : '';
-                }
-                return '';
-              } )(),
               type: item?.type || 'store',
               storeRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.revicedPerc || '--',
               reviewerRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.revicedPerc || '--',