Merge pull request #370 from icefoganalytics/test

WUP and Students

Author: datajohnson

src/api/routes/admin/application-router.ts

@@ -5,7 +5,7 @@ import knex from "knex";
 import { DocumentService, DocumentStatus, DocumentationService } from "../../services/shared";
 import { ReturnValidationErrors } from "../../middleware";
 import { DB_CONFIG } from "../../config";
-import { uniq, parseInt, min, get, isArray, isEmpty, orderBy, sortBy } from "lodash";
+import { uniq, parseInt, min, get, isArray, isEmpty, orderBy, sortBy, isString } from "lodash";
 import { AssessmentYukonGrant, AssessmentYEA } from "../../repositories/assessment";
 import { weeksBetween } from "@/utils/date-utils";
 
@@ -335,6 +335,8 @@ applicationRouter.get("/:id", [param("id").notEmpty()], ReturnValidationErrors,
       if (dep.received_date) dep.received_date = moment(dep.received_date).add(7, "hours").format("YYYY-MM-DD");
 
       if (dep.status_date) dep.status_date = moment(dep.status_date).add(7, "hours").format("YYYY-MM-DD");
+
+      dep.json_data = JSON.parse(dep.json_data);
     }
     if (student) {
       student.consents = await db("sfa.student_consent")
@@ -509,6 +511,7 @@ applicationRouter.post(
       status_reason_id = null,
       status_date = null,
       comments = null,
+      json_data = null,
     } = req.body;
 
     try {
@@ -534,7 +537,7 @@ applicationRouter.post(
         }
 
         // make sure request type is active
-        const checkIsActive = await db("sfa.request_type").where("id", request_type_id).first();
+        const checkIsActive = await db("sfa.request_type").where({ id: request_type_id }).first();
 
         if (checkIsActive?.is_active) {
           if (newRecord.request_type_id === 1 || newRecord.request_type_id === 46) {
@@ -560,13 +563,14 @@ applicationRouter.post(
             is_csg_only: false,
             application_id,
             status_id: 2,
+            json_data: isString(json_data) ? json_data : JSON.stringify(json_data),
           });
 
           return resInsert
             ? res.json({ messages: [{ variant: "success", text: "Saved" }] })
             : res.json({ messages: [{ variant: "error", text: "Failed" }] });
         } else {
-          res.json({ messages: [{ variant: "error", text: "Request Type is not active" }] });
+          return res.json({ messages: [{ variant: "error", text: "Request Type is not active" }] });
         }
       }
 
@@ -870,6 +874,9 @@ applicationRouter.put(
       data.status_date = new Date();
     }
 
+    data.json_data = isString(data.json_data) ? data.json_data : JSON.stringify(data.json_data);
+    delete data.id;
+
     try {
       const resUpdate = await db("sfa.funding_request")
         .where({ id, application_id })
@@ -882,8 +889,8 @@ applicationRouter.put(
       }
 
       return resUpdate
-        ? res.json({ messages: [{ variant: "success", text: "Saved" }] })
-        : res.json({ messages: [{ variant: "error", text: "Failed" }] });
+        ? res.json({ messages: [{ variant: "success", text: "Funding Request Saved" }] })
+        : res.json({ messages: [{ variant: "error", text: "Save Failed" }] });
     } catch (error) {
       console.log(error);
       return res.json({ messages: [{ text: "Failed to update Funding Request", variant: "error" }] });
@@ -905,7 +912,7 @@ applicationRouter.delete(
         return res.status(404).send({ messages: [{ variant: "error", text: "The record does not exits" }] });
       }
 
-      const disbursements = await db("sfa.disbursement").where({ funding_request_id: id })
+      const disbursements = await db("sfa.disbursement").where({ funding_request_id: id });
 
       if (disbursements.length > 0) {
         return res.status(400).json({

src/api/routes/admin/assessment-router.ts

@@ -7,6 +7,8 @@ import { DB_CONFIG } from "../../config";
 import { assessmentSTARouter } from "./sta-assessment-router";
 //import { assessmentCsgftRouter } from "./csgft-assessment-router";
 import { assessmentYukonGrantRouter } from "./assessment/assessment-yukon-grant-router";
+import { assessmentWUPApprenticeshipRouter } from "./assessment/assessment-wup-apprenticeship-router";
+import { assessmentWUPSkillsRouter } from "./assessment/assessment-wup-skills-router";
 
 const db = knex(DB_CONFIG);
 export const assessmentRouter = express.Router();
@@ -15,6 +17,8 @@ export const assessmentRouter = express.Router();
 assessmentRouter.use("/sta", assessmentSTARouter);
 //assessmentRouter.use("/csgft", assessmentCsgftRouter);
 assessmentRouter.use("/yukon-grant", assessmentYukonGrantRouter);
+assessmentRouter.use("/wup-apprenticeship", assessmentWUPApprenticeshipRouter);
+assessmentRouter.use("/wup-skills-for-success", assessmentWUPSkillsRouter);
 
 const mainTable = "sfa.assessment";
 

src/api/routes/admin/assessment/assessment-wup-apprenticeship-router.ts

@@ -0,0 +1,194 @@
+import express, { Request, Response } from "express";
+import { body, param } from "express-validator";
+import knex from "knex";
+import { isString } from "lodash";
+
+import { DB_CONFIG } from "@/config";
+import { ReturnValidationErrors } from "@/middleware";
+import { AssessmentService } from "@/services/admin/assessments/assessment-service";
+import { writeAuditLog } from "@/services/audit-service";
+import { formatMoney } from "@/utils/formatters";
+
+const db = knex(DB_CONFIG);
+export const assessmentWUPApprenticeshipRouter = express.Router();
+
+assessmentWUPApprenticeshipRouter.get(
+  "/:id",
+  [param("id").isInt().notEmpty()],
+  ReturnValidationErrors,
+  async (req: Request, res: Response) => {
+    const { id } = req.params;
+
+    try {
+      const result = await db("sfa.assessment")
+        .innerJoin("sfa.funding_request", "sfa.assessment.funding_request_id", "sfa.funding_request.id")
+        .where("assessment.id", id)
+        .select("assessment.*", "funding_request.application_id")
+        .first();
+
+      if (!result) return res.json({ error: "Assessment not found" });
+
+      const builder = new AssessmentService(result.application_id, result.funding_request_id, parseInt(id));
+      await builder.load();
+
+      return res.status(200).json({ success: true, data: builder.assessment });
+    } catch (error: any) {
+      console.log(error);
+      return res.json({ error: error });
+    }
+  }
+);
+
+assessmentWUPApprenticeshipRouter.post(
+  "/",
+  [body("funding_request_id").notEmpty()],
+  ReturnValidationErrors,
+  async (req: Request, res: Response) => {
+    const { ...assessment } = req.body;
+    try {
+      const fundingRequest = await db("sfa.funding_request").where({ id: assessment.funding_request_id }).first();
+      if (!fundingRequest) return res.json({ error: "Funding request not found" });
+
+      const builder = new AssessmentService(fundingRequest.application_id, assessment.funding_request_id);
+      await builder.load(true);
+
+      const updatedItem = { ...builder.assessment, ...assessment };
+      delete updatedItem.id;
+
+      const existingAssessments = await db("sfa.assessment").where({
+        funding_request_id: assessment.funding_request_id,
+      });
+
+      let logType = "Assessment";
+
+      if (existingAssessments && existingAssessments.length > 0) {
+        updatedItem.assessment_type_id = 2;
+        logType = "Reassessment";
+      }
+
+      const updated = await db("sfa.assessment").insert(updatedItem).returning("id");
+
+      await writeAuditLog({
+        application_id: fundingRequest.application_id,
+        funding_request_id: fundingRequest.id,
+        assessment_id: updated[0].id,
+        user_id: req.user.id,
+        user_name: req.user.display_name.replace(".", " "),
+        title: `${logType} Created`,
+      });
+
+      if (updated[0].id) {
+        return res.status(200).json({ messages: [{ variant: "success", text: "Assessment saved" }] });
+      }
+
+      return res.status(404).send();
+    } catch (err: any) {
+      console.log("FAILED", err);
+      return res.json({ messages: [{ variant: "error", text: "Save failed" }] });
+    }
+  }
+);
+
+assessmentWUPApprenticeshipRouter.patch(
+  "/:id",
+  [param("id").isInt().notEmpty()],
+  ReturnValidationErrors,
+  async (req: Request, res: Response) => {
+    const { id } = req.params;
+    const { ...assessment } = req.body;
+    const recalculate = req.body.recalculate ?? false;
+
+    try {
+      assessment.json_data = isString(assessment.json_data)
+        ? assessment.json_data
+        : JSON.stringify(assessment.json_data);
+
+      delete assessment.id;
+      delete assessment.recalculate;
+
+      const result = await db("sfa.assessment")
+        .innerJoin("sfa.funding_request", "sfa.assessment.funding_request_id", "sfa.funding_request.id")
+        .where("assessment.id", id)
+        .select("assessment.*", "funding_request.application_id")
+        .first();
+
+      if (!result) return res.json({ error: "Assessment not found" });
+
+      if (recalculate) {
+        const builder = new AssessmentService(result.application_id, result.funding_request_id, parseInt(id));
+        await builder.load(recalculate);
+
+        const updatedItem = builder.assessment;
+
+        updatedItem.json_data = isString(updatedItem.json_data)
+          ? updatedItem.json_data
+          : JSON.stringify(updatedItem.json_data);
+
+        await writeAuditLog({
+          application_id: result.application_id,
+          funding_request_id: result.funding_request_id,
+          assessment_id: parseInt(id),
+          user_id: req.user.id,
+          user_name: req.user.display_name.replace(".", " "),
+          title: `Assessment Recalculated = ${formatMoney(builder.assessment.assessed_amount)}`,
+        });
+
+        delete updatedItem.id;
+        await db("sfa.assessment").where({ id: id }).update(updatedItem);
+      } else {
+        await db("sfa.assessment").where({ id: id }).update(assessment);
+      }
+
+      return res.status(200).json({ messages: [{ variant: "success", text: "Assessment saved" }] });
+    } catch (err: any) {
+      console.log("FAILED", err);
+      return res.json({ messages: [{ variant: "error", text: "Save failed" }] });
+    }
+  }
+);
+
+assessmentWUPApprenticeshipRouter.delete(
+  "/:id",
+  [param("id").isInt().notEmpty()],
+  ReturnValidationErrors,
+  async (req: Request, res: Response) => {
+    const { id = null } = req.params;
+
+    try {
+      const verifyRecord = await db("sfa.assessment").where({ id: id }).first();
+
+      if (!verifyRecord) {
+        return res.status(404).send({ wasDelete: false, message: "The record does not exits" });
+      }
+
+      const fundingRequest = await db("sfa.funding_request").where({ id: verifyRecord.funding_request_id }).first();
+      const disbursements = await db("sfa.disbursement").where({ assessment_id: id });
+
+      if (disbursements && disbursements.length > 0) {
+        return res
+          .status(409)
+          .send({ wasDelete: false, message: "The assessment cannot be deleted because it has disbursements." });
+      }
+
+      await writeAuditLog({
+        application_id: fundingRequest.application_id,
+        funding_request_id: verifyRecord.funding_request_id,
+        user_id: req.user.id,
+        user_name: req.user.display_name.replace(".", " "),
+        title: `${verifyRecord.assessment_type_id == 1 ? "Assessment" : "Reassessment"} Deleted`,
+      });
+
+      await db("sfa.assessment").where({ id: id }).del();
+      res.status(200).json({ messages: [{ variant: "success", text: "Assessment deleted" }] });
+    } catch (error: any) {
+      console.log(error);
+      if (error?.number === 547) {
+        return res
+          .status(409)
+          .send({ wasDelete: false, message: `The assessment Id: "${id}" cannot be deleted because it is in use.` });
+      }
+
+      return res.status(409).send({ wasDelete: false, message: "Error to Delete" });
+    }
+  }
+);