Merge pull request #39 from alpha-canada-ca/fix/tss-department-removal

Fix: tss department removal of INFC and replace with HICC / LICC

Author: nusyedkazi

src/main/java/ca/gc/tbs/controller/TopTaskController.java

@@ -244,17 +244,17 @@ public class TopTaskController {
     institutionMappings.put(
         "HC", Arrays.asList("HC", "SC", "HEALTH CANADA", "SANTÉ CANADA", "HC / SC"));
     institutionMappings.put(
-        "HICC",
+        "INFC",
         Arrays.asList(
             "HICC",
             "LICC",
             "HOUSING, INFRASTRUCTURE AND COMMUNITIES CANADA",
             "LOGEMENT, INFRASTRUCTURES ET COLLECTIVITÉS CANADA",
+            "INFC / INFC",
+            "INFC",
+            "INFRASTRUCTURE CANADA",
+            "INFRASTRUCTURE CANADA",
             "HICC / LICC"));
-      institutionMappings.put(
-              "INFC",
-              Arrays.asList(
-                      "INFC", "INFC", "INFRASTRUCTURE CANADA", "INFRASTRUCTURE CANADA", "INFC / INFC"));
     institutionMappings.put(
         "IOGC",
         Arrays.asList(
@@ -1112,9 +1112,25 @@ public ResponseEntity<?> getProblemsJson(
   }
 
   private Criteria applyDepartmentFilter(Criteria criteria, String department) {
-    // First try direct case-insensitive match for exact database values
+    List<String> variations = new ArrayList<>();
+      for (Map.Entry<String, List<String>> entry : institutionMappings.entrySet()) {
+          List<String> mappingValues = entry.getValue();
+          if (mappingValues.stream().anyMatch(v -> v.equalsIgnoreCase(department))) {
+              variations.addAll(mappingValues);
+              break;
+          }
+      }
+      if (variations.isEmpty()) {
     criteria.and("dept").regex("^" + Pattern.quote(department) + "$", "i");
-    return criteria;
+      } else {
+          List<Criteria> deptCriteria = new ArrayList<>();
+          for (String variation :  variations) {
+              deptCriteria.add(Criteria.where("dept").regex("^" + Pattern.quote(variation) + "$", "i"));
+          }
+          criteria.orOperator(deptCriteria.toArray(new Criteria[0]));
+      }
+
+      return criteria;
   }
 
   @GetMapping(value = "/topTaskSurvey")

src/main/resources/templates/department_datalist.html

@@ -485,6 +485,7 @@
 		Groupe consultatif sur la conduite respionsable de la recherche</option>
 	<option value="Le projet des centres d'opérations de sécurité maritimet">Le
 		projet des centres d'opérations de sécurité maritimet</option>
+    <option value="Logement, Infrastructures et Collectivités Canada">Logement, Infrastructures et Collectivités Canada</option>
 	<option value="Marine royale canadienne">Marine
 		royale canadienne</option>
 	<option value="Mesures Canada">Mesures Canada</option>