Merge pull request #5338 from bcgov/dev-rook-NK-FOIMOD-3184

minor bug fix for historical search sorting
bcgov · Jul 24, 2024 · e1736cc · e1736cc
2 parents 2aabf55 + ab18bd1
commit e1736cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/forms-flow-web/src/apiManager/services/FOI/foiHistoricalSearchServices.js b/forms-flow-web/src/apiManager/services/FOI/foiHistoricalSearchServices.js
@@ -26,10 +26,6 @@ export const fetchHistoricalSearchData = ({
   //   sortingOrders.push(item.sort);
   // });
 
-  if (sort[0].field === 'axisrequestid') {
-    sort[0].field = 'visualrequestfilenumber'
-  }
-
   httpGETRequest(
     API.FOI_HISTORICAL_SEARCH_API,
     {

diff --git a/historical-search-api/request_api/models/factRequestDetails.py b/historical-search-api/request_api/models/factRequestDetails.py
@@ -205,6 +205,11 @@ def getadvancedsearchresults(cls,isiaorestictedmanager:False, params):
             if(isiaorestictedmanager == False):
                 basequery+= " AND requesttypename NOT LIKE '%Restricted%'"
 
+            if params['sortingitem'] == 'axisrequestid':
+                params['sortingitem'] = 'visualrequestfilenumber'
+            elif params['sortingitem'] == 'requesttype':                
+                params['sortingitem'] = 'requesttype'
+
             basequery+= ' ORDER BY {0} {1}'.format(params['sortingitem'],params['sortingorder'])
 
             if params['size'] is not None: