Merge pull request #197 from icefoganalytics/test

Minor updates for portal
ytgov · Nov 2, 2023 · 5be5c49 · 5be5c49
2 parents 5968220 + 9a7a90a
commit 5be5c49
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/api/routes/admin/application-router.ts b/src/api/routes/admin/application-router.ts
@@ -870,6 +870,10 @@ applicationRouter.put(
     const { application_id, id } = req.params;
     const { data } = req.body;
 
+    if (data.status_id || data.status_reason_id) {
+      data.status_date = new Date();
+    }
+
     try {
       const resUpdate = await db("sfa.funding_request")
         .where({ id, application_id })

diff --git a/src/api/services/portal/students/student-application-funding-requests-service.ts b/src/api/services/portal/students/student-application-funding-requests-service.ts
@@ -33,7 +33,7 @@ export default class StudentApplicationFundingRequestsService {
       .where({ applicationId: this.#applicationId })
       .innerJoin("requestType", "requestType.id", "fundingRequest.requestTypeId")
       .leftJoin("status", "fundingRequest.statusId", "status.id")
-      .leftJoin("statusReason", "fundingRequest.statusReasonId", "status.id")
+      .leftJoin("statusReason", "fundingRequest.statusReasonId", "statusReason.id")
       .select(
         "fundingRequest.*",
         "status.description as statusDescription",