Merge branch 'ytgov:main' into main

Author: datajohnson

api/src/routes/directory-router.ts

@@ -14,7 +14,7 @@ directoryRouter.post(
     const results = await unifiedDirectory.search(terms);
 
     return res.json({ data: results });
-  }
+  },
 );
 
 directoryRouter.post(
@@ -33,16 +33,16 @@ directoryRouter.post(
 
     for (const part of parts) {
       allUsersQuery.whereRaw(
-        `(LOWER("email") LIKE '${part}%' OR LOWER("first_name") LIKE '${part}%' OR LOWER("last_name") LIKE '${part}%')`
+        `(LOWER("email") LIKE '${part}%' OR LOWER("first_name") LIKE '${part}%' OR LOWER("last_name") LIKE '${part}%')`,
       );
     }
 
     let allUsers = await allUsersQuery;
     data.map(
-      (d: any) => (d.user_id = allUsers.find((u) => u.email == d.email)?.id)
+      (d: any) => (d.user_id = allUsers.find((u) => u.email == d.email)?.id),
     );
     yesnetResults.map(
-      (d: any) => (d.user_id = allUsers.find((u) => u.email == d.email)?.id)
+      (d: any) => (d.user_id = allUsers.find((u) => u.email == d.email)?.id),
     );
 
     const combinedData = [...data, ...yesnetResults];
@@ -68,7 +68,7 @@ directoryRouter.post(
     }
 
     return res.json({ data: combinedData });
-  }
+  },
 );
 
 directoryRouter.post(
@@ -104,7 +104,7 @@ directoryRouter.post(
 
     if (data.length > 0) {
       data.map(
-        (d: any) => (d.user_id = allUsers.find((u) => u.email == d.email)?.id)
+        (d: any) => (d.user_id = allUsers.find((u) => u.email == d.email)?.id),
       );
     } else {
       const nonDirectoryUser = allUsers.find((u) => u.email == terms);
@@ -127,5 +127,5 @@ directoryRouter.post(
     }
 
     return res.json({ data });
-  }
+  },
 );

api/src/routes/offline-report-router.ts

@@ -2,7 +2,13 @@ import express, { Request, Response } from "express";
 import { isArray } from "lodash";
 
 import { db as knex } from "../data/db-client";
-import { DepartmentService, UnifiedDirectoryService, EmailService, IncidentService, UserService } from "../services";
+import {
+  DepartmentService,
+  UnifiedDirectoryService,
+  EmailService,
+  IncidentService,
+  UserService,
+} from "../services";
 import {
   Hazard,
   HazardStatuses,
@@ -28,7 +34,15 @@ const userService = new UserService();
 offlineReportRouter.post("/", async (req: Request, res: Response) => {
   req.body.status = "Initial Report";
 
-  let { date, eventType, description, location_code, location_detail, supervisor_email, urgency } = req.body;
+  let {
+    date,
+    eventType,
+    description,
+    location_code,
+    location_detail,
+    supervisor_email,
+    urgency,
+  } = req.body;
 
   let currentUserEmail = req.body.on_behalf_email;
   let currentUserId = 1;
@@ -66,20 +80,30 @@ offlineReportRouter.post("/", async (req: Request, res: Response) => {
 
   const reporting_person_email = req.body.email;
 
-  const defaultHazardType = await knex("hazard_types").orderBy("id").select("id").first();
-  const defaultIncidentType = await knex("incident_types").where({ name: eventType }).select("id").first();
+  const defaultHazardType = await knex("hazard_types")
+    .orderBy("id")
+    .select("id")
+    .first();
+  const defaultIncidentType = await knex("incident_types")
+    .where({ name: eventType })
+    .select("id")
+    .first();
   const department = await new DepartmentService().determineDepartment(
-    reporting_person_email,
-    supervisor_email,
-    location_code
+    [reporting_person_email, supervisor_email],
+    location_code,
   );
 
   await directoryService.connect();
-  const directorySubmitter = await directoryService.searchByEmail(reporting_person_email);
-  const directorySupervisor = await directoryService.searchByEmail(supervisor_email);
+  const directorySubmitter = await directoryService.searchByEmail(
+    reporting_person_email,
+  );
+  const directorySupervisor =
+    await directoryService.searchByEmail(supervisor_email);
 
   const employeeName =
-    directorySubmitter && directorySubmitter[0] ? directorySubmitter[0].display_name : reporting_person_email;
+    directorySubmitter && directorySubmitter[0]
+      ? directorySubmitter[0].display_name
+      : reporting_person_email;
 
   const trx = await knex.transaction();
 
@@ -102,15 +126,28 @@ offlineReportRouter.post("/", async (req: Request, res: Response) => {
       source: "offline",
     } as Incident;
 
-    const insertedIncidents = await trx("incidents").insert(incident).returning("*");
+    const insertedIncidents = await trx("incidents")
+      .insert(incident)
+      .returning("*");
     let insertedIncidentId = insertedIncidents[0].id;
 
     let steps = new Array<string>();
 
     if (eventType == "hazard") {
-      steps = ["Hazard Identified", "Assessment of Hazard", "Control the Hazard", "Employee Notification"];
+      steps = [
+        "Hazard Identified",
+        "Assessment of Hazard",
+        "Control the Hazard",
+        "Employee Notification",
+      ];
     } else {
-      steps = ["Incident Reported", "Investigation", "Control Plan", "Controls Implemented", "Employee Notification"];
+      steps = [
+        "Incident Reported",
+        "Investigation",
+        "Control Plan",
+        "Controls Implemented",
+        "Employee Notification",
+      ];
     }
 
     for (let i = 1; i <= steps.length; i++) {
@@ -134,25 +171,31 @@ offlineReportRouter.post("/", async (req: Request, res: Response) => {
 
     if (directorySubmitter && directorySubmitter.length > 0) {
       await emailService.sendIncidentEmployeeNotification(
-        { fullName: directorySubmitter[0].display_name, email: reporting_person_email },
+        {
+          fullName: directorySubmitter[0].display_name,
+          email: reporting_person_email,
+        },
         employeeName,
-        insertedIncidents[0]
+        insertedIncidents[0],
       );
 
       if (currentUserEmail != reporting_person_email) {
         await emailService.sendIncidentReporterNotification(
           { fullName: currentUserName, email: currentUserEmail },
           employeeName,
-          insertedIncidents[0]
+          insertedIncidents[0],
         );
       }
     }
 
     if (directorySupervisor && directorySupervisor.length > 0) {
       await emailService.sendIncidentSupervisorNotification(
-        { fullName: directorySupervisor[0].display_name, email: supervisor_email },
+        {
+          fullName: directorySupervisor[0].display_name,
+          email: supervisor_email,
+        },
         employeeName,
-        insertedIncidents[0]
+        insertedIncidents[0],
       );
     }
 

api/src/routes/report-router.ts

@@ -319,23 +319,34 @@ reportRouter.post("/", async (req: Request, res: Response) => {
     additional_people,
   } = req.body;
 
-  const reporting_person_email =
-    on_behalf == "Yes" ? on_behalf_email : req.user.email;
+  let reporting_person_email = req.user.email;
+
+  await directoryService.connect();
+
+  if (on_behalf == "Yes") {
+    const directoryOnBehalf = await directoryService.search(on_behalf_email);
+
+    if (directoryOnBehalf && directoryOnBehalf.length == 1) {
+      reporting_person_email = directoryOnBehalf[0].email;
+    } else {
+      reporting_person_email = on_behalf_email;
+    }
+  }
 
   const defaultIncidentType = await knex("incident_types")
     .where({ name: eventType })
     .select("id")
     .first();
+
   const department = await new DepartmentService().determineDepartment(
-    reporting_person_email,
-    supervisor_email,
+    [reporting_person_email, req.user.email, supervisor_email],
     location_code,
   );
 
-  await directoryService.connect();
   const directorySubmitter = await directoryService.searchByEmail(
     reporting_person_email,
   );
+
   const directorySupervisor =
     await directoryService.searchByEmail(supervisor_email);
 
@@ -732,12 +743,21 @@ reportRouter.post(
       .orderBy("order");
 
     const implementedStep = incidentSteps.find(
-      (step: IncidentStep) => step.step_title == "Controls Implemented",
+      (step: IncidentStep) =>
+        step.step_title == "Controls Implemented" ||
+        step.step_title == "Control the Hazard",
     );
     const requestStep = incidentSteps.find(
       (step: IncidentStep) => step.step_title == "Committee Review",
     );
 
+    if (isNil(implementedStep)) {
+      console.log("No implemented step found, cannot send to committee");
+      return res
+        .status(400)
+        .send("No implemented step found, cannot send to committee");
+    }
+
     if (!isNil(requestStep)) return res.status(400).send("Step already exists");
 
     const newStep = {

api/src/services/department-service.ts

@@ -3,35 +3,56 @@ import { db } from "../data/db-client";
 import { UnifiedDirectoryService } from "./unified-directory-service";
 
 export class DepartmentService {
-  async determineDepartment(userEmail: string, supervisorEmail: string, location_code: string): Promise<Department> {
+  async determineDepartment(
+    emailArray: string[],
+    location_code: string,
+  ): Promise<Department> {
+    for (const email of emailArray) {
+      const department = await this.findMatchByEmail(email);
+      if (department) return department;
+    }
+
+    let department = await db("departments")
+      .where({ code: "UNK" })
+      .first<Department>();
+
+    return department;
+  }
+
+  async findMatchByEmail(email: string): Promise<Department | null> {
     const directory = new UnifiedDirectoryService();
+    const userResults = await directory.searchByEmail(email);
 
-    const userResults = await directory.searchByEmail(userEmail);
-    const superResults = await directory.searchByEmail(supervisorEmail);
+    if (userResults && userResults.length == 1) {
+      await db("users")
+        .where({ email })
+        .update({ department: userResults[0].department });
 
-    if (userResults && userResults.length > 0) {
-      await db("users").where({ email: userEmail }).update({ department: userResults[0].department });
-      const userDepart = await db("departments").where({ name: userResults[0].department }).first<Department>();
+      const userDepart = await db("departments")
+        .where({ name: userResults[0].department })
+        .first<Department>();
       if (userDepart) return userDepart;
-    }
 
-    if (superResults && superResults.length > 0) {
-      await db("users").where({ email: supervisorEmail }).update({ department: superResults[0].department });
-      const superDepart = await db("departments").where({ name: superResults[0].department }).first<Department>();
-      if (superDepart) return superDepart;
+      const depart = await db("departments")
+        .where({ name: userResults[0].department })
+        .first<Department>();
+      if (depart) return depart;
     }
 
-    if (userEmail.endsWith("@wcb.yk.ca") || supervisorEmail.endsWith("@wcb.yk.ca")) {
-      const wcbDepart = await db("departments").where({ code: "WSCB" }).first<Department>();
+    if (email.endsWith("@wcb.yk.ca")) {
+      const wcbDepart = await db("departments")
+        .where({ code: "WSCB" })
+        .first<Department>();
       if (wcbDepart) return wcbDepart;
     }
 
-    if (userEmail.endsWith("@yesnet.yk.ca") || supervisorEmail.endsWith("@yesnet.yk.ca")) {
-      const eduDepart = await db("departments").where({ code: "EDU" }).first<Department>();
+    if (email.endsWith("@yesnet.yk.ca")) {
+      const eduDepart = await db("departments")
+        .where({ code: "EDU" })
+        .first<Department>();
       if (eduDepart) return eduDepart;
     }
 
-    let department = await db("departments").where({ code: "UNK" }).first();
-    return department;
+    return null;
   }
 }