Merge pull request ytgov#102 from icefoganalytics/main

Fixing ILIKE

Author: datajohnson

api/src/routes/hazard-router.ts

@@ -35,8 +35,8 @@ hazardRouter.get("/", async (req: Request, res: Response) => {
     countQuery.where("location_code", location);
   }
   if (!isNil(category)) {
-    listQuery.whereILike("categories", `%${category}%`);
-    countQuery.whereILike("categories", `%${category}%`);
+    listQuery.whereRaw(`"categories" like '%${category}%'`);
+    countQuery.whereRaw(`"categories" like '%${category}%'`);
   }
 
   const count = await countQuery.count("* as count").first();

api/src/services/incident-service.ts

@@ -26,7 +26,9 @@ export class IncidentService {
       .innerJoin("incident_types", "incident_types.id", "incidents.incident_type_id")
       .innerJoin("incident_statuses", "incident_statuses.code", "incidents.status_code")
       .innerJoin("departments", "departments.code", "incidents.department_code")
-      .whereRaw(`"incidents"."id" IN (SELECT "incident_id" FROM "incident_users_view" WHERE "user_email" = ?)`, [email])
+      .whereRaw(`"incidents"."id" IN (SELECT "incident_id" FROM "incident_users_view" WHERE LOWER("user_email") = ?)`, [
+        email.toLowerCase(),
+      ])
       .whereNot("incident_types.name", "inspection")
       .modify(where)
       .count("* as count")
@@ -46,7 +48,9 @@ export class IncidentService {
       .innerJoin("incident_statuses", "incident_statuses.code", "incidents.status_code")
       .innerJoin("departments", "departments.code", "incidents.department_code")
       .innerJoin("locations", "incidents.location_code", "locations.code")
-      .whereRaw(`"incidents"."id" IN (SELECT "incident_id" FROM "incident_users_view" WHERE "user_email" = ?)`, [email])
+      .whereRaw(`"incidents"."id" IN (SELECT "incident_id" FROM "incident_users_view" WHERE LOWER("user_email") = ?)`, [
+        email.toLowerCase(),
+      ])
       .whereNot("incident_types.name", "inspection")
       .select<Incident>(
         "incidents.*",
@@ -110,14 +114,14 @@ export class IncidentService {
 
   async getByReportingEmail(email: string): Promise<Incident[]> {
     return db<Incident>("incidents")
-      .whereILike("incident_users_view.user_email", email.toLowerCase())
       .where("incident_users_view.reason", "reporter")
       .whereNotIn("status_code", ["Closed", "Dup", "NoAct"])
       .whereNot("incident_types.name", "inspection")
       .innerJoin("incident_users_view", "incidents.id", "incident_users_view.incident_id")
       .innerJoin("incident_types", "incident_types.id", "incidents.incident_type_id")
       .innerJoin("incident_statuses", "incident_statuses.code", "incidents.status_code")
       .innerJoin("departments", "departments.code", "incidents.department_code")
+      .whereRaw(`LOWER("incident_users_view"."user_email") = '${email.toLowerCase()}'`)
       .select(
         "incidents.*",
         "incident_types.name as incident_type_name",
@@ -129,14 +133,14 @@ export class IncidentService {
 
   async getBySupervisorEmail(email: string): Promise<Incident[]> {
     return db<Incident>("incidents")
-      .whereILike("incident_users_view.user_email", email.toLowerCase())
       .where("incident_users_view.reason", "supervisor")
       .whereNot("incident_types.name", "inspection")
       .whereNotIn("status_code", ["Closed", "Dup", "NoAct"])
       .innerJoin("incident_users_view", "incidents.id", "incident_users_view.incident_id")
       .innerJoin("incident_types", "incident_types.id", "incidents.incident_type_id")
       .innerJoin("incident_statuses", "incident_statuses.code", "incidents.status_code")
       .innerJoin("departments", "departments.code", "incidents.department_code")
+      .whereRaw(`LOWER("incident_users_view"."user_email") = '${email.toLowerCase()}'`)
       .select(
         "incidents.*",
         "incident_types.name as incident_type_name",

web/src/components/report/ReportListPage.vue

@@ -20,19 +20,16 @@
         <v-col cols="12" md="2">
           <HazardUrgencySelect v-model="urgency" label="Urgency" clearable />
         </v-col>
-        <v-col cols="12" md="3">
+        <v-col cols="12" md="4" class="d-flex">
           <LocationSelect v-model="location" label="Location" clearable />
-        </v-col>
-        <v-col cols="12" md="auto" class="d-flex justify-end">
           <v-btn
             icon="mdi-table-arrow-down"
-            class="my-0"
+            class="my-0 ml-3"
             size="50"
             title="Export to CSV"
-            variant="tonal"
+            variant="flat"
             color="primary"
-            @click="csvExportClick"
-        ></v-btn>
+            @click="csvExportClick"></v-btn>
         </v-col>
       </v-row>
 
@@ -125,7 +122,7 @@ async function csvExportClick() {
     status: status.value,
     urgency: urgency.value,
     location: location.value,
-  })
+  });
 }
 
 function updatePage(newPage) {