Round 1 nars fixes

Author: datajohnson

src/api/services/admin/nars-v17-2-reporting-service.ts

@@ -181,7 +181,14 @@ export class NarsV17_2ReportingService {
         .groupBy("request_type_id")
         .sum("disbursed_amount as disbursed_amount");
 
-      let ftLoan = otherFunds.find((f) => f.request_type_id == 4);
+      let otherFunds2 = await db("sfa.funding_request")
+        .where({ application_id: applicationId, assessment_id: app.id })
+        .join("sfa.disbursement", "disbursement.funding_request_id", "funding_request.id")
+        .select("request_type_id")
+        .groupBy("request_type_id")
+        .sum("disbursed_amount as disbursed_amount");
+
+      let ftLoan = otherFunds2.find((f) => f.request_type_id == 4);
       let ftGrant = otherFunds.find((f) => f.request_type_id == 35);
       let ftDepGrant = otherFunds.find((f) => f.request_type_id == 32);
       let disGrant = otherFunds.find((f) => f.request_type_id == 29);
@@ -275,7 +282,7 @@ export class NarsV17_2ReportingService {
     row.push(new Column("app_status", app_status, " ", 1));
 
     row.push(new Column("assess_date", moment.utc(app.assessed_date).format("YYYYMMDD"), " ", 8));
-    row.push(new Column("reasess_indicator", app.assessment_type_id == 1 ? "0" : "4", " ", 1));
+    row.push(new Column("reasess_indicator", app.assessment_type_id == 1 ? "0" : "8", " ", 1));
     row.push(new Column("csl_auth_date", moment.utc(app.assessed_date).format("YYYYMMDD"), " ", 8));
 
     row.push(new Column("sin", app.sin, " ", 9));