Merge pull request #85 from MariazelHdez/test

Update MSFAA received

Author: datajohnson

db/4_functions.sql

@@ -4834,40 +4834,53 @@ BEGIN
 END;
 GO
 
-CREATE OR ALTER FUNCTION sfa.fn_get_csl_cert_seq_num
-(
-	@FROM_DATE_P DATE,
-	@TO_DATE_P DATE
-) 
-RETURNS INT AS
-BEGIN 
-	DECLARE @v_cert_count NUMERIC = 0;
 
-	SELECT @v_cert_count = count(d.id)
-		FROM sfa.funding_request AS fr
-		INNER JOIN sfa.disbursement AS d ON fr.id = d.funding_request_id
-		INNER JOIN sfa.request_type AS rt ON fr.request_type_id = rt.id
-		INNER JOIN (
-		  SELECT m.msfaa_status, app.academic_year_id, app.id
-		  FROM sfa.msfaa AS m
-		  INNER JOIN sfa.application AS app ON app.id = m.application_id
-		  WHERE app.id = m.application_id
-		) AS mhd ON fr.application_id = mhd.id
-		WHERE (mhd.msfaa_status = 'Received' OR mhd.academic_year_id <= 2012)
-		AND issue_date >= @FROM_DATE_P			
-		AND issue_date <= @TO_DATE_P		
-		AND d.due_date IS NOT NULL
-		AND d.transaction_number IS NOT NULL
-		AND d.csl_cert_seq_number IS NULL
-		AND disbursement_type_id IN (3, 4, 5, 7, 9)
-		AND fr.request_type_id IN (4, 5, 6, 15, 16, 17, 18, 19, 22, 23, 24, 26, 27, 28, 29, 30, 31, 32, 33, 35, 47)
-		AND d.transaction_number IN (
-		  SELECT d1.transaction_number
-		  FROM sfa.disbursement AS d1
-		  INNER JOIN sfa.funding_request AS fr1 ON d1.funding_request_id = fr1.id
-		  WHERE fr1.request_type_id IN (4, 5))
-		  
-		RETURN @v_cert_count;
+CREATE OR ALTER FUNCTION sfa.get_serial_fct(@date_p DATE)
+RETURNS INT
+AS
+BEGIN
+    DECLARE @v_fbsn INT;
+
+    SELECT @v_fbsn = ISNULL(MAX(financial_batch_serial_no), 0) + 1
+    FROM disbursement
+    WHERE financial_batch_run_date = @date_p;
+
+    RETURN @v_fbsn;
+END
+GO
+
+CREATE OR ALTER FUNCTION sfa.get_fiscal_year_fct(@date_p DATE)
+RETURNS INT
+AS
+BEGIN
+    /* Determine the batch year the disbursement is part of */
+    DECLARE @fb_year INT = YEAR(@date_p);
+
+    IF @date_p < DATEFROMPARTS(@fb_year, 04, 01) 
+        SET @fb_year = @fb_year - 1;
+
+    RETURN @fb_year;
+END
+GO
+
+CREATE OR ALTER FUNCTION sfa.get_batch_group_id_fct (@funding_request_id_p INT)
+RETURNS INT
+AS
+BEGIN
+    DECLARE @federal_institution_code NVARCHAR(30);
+
+    SELECT @federal_institution_code = ic.federal_institution_code
+    FROM sfa.funding_request fr
+    INNER JOIN sfa.application app ON fr.application_id = app.id
+    INNER JOIN sfa.institution_campus ic ON app.institution_campus_id = ic.id
+    WHERE fr.id = @funding_request_id_p;
+
+    IF (@federal_institution_code = 'LVAA') -- 'Yukon Col' OR 'Yukon U'
+    BEGIN
+        RETURN 1;
+    END
+
+    RETURN 3;
 END
 GO
 
@@ -5023,3 +5036,4 @@ FROM sfa.disbursement d
 WHERE fr.application_id = @application_id
 ORDER BY d.due_date DESC;
 GO
+

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

@@ -152,6 +152,10 @@ export class AssessmentCslftRepository extends AssessmentBaseRepository {
 
     async getCalculatedValues(): Promise<void> {
 
+        const pDaysDiff = moment.utc(this.assessment.pstudy_end_date).diff(moment.utc(this.assessment.pstudy_start_date), "day");
+        this.assessment.pstudy_weeks = Math.trunc((pDaysDiff + 1)/7 + .9999);
+        this.assessment.pstudy_months = Math.trunc((pDaysDiff + 1)/30.44 + .9999);
+
         // Get the study expenses.
         this.assessment.uncapped_costs_total = await this.getExpenseAmount(this.application.id, 2);
 
@@ -1116,6 +1120,7 @@ export class AssessmentCslftRepository extends AssessmentBaseRepository {
 
             if (payload.data.id && payload.data.id > 0)
             {
+                console.log(payload.data);
                 result.data = await this.updateAssessment(payload.data.id, payload.data);
             }
             else

src/api/repositories/cheque_req_list/cheque-req-list-repository.ts

@@ -0,0 +1,235 @@
+import { Knex } from "knex";
+import moment from "moment";
+import { BaseRepository } from "../base-repository";
+
+interface ChequeReqDTO {
+    request_type_id: number,
+    disbursement_id: number,
+    disbursed_amount: number,
+    bg_id: number,
+    issue_date: Date | string,
+    f_year: number
+};
+
+export class ChequeReqList extends BaseRepository {
+
+    //private applicationRepo: ApplicationRepository;
+    //private application: Partial<ApplicationDTO> = {};
+
+    constructor(maindb: Knex<any, unknown>) {
+        super(maindb);
+        //this.applicationRepo = new ApplicationRepository(maindb);
+    }
+
+    //AfterPForm ()
+    async validate(
+        issueDate: string
+    ): Promise<any> {
+
+        let start_p = '';
+        let serial_no_p = null;
+
+        if (true) { //start_p === '0'
+            //EXEC sfa.assign_cheque_req_batch @issue_date_p = @issue_date_p OUTPUT, @serial_no_p = @serial_no_p OUTPUT;
+            serial_no_p = await this.assignChequeReqBatch(issueDate);
+            console.log(serial_no_p);
+
+        } else {
+            //:issue_date_p := TO_DATE(SUBSTR(:start_p,1,11),'DD MON RRRR');
+            //:serial_no_p := TO_NUMBER(SUBSTR(:start_p,13));
+        }
+        //:issue_date_str_p := TO_CHAR (:issue_date_p, 'YYYYMMDD'); -- Added for Windows 7 issue with dateCOUNT(d.disbursement_id)
+        const disburseCount = await this.mainDb('sfa.disbursement')
+            .count('id as count')
+            .where('financial_batch_run_date', issueDate)
+            .where('financial_batch_serial_no', serial_no_p);
+
+        if (!disburseCount?.[0].count) {
+            return { text: 'There are no new disbursements for this date. This will end the report.' }
+        }
+
+        return serial_no_p;
+    }
+
+    //assign_cheque_req_batch ()
+    async assignChequeReqBatch(
+        issueDate: string
+    ): Promise<number | undefined> {
+        try {
+            const fb_serial = await this.getScalarValue<number>("get_serial_fct", [
+                `'${issueDate}'`
+            ]);
+
+            let disb_list: ChequeReqDTO[] = []; // CURSOR disb_cur
+            let num_request_type;
+            let num_batch;
+            let num_bg;
+            let int_count;
+            let batch_year;
+            let ori_disb_sign;
+            let disb_sign;
+            let fb_seq_name;
+            let id_year;
+            let ori_fb_year;
+
+            disb_list = await this.getDisburseList(issueDate) ?? [];
+
+            num_request_type = null;
+            num_bg = null;
+            int_count = 0;
+
+            //for await (const disburse of disb_list) {
+            for (let index = 0; index < disb_list.length; index++) {
+                const disburse = disb_list[index];
+
+                disb_sign = disburse.disbursed_amount < 0
+                    ? 'NEG'
+                    : 'POS';
+
+                // If this is the first time through or the request type is new or the batch group had changed or the disbursement sign has changed
+                // or the financial batch year has changed or 25 records have been added to a batch then start a new batch
+                if (
+                    num_request_type === null ||
+                    num_request_type !== disburse.request_type_id ||
+                    num_bg === null ||
+                    num_bg !== disburse.bg_id ||
+                    ori_disb_sign === null ||
+                    ori_disb_sign !== disb_sign ||
+                    ori_fb_year === null ||
+                    ori_fb_year !== disburse.f_year ||
+                    int_count === 25
+                ) {
+                    num_request_type = disburse.request_type_id;
+                    num_bg = disburse.bg_id;
+                    ori_disb_sign = disb_sign;
+                    ori_fb_year = disburse.f_year;
+                    batch_year = parseInt(disburse.f_year.toString().substring(2, 4), 10);
+
+                    // Select the appropriate sequence name.
+                    if (disburse.bg_id === 1) {
+                        fb_seq_name = 'FB_' + disburse.f_year + '_STA_SEQ';
+                    } else if (disburse.bg_id === 2) {
+                        fb_seq_name = 'FB_' + disburse.f_year + '_CSL_SEQ';
+                    } else if (disburse.bg_id === 3) {
+                        fb_seq_name = 'FB_' + disburse.f_year + '_ORI_SEQ';
+                    } else if (disburse.bg_id === 4) {
+                        fb_seq_name = 'FB_' + disburse.f_year + '_OTHER_SEQ';
+                    }
+
+                    const validateSequence: any = await this.mainDb.raw(`
+                    SELECT 1
+                    FROM sys.sequences sq
+                    INNER JOIN sys.schemas s ON s.schema_id = sq.schema_id
+                    WHERE sq.name = '${fb_seq_name}'
+                    AND s.name = 'sfa'
+                `);
+                    console.log("validateSequence", validateSequence);
+
+                    const existSequence = validateSequence?.length > 0;
+
+                    if (existSequence) {
+
+                        const getNumBatch: any = await this.mainDb
+                            .raw(`SELECT NEXT VALUE FOR sfa.${fb_seq_name} AS num_batch`);
+
+                        num_batch = parseInt(getNumBatch[0].num_batch);
+                        console.log("1 NUM_BATCH: ", getNumBatch);
+                        int_count = 1;
+                    } else {
+                        const createSequence: any = await this.mainDb.raw(`
+                        CREATE SEQUENCE sfa.${fb_seq_name}
+                        START WITH 1
+                        INCREMENT BY 1;
+                    `);
+                        console.log("fb_seq_name:", fb_seq_name);
+                        console.log("SEQUENCE CREADA:", createSequence);
+
+                        const getNumBatch: any = await this.mainDb
+                            .raw(`SELECT NEXT VALUE FOR sfa.${fb_seq_name} AS num_batch`);
+
+                        num_batch = parseInt(getNumBatch[0].num_batch);
+
+                        console.log("2 NUM_BATCH: ", getNumBatch);
+                        int_count = 1;
+                    }
+
+                    //Get the next batch number from the sequence
+                    //EXEC('SELECT @num_batch = NEXT VALUE FOR ' + @fb_seq_name, N'@num_batch INT OUTPUT', @num_batch OUTPUT);
+                    //SET @int_count = 1;
+                } else if ((num_request_type === disburse.request_type_id) && (int_count !== 25)) {
+                    int_count++;
+                }
+
+                //const updateDisburse = await this.mainDb("sfa.disbursement")
+                //    .where({ id: disburse.disbursement_id })
+                //    .update({
+                //        financial_batch_id: num_batch, 
+                //        financial_batch_id_year: batch_year,
+                //        financial_batch_run_date: issueDate, 
+                //        financial_batch_serial_no: fb_serial
+                //    });
+
+                console.log({
+                    id: disburse.disbursement_id,
+                    financial_batch_id: num_batch,
+                    financial_batch_id_year: batch_year,
+                    financial_batch_run_date: issueDate,
+                    financial_batch_serial_no: fb_serial
+                });
+
+
+            }
+
+            return fb_serial;
+        } catch (error) {
+            console.log(error);
+            return undefined;
+        }
+    }
+
+    async getDisburseList(
+        issueDate: string
+    ): Promise<ChequeReqDTO[] | undefined> {
+        try {
+            const disb_list = await this.mainDb('sfa.funding_request as fr')
+                .select(
+                    'fr.request_type_id',
+                    'd.id as disbursement_id',
+                    'd.disbursed_amount',
+                    this.mainDb.raw(`
+          CASE
+            WHEN rt.batch_group_id = 5 THEN
+              CASE fr.yea_request_type
+                WHEN 1 THEN 3
+                WHEN 2 THEN 4
+                ELSE 1
+              END
+            ELSE ISNULL(sfa.get_batch_group_id_fct(fr.id), rt.batch_group_id)
+          END AS bg_id`),
+                    'd.issue_date',
+                    this.mainDb.raw('sfa.get_fiscal_year_fct(d.issue_date) AS f_year'),
+                )
+                .innerJoin('sfa.disbursement as d', 'fr.id', 'd.funding_request_id')
+                .innerJoin('sfa.request_type as rt', 'fr.request_type_id', 'rt.id')
+                .whereNotNull('rt.batch_group_id')
+                .where((builder) => {
+                    builder.where('d.disbursed_amount', '<>', 0).orWhere('fr.request_type_id', 4);
+                })
+                .where('d.issue_date', '<=', issueDate)
+                .where('d.issue_date', '>', this.mainDb.raw("CONVERT(DATE, '20050331', 112)"))
+                .whereNotNull('d.due_date')
+                .whereNull('d.financial_batch_id')
+                .orderBy('bg_id')
+                .orderBy('fr.request_type_id')
+                .orderBy('f_year')
+                .orderBy('d.disbursed_amount', 'desc');
+
+            return disb_list;
+        } catch (error) {
+            console.log(error);
+            return undefined;
+        }
+    }
+
+
+}

src/api/repositories/cheque_req_list/index.ts

@@ -0,0 +1 @@
+export * from "./cheque-req-list-repository";

src/api/routes/admin/cheque-req-list-router.ts

@@ -0,0 +1,33 @@
+import { ExpenseRepository } from './../../repositories/expense/expense-repository';
+import knex from "knex";
+import express, { Request, Response } from "express";
+import { body, param } from "express-validator";
+import { ReturnValidationErrors } from "../../middleware";
+import { DB_CONFIG } from "../../config";
+import { AssessmentCslftRepository } from "../../repositories";
+import { ChequeReqList } from '../../repositories/cheque_req_list';
+
+const db = knex(DB_CONFIG)
+export const chequeReqRouter = express.Router();
+
+chequeReqRouter.post("/",
+    async (req: Request, res: Response) => {
+        const { issueDate = "" } = req.body;
+
+        if (issueDate?.length !== 10) {
+            return res.status(404).send();
+        }
+
+        try {
+            const chequeRequest = new ChequeReqList(db);
+
+            const validate = await chequeRequest.validate(issueDate);
+
+            console.log(validate);
+
+            return res.status(200).json(validate);
+        } catch (error) {
+            console.log(error);
+            return res.status(404).send();
+        }
+    });