BugFix: Make Environments Case Insensitive in Observations Import (#1448

) fix case sensitivity of environments & environment validate sql
bcgov · Dec 7, 2024 · c8dfb81 · c8dfb81
1 parent 662ae2f
commit c8dfb81
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 13 deletions.
diff --git a/api/src/repositories/observation-subcount-environment-repository.ts b/api/src/repositories/observation-subcount-environment-repository.ts
@@ -354,10 +354,19 @@ export class ObservationSubCountEnvironmentRepository extends BaseRepository {
         'environment_qualitative.environment_qualitative_id'
       );
 
+    const searchConditions = [];
+
     for (const searchTerm of searchTerms) {
-      queryBuilder
-        .where('environment_qualitative.name', 'ILIKE', `%${searchTerm}%`)
-        .orWhere('environment_qualitative.description', 'ILIKE', `%${searchTerm}%`);
+      searchConditions.push(
+        knex.raw('environment_qualitative.name ILIKE ? OR environment_qualitative.description ILIKE ?', [
+          `%${searchTerm}%`,
+          `%${searchTerm}%`
+        ])
+      );
+    }
+
+    if (searchConditions.length > 0) {
+      queryBuilder.whereRaw(searchConditions.join(' OR '));
     }
 
     queryBuilder.groupBy(
@@ -381,7 +390,9 @@ export class ObservationSubCountEnvironmentRepository extends BaseRepository {
   async findQuantitativeEnvironmentTypeDefinitions(
     searchTerms: string[]
   ): Promise<QuantitativeEnvironmentTypeDefinition[]> {
-    const queryBuilder = getKnex()
+    const knex = getKnex();
+
+    const queryBuilder = knex
       .select(
         'environment_quantitative.environment_quantitative_id',
         'environment_quantitative.name',
@@ -392,10 +403,19 @@ export class ObservationSubCountEnvironmentRepository extends BaseRepository {
       )
       .from('environment_quantitative');
 
+    const searchConditions = [];
+
     for (const searchTerm of searchTerms) {
-      queryBuilder
-        .where('environment_quantitative.name', 'ILIKE', `%${searchTerm}%`)
-        .orWhere('environment_quantitative.description', 'ILIKE', `%${searchTerm}%`);
+      searchConditions.push(
+        knex.raw('environment_quantitative.name ILIKE ? OR environment_quantitative.description ILIKE ?', [
+          `%${searchTerm}%`,
+          `%${searchTerm}%`
+        ])
+      );
+    }
+
+    if (searchConditions.length > 0) {
+      queryBuilder.whereRaw(searchConditions.join(' OR '));
     }
 
     const response = await this.connection.knex(queryBuilder, QuantitativeEnvironmentTypeDefinition);

diff --git a/api/src/services/observation-service.ts b/api/src/services/observation-service.ts
@@ -834,7 +834,7 @@ export class ObservationService extends DBService {
 
       // if environment is qualitative, find the option id
       if (isEnvironmentQualitativeTypeDefinition(environment)) {
-        const foundOption = environment.options.find((option) => option.name === String(rowData));
+        const foundOption = environment.options.find((option) => option.name === String(rowData).toLowerCase());
 
         if (!foundOption) {
           return;

diff --git a/api/src/utils/observation-xlsx-utils/environment-column-utils.test.ts b/api/src/utils/observation-xlsx-utils/environment-column-utils.test.ts
@@ -191,7 +191,7 @@ describe('environment-column-utils', () => {
               {
                 environment_qualitative_id: '22-123-456',
                 environment_qualitative_option_id: '33-123-456',
-                name: 'Low',
+                name: 'Low'.toLowerCase(),
                 description: 'Low'
               }
             ]
@@ -207,7 +207,7 @@ describe('environment-column-utils', () => {
               {
                 environment_qualitative_id: '44-123-456',
                 environment_qualitative_option_id: '55-123-456',
-                name: 'North',
+                name: 'North'.toLowerCase(),
                 description: 'North'
               }
             ]
@@ -270,6 +270,7 @@ describe('environment-column-utils', () => {
           value: 100
         }
       ];
+
       const environmentNameTypeDefinitionMap: EnvironmentNameTypeDefinitionMap = new Map([
         [
           'Wind Speed',
@@ -281,7 +282,8 @@ describe('environment-column-utils', () => {
               {
                 environment_qualitative_id: '22-123-456',
                 environment_qualitative_option_id: '33-123-456',
-                name: 'Low',
+                // Name is made lowercase at this point in the code
+                name: 'low',
                 description: 'Low'
               }
             ]
@@ -330,7 +332,8 @@ describe('environment-column-utils', () => {
               {
                 environment_qualitative_id: '22-123-456',
                 environment_qualitative_option_id: '33-123-456',
-                name: 'Low',
+                // Name is made lowercase at this point in the code
+                name: 'low',
                 description: 'Low'
               }
             ]

diff --git a/api/src/utils/observation-xlsx-utils/environment-column-utils.ts b/api/src/utils/observation-xlsx-utils/environment-column-utils.ts
@@ -60,7 +60,13 @@ export function getEnvironmentColumnsTypeDefinitionMap(
     const qualitativeEnvironment = environmentTypeDefinitions.qualitative_environments.find(
       (item) => item.name.toLowerCase() === columnName.toLowerCase()
     );
+
     if (qualitativeEnvironment) {
+      // Lowercase the options for comparison
+      qualitativeEnvironment.options = qualitativeEnvironment.options.map((option) => ({
+        ...option,
+        name: option.name.toLowerCase()
+      }));
       columnNameDefinitionMap.set(columnName, qualitativeEnvironment);
       continue;
     }
@@ -104,7 +110,7 @@ export function validateEnvironments(
 
     if (isEnvironmentQualitativeTypeDefinition(environmentDefinition)) {
       return isQualitativeValueValid(
-        String(environmentToValidate.value),
+        String(environmentToValidate.value).toLowerCase(),
         environmentDefinition.options.map((option) => option.name)
       );
     }