Merge pull request #62 from MariazelHdez/test

SFA admin updates

Author: datajohnson

db/4_functions.sql

@@ -6,14 +6,14 @@ export interface DisbursementDTO {
     disbursed_amount?: number,
     due_date?: Date,
     tax_year?: number,
-    issue_date?: number,
+    issue_date?: Date,
     paid_amount?: number,
     change_reason_id?: number,
     financial_batch_id?: number,
     financial_batch_id_year?: number,
     financial_batch_run_date?: Date,
     financial_batch_serial_no?: number,
-    transaction_number?: string,
+    transaction_number?: number,
     csl_cert_seq_number?: number,
     ecert_sent_date?: Date,
     ecert_response_date?: Date,

src/api/models/dto/DisbursementDTO.ts

@@ -30,4 +30,5 @@ export interface IAssessmentCalculated {
     pstudy_months?: number;
     pstudy_weeks?: number;
     new_calc?: boolean;
+    previous_upgrade_weeks?: number;
 }

src/api/models/dto/calculated/Assessment.ts

@@ -68,6 +68,7 @@ export class AssessmentCslftRepository extends AssessmentBaseRepository {
     private assess_id?: number;
     private study_period_id: number = 2;
     private prestudy_period_id: number = 1;
+    private csl_letter_flag: boolean = false;
 
     // Utils
     private numHelper: NumbersHelper;
@@ -671,7 +672,7 @@ export class AssessmentCslftRepository extends AssessmentBaseRepository {
         this.assessment.prestudy_bus_flag = this.application.prestudy_bus;
         this.assessment.family_size = await this.getParentFamilySize(this.application.id);
         this.assessment.parent_ps_depend_count = await this.getParentDependentCount(this.application.id, true);
-        this.assessment.parent_province_id = await this.provinceRepo.getStudentProvinceIdByApplication(this.application.id);
+        this.assessment.parent_province_id = await this.provinceRepo.getStudentProvinceIdByApplication(this.application.id, 4);
         this.assessment.total_grant_awarded = await this.disbursementRepo.getTotalGrantAmount(this.application.id);
 
         const canadianProvinces = [
@@ -868,8 +869,41 @@ export class AssessmentCslftRepository extends AssessmentBaseRepository {
         await this.loadData(funding_request_id, false);
         this.assessment = assessment;
 
+        this.disbursement.assessment_id = this.assessment.id;
+        this.disbursement.funding_request_id = funding_request_id;
+        this.disbursement.issue_date = new Date();
 
+        const positiveDisbursement = (): boolean => ((this.assessment.net_amount ?? 0) > 0 && this.assessment.assessment_type_id === 3);
+        this.disbursement.disbursed_amount = positiveDisbursement() ? 0 : this.assessment.net_amount;
+        this.disbursement.paid_amount = positiveDisbursement() ? 0 : this.assessment.net_amount;
+        
+        this.csl_letter_flag = positiveDisbursement();
+
+        const isNetAmountAndAssessmentType = (assessmentType: number): boolean => ((this.assessment.net_amount ?? 0) >= 0 && this.assessment.assessment_type_id !== assessmentType); 
+        if ((this.assessment.net_amount ?? 0) < 0) {
+            this.disbursement.transaction_number = await this.disbursementRepo.getMaxTransaction(funding_request_id);
+        }
+        else {
+            if (isNetAmountAndAssessmentType(3)) {
+                this.disbursement.disbursement_type_id = 4;
+
+                if ((this.assessment.csl_assessed_need ?? 0) > 0 || (this.assessment.total_grant_awarded ?? 0) > 0 && (this.application.academic_year_id ?? 0) > 2012) {
+                    await this.getMsfaaInfo("Disburse");
+                }
 
+                if ((this.assessment.net_amount ?? 0) > 0 && this.assessment.assessment_type_id !== 3) {
+                    this.funding_request.status_id = 7;
+                    this.funding_request.status_date = new Date();
+
+                    this.disbursement.transaction_number = await this.disbursementRepo.getNextTransactionSequenceValue();
+                }
+            }
+        }
+
+        if (!this.assessment.csl_over_reason_id) {
+            this.assessment.over_award = Math.max((this.assessment.over_award ?? 0) - (this.assessment.net_amount ?? 0), 0);
+        }
+       
         return {
             disbursement: this.disbursement,
             assessment: this.assessment,

src/api/repositories/assessment/assessment-cslft-repository.ts

@@ -14,11 +14,11 @@ export class AssessmentSTA extends AssessmentBaseRepository {
         this.applicationRepo = new ApplicationRepository(maindb);
     }
 
-    async getNewAssessmentSTA(
+    async getNewInfo(
         application_id: number,
         funding_request_id: number,
 
-    ): Promise<AssessmentDTO | undefined> {
+    ): Promise<AssessmentDTO> {
 
         let initValues: AssessmentDTO = {};
 
@@ -56,7 +56,7 @@ export class AssessmentSTA extends AssessmentBaseRepository {
         initValues.years_funded = await this.getScalarValue<number>("fn_get_total_funded_years", [this.application.student_id || 0, application_id]);
         initValues.disbursements_required = 1; // always is 1
         initValues.previous_weeks = await this.getScalarValue<number>("fn_get_previous_weeks_sfa", [
-            "Normal",
+            "'Normal'",
             this.application.student_id || 0,
             this.application.id || 0
 
@@ -70,11 +70,11 @@ export class AssessmentSTA extends AssessmentBaseRepository {
             initValues.assessed_weeks || 0,
             moment().year() // prev_weeks_curr_yr
         ]);
-        // initValues.previous_upgrade_weeks = await this.getScalarValue<number>("fn_get_previous_weeks_sfa", [
-        //     "Upgrade",
-        //     this.application.student_id || 0,
-        //     this.application.id || 0
-        // ]);
+        initValues.previous_upgrade_weeks = await this.getScalarValue<number>("fn_get_previous_weeks_sfa", [
+            "'Upgrade'",
+            this.application.student_id || 0,
+            this.application.id || 0
+        ]);
         initValues.weekly_amount = await this.getScalarValue<number>("fn_get_weekly_amount_sta", [application_id]);
 
 

src/api/repositories/assessment/assessment-sta-repository.ts

@@ -19,6 +19,7 @@ export class AssessmentYukonGrant extends AssessmentBaseRepository {
         disburseAmountList: number[],
         student_id: number,
         application_id: number,
+        program_division: number,
 
     ): Promise<AssessmentDTO | undefined> {
 
@@ -56,7 +57,9 @@ export class AssessmentYukonGrant extends AssessmentBaseRepository {
 
         const disburse_required = await this.getScalarValue<number>("fn_disbursments_required", [
             application_id,
-            assessment.id || 0]);
+            assessment.id || 0,
+            program_division,
+        ]);
 
         let disbursed_amt = null;
 
@@ -87,7 +90,7 @@ export class AssessmentYukonGrant extends AssessmentBaseRepository {
             String(refrehData.airfare_amount),
             String(refrehData.weekly_amount),
             String(refrehData.weeks_allowed),
-            String(refrehData.id || 0),
+            String(refrehData.assessment_adj_amount || 0),
         ]);
 
         refrehData.pre_leg_amount = await this.getScalarValue<number>("fn_get_old_total", [
@@ -120,6 +123,7 @@ export class AssessmentYukonGrant extends AssessmentBaseRepository {
         delete assessmentToInsert.read_only_data;
         delete assessmentToInsert.id;
         delete assessmentToInsert.assessment_id;
+        delete assessmentToInsert.program_division;
 
         const insertedAssessment: any = await this.mainDb("sfa.assessment")
             .insert({ ...assessmentToInsert })
@@ -162,14 +166,15 @@ export class AssessmentYukonGrant extends AssessmentBaseRepository {
         delete assessmentToUpdate.assessment_id;
         delete assessmentToUpdate.id;
         delete assessmentToUpdate.funding_request_id;
+        delete assessmentToUpdate.program_division;
 
         const updatedAssessment: any = await this.mainDb("sfa.assessment")
             .where({ id: assessment_id })
             .update({ ...assessmentToUpdate })
-
         if (disbursementList.length) {
             // Insert the disbursement list
             for (const item of disbursementList) {
+
                 if (item?.id && (item?.assessment_id === assessment_id)
                     && (item?.funding_request_id === funding_request_id)) {
                     const resUpdate = await this.mainDb("sfa.disbursement")

src/api/repositories/assessment/assessment-yg-repository.ts

@@ -1,2 +1,3 @@
 export * from "./assessment-cslft-repository";
-export * from "./assessment-yg-repository";
+export * from "./assessment-yg-repository";
+export * from "./assessment-sta-repository";

src/api/repositories/assessment/index.ts

@@ -45,4 +45,20 @@ export class DisbursementRepository extends BaseRepository {
 
         return result;
     }
+
+    async getMaxTransaction(funding_request_id?: number): Promise<number> {
+        let result = 0;
+
+        if (funding_request_id) {
+            result = await this.getScalarValue<number>("fn_get_disbursement_max_transaction", [funding_request_id]);
+        }
+
+        return result;
+    }
+
+    async getNextTransactionSequenceValue(): Promise<number> {
+        const query = await this.mainDb.raw("SELECT NEXT VALUE FOR sfa.CSL_TRANSACTION_SEQ as nextVal;");
+        const result: Partial<{ nextVal?: number }> = this.singleResult(query);
+        return result.nextVal ?? 0;
+    }
 }