case insensitive search for iapp v2 endpoint, also make sure site_id …

…column defaults to site id not short_id
bcgov · Oct 16, 2023 · 08980d8 · 08980d8
1 parent d752963
commit 08980d8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/api/src/paths/v2/iapp.ts b/api/src/paths/v2/iapp.ts
@@ -461,51 +461,43 @@ function whereStatement(sqlStatement: SQLStatement, filterObject: any) {
     switch (filter.field) {
       case 'site_id':
         where.append(
-          `and sites.site_id ${filter.operator === 'CONTAINS' ? 'like' : 'not like'} '%${filter.filter}%' `
+          `and LOWER((sites.site_id::text)) ${filter.operator === 'CONTAINS' ? 'like' : 'not like'} LOWER('%${filter.filter}%') `
         );
         break;
       case 'site_paper_file_id':
         where.append(
-          `and sites.site_paper_file_id ${filter.operator === 'CONTAINS' ? 'like' : 'not like'}  '%${filter.filter}%' `
+          `and LOWER(sites.site_paper_file_id) ${filter.operator === 'CONTAINS' ? 'like' : 'not like'}  LOWER('%${filter.filter}%') `
         );
         break;
       case 'jurisdictions_flattened':
         where.append(
-          `and sites.jurisdictions_flattened ${filter.operator === 'CONTAINS' ? 'like' : 'not like'}  '%${filter.filter}%' `
+          `and LOWER(sites.jurisdictions_flattened) ${filter.operator === 'CONTAINS' ? 'like' : 'not like'}  LOWER('%${filter.filter}%') `
         );
         break;
       case 'min_survey':
         where.append(
-          `and sites.min_survey ${filter.operator === 'CONTAINS' ? 'like' : 'not like'}  '%${
-            filter.filter
+          `and LOWER(sites.min_survey) ${filter.operator === 'CONTAINS' ? 'like' : 'not like'}  LOWER('%${ filter.filter
           }%' `
         );
         break;
       case 'all_species_on_site':
         where.append(
-          `and sites.all_species_on_site ${filter.operator === 'CONTAINS' ? 'like' : 'not like'}  '%${
-            filter.filter
-          }%' `
+          `and LOWER(sites.all_species_on_site) ${filter.operator === 'CONTAINS' ? 'like' : 'not like'}  LOWER('%${ filter.filter }%') `
         );
         break;
       case 'max_survey':
         where.append(
-          `and sites.max_survey ${filter.operator === 'CONTAINS' ? 'like' : 'not like'}  '%${
-            filter.filter
-          }%' `
+          `and LOWER(sites.max_survey) ${filter.operator === 'CONTAINS' ? 'like' : 'not like'}  LOWER('%${ filter.filter }%') `
         );
         break;
       case 'agencies':
         where.append(
-          `and sites.agencies ${filter.operator === 'CONTAINS' ? 'like' : 'not like'}  '%${
-            filter.filter
-          }%' `
+          `and LOWER(sites.agencies) ${filter.operator === 'CONTAINS' ? 'like' : 'not like'}  LOWER('%${ filter.filter }%') `
         );
         break;
       case 'has_biological_treatments':
-        where.append(
-          `and sites.has_biological_treatments ${filter.operator === 'CONTAINS' ? 'is not' : 'is'} null `
-        );
+        where.append( 
+          ` and LOWER(sites.has_biological_treatments) ${filter.operator === 'CONTAINS' ? 'is not' : 'is'} null `);
         break;
       case 'has_chemical_treatments':
         where.append(
@@ -535,12 +527,12 @@ function whereStatement(sqlStatement: SQLStatement, filterObject: any) {
         break;
       case 'regional_district':
         where.append(
-          `and sites.regional_district ${filter.operator === 'CONTAINS' ? 'like' : 'not like'}  '%${filter.filter}%' `
+          `and LOWER(sites.regional_district) ${filter.operator === 'CONTAINS' ? 'like' : 'not like'}  LOWER('%${filter.filter}%') `
         );
         break;
       case 'regional_invasive_species_organization':
         where.append(
-          `and sites.regional_invasive_species_organization ${filter.operator === 'CONTAINS' ? 'like' : 'not like'}  '%${filter.filter}%' `
+          `and LOWER(sites.regional_invasive_species_organization) ${filter.operator === 'CONTAINS' ? 'like' : 'not like'}  LOWER('%${filter.filter}%') `
         );
         break;
       default:

diff --git a/appv2/src/UI/Overlay/Records/RecordSet.tsx b/appv2/src/UI/Overlay/Records/RecordSet.tsx
@@ -42,6 +42,8 @@ export const RecordSet = (props) => {
     history.push('/Records');
   };
 
+  const tableType = userSettingsState?.recordSets?.[props.setID]?.recordSetType;
+
   switch (userSettingsState?.recordSets?.[props.setID]) {
     case undefined:
       return <></>;
@@ -101,7 +103,8 @@ export const RecordSet = (props) => {
                       type: RECORDSET_ADD_FILTER,
                       payload: {
                         filterType: 'tableFilter',
-                        field: 'short_id',
+                        // short id if activity record set otherwise site_ID
+                        field: tableType === 'Activity' ? 'short_id' : 'site_id' ,
                         setID: props.setID,
                         operator: 'CONTAINS',
                         blockFetchForNow: true