Merge pull request #351 from icefoganalytics/test

Supporting SFA Other from Portal

Author: datajohnson

src/api/models/application.ts

@@ -1,3 +1,4 @@
+import { DB_CONFIG } from "@/config";
 import AgencyAssistance from "@/models/agency-assistance";
 import Attendance from "@/models/attendance";
 import Expense from "@/models/expense";
@@ -12,8 +13,11 @@ import PrestudyEmploymentStatus from "@/models/prestudy-employment-status";
 import Program from "@/models/program";
 import Student from "@/models/student";
 import StudyArea from "@/models/study-area";
+import knex from "knex";
 import { isEmpty, isInteger, isNaN, isNull, isNumber, isUndefined } from "lodash";
 
+const db = knex(DB_CONFIG);
+
 // Application with standard JS naming conventions
 // trailing underscore to avoid conflicting with legacy Application format
 export default interface Application_ {
@@ -547,7 +551,7 @@ export function DependantsFromDraft(draft: any): any[] {
   return dependants;
 }
 
-export function FundingFromDraft(draft: any): any[] {
+export async function FundingFromDraft(draft: any): Promise<any[]> {
   let funding = new Array<any>();
   let hasDependents =
     draft.student_dependants && draft.student_dependants.has_dependants && draft.student_dependants.dependants;
@@ -569,7 +573,18 @@ export function FundingFromDraft(draft: any): any[] {
           request_type_id = 2;
           break;
         case "Student Training Allowance":
-          request_type_id = 1;
+          request_type_id = 46;
+
+          const institution = await db("sfa.institution")
+            .innerJoin("sfa.institution_campus", "institution.id", "institution_campus.institution_id")
+            .where("institution_campus.id", draft.program_details.institution_id)
+            .select("institution.*")
+            .first();
+
+          if (institution && institution.name.startsWith("Yukon University")) {
+            request_type_id = 1;
+          }
+
           break;
         case "Yukon Excellence Awards":
           request_type_id = 3;

src/api/services/portal/application-service.ts

@@ -196,7 +196,7 @@ export class PortalApplicationService {
 
           if (newApplication) {
             errorMessage = "Error creating funding requests";
-            let fundings = FundingFromDraft(combinedApp);
+            let fundings = await FundingFromDraft(combinedApp);
             if (fundings && fundings.length > 0) {
               for (let funding of fundings) {
                 funding.application_id = newApplication[0].id;

src/api/services/shared/document-service.ts

@@ -99,7 +99,8 @@ export class DocumentService {
   async getDocumentsForDraft(application_draft_id: number): Promise<FileReferenceBase[]> {
     return await db<FileReferenceBase>("sfa.file_reference")
       .innerJoin("sfa.document_status", "file_reference.status", "document_status.id")
-      .select(["file_reference.*", "document_status.description as status_description"])
+      .innerJoin("sfa.requirement_type", "file_reference.requirement_type_id", "requirement_type.id")
+      .select(["file_reference.*", "document_status.description as status_description", "requirement_type.description as requirementTypeDescription"])
       .where({ application_draft_id, visible_in_portal: true });
   }
 

src/api/services/shared/documentation-service.ts

@@ -138,7 +138,7 @@ export class DocumentationService {
     let existingDocs = await documentService.getDocumentsForDraft(draftId);
     existingDocs = existingDocs.filter((d) => d.status_description != "Replaced");
 
-    let funding = FundingFromDraft(app);
+    let funding = await FundingFromDraft(app);
     let requestTypes = uniq(funding.map((f) => f.request_type_id));
 
     let reqDocs = await this.getDocumentRequirementsFor(requestTypes);