Merge pull request #84 from MariazelHdez/test

Update Site

Author: datajohnson

db/4_functions.sql

@@ -4000,7 +4000,7 @@ BEGIN
 	    LEFT JOIN sfa.person_address pam ON pa.person_id = p.id AND pa.address_type_id = 2
 	    LEFT JOIN sfa.msfaa m ON s.id = m.student_id
 	WHERE fr.request_type_id IN (4, 5)
-		AND d.csl_cert_seq_number = @CSL_CERT_SEQ_P or d.csl_cert_seq_number IS NULL
+		AND d.csl_cert_seq_number = @CSL_CERT_SEQ_P
 		AND d.issue_date >= @FROM_DATE_P AND d.issue_date <= @TO_DATE_P	   					
 		AND (m.msfaa_status = 'Received' AND m.is_full_time = CASE WHEN d.disbursement_type_id = 4 THEN 1 ELSE 0 END OR app.academic_year_id <= 2012)
 		AND d.ecert_sent_date IS NULL
@@ -4292,15 +4292,15 @@ BEGIN
 					END					
 			END;	
 
-			SET @out_record3 = 'T' + RIGHT('000000' + CAST(@v_count AS VARCHAR), 6)
-                + RIGHT('000000000' + CAST(ABS(@v_all_disburse) AS VARCHAR), 9)
-                + RIGHT('000000000' + CAST(ABS(@v_cancel_disburse) AS VARCHAR), 9)
+			SET @out_record3 = 'T' + RIGHT('000000' + CAST(ISNULL(@v_count, 0) AS VARCHAR), 6)
+                + RIGHT('000000000' + CAST(ABS(ISNULL(@v_all_disburse, 0)) AS VARCHAR), 9)
+                + RIGHT('000000000' + CAST(ABS(ISNULL(@v_cancel_disburse, 0)) AS VARCHAR), 9)
                 + REPLICATE(' ', 587);				
 		CLOSE cur_cslft;		
 		DEALLOCATE cur_cslft;	
 
 		SET @out_record4 = @out_record + @out_record2;
-		RETURN @v_file_name + @out_record + @out_record2 + @out_record3;	
+		RETURN @v_file_name + @out_record + ISNULL(@out_record2, '') + ISNULL(@out_record3, '');	
 
 END
 GO
@@ -4832,4 +4832,194 @@ BEGIN
     RETURN COALESCE(@amt, 0);
 
 END;
-GO
+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;
+END
+GO
+
+CREATE OR ALTER FUNCTION sfa.fn_check_valid_date
+(
+@in_date_p NVARCHAR(100), 
+@date_name_p NVARCHAR(100)
+)
+RETURNS NVARCHAR(100)
+AS
+BEGIN
+	DECLARE @v_check_date DATETIME;
+	DECLARE @v_result VARCHAR(50);
+	IF REPLACE(@in_date_p, ' ', '') = '' OR @in_date_p = '00000000'
+		BEGIN
+	        RETURN 'EMPTY';
+	    END
+    
+    ELSE
+	    BEGIN	        
+			SET @v_check_date = TRY_CONVERT(DATETIME, @in_date_p, 112);
+	        IF @v_check_date IS NULL
+	        	BEGIN
+	        		SET @v_result = 'Invalid ' + @date_name_p + ' date: ' + @in_date_p + '. ';
+	        	END
+	        ELSE
+	        	BEGIN
+	        		 SET @v_result = NULL;
+	        	END	        		        		        	            	        
+	    END;
+	    RETURN @v_result;
+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;
+END
+GO
+
+CREATE OR ALTER FUNCTION sfa.fn_check_valid_date
+(
+@in_date_p NVARCHAR(100), 
+@date_name_p NVARCHAR(100)
+)
+RETURNS NVARCHAR(100)
+AS
+BEGIN
+	DECLARE @v_check_date DATETIME;
+	DECLARE @v_result VARCHAR(50);
+	IF REPLACE(@in_date_p, ' ', '') = '' OR @in_date_p = '00000000'
+		BEGIN
+	        RETURN 'EMPTY';
+	    END
+    
+    ELSE
+	    BEGIN	        
+			SET @v_check_date = TRY_CONVERT(DATETIME, @in_date_p, 112);
+	        IF @v_check_date IS NULL
+	        	BEGIN
+	        		SET @v_result = 'Invalid ' + @date_name_p + ' date: ' + @in_date_p + '. ';
+	        	END
+	        ELSE
+	        	BEGIN
+	        		 SET @v_result = NULL;
+	        	END	        		        		        	            	        
+	    END;
+	    RETURN @v_result;
+END
+GO
+
+CREATE OR ALTER PROCEDURE sfa.sp_insert_msfaa_import
+(
+	@v_agreement_num NVARCHAR(9), 
+	@v_sin NVARCHAR(9), 
+	@v_status NVARCHAR(1), 
+	@v_borrow_signed NVARCHAR(8), 
+	@v_sp_received NVARCHAR(8), 
+	@v_new_issue_prov NVARCHAR(2), 
+	@v_cancelled NVARCHAR(8), 
+	@v_error_msg NVARCHAR(255)			
+)
+AS
+BEGIN 
+	INSERT INTO sfa.msfaa_import 
+	(
+		agreement_number, 
+		sin, 
+		status_code, 
+		borrower_signed_date, 
+		sp_received_date, 
+		new_issue_prov, 
+		cancel_date, 
+		error_message
+	)
+    values 
+    	(
+    		@v_agreement_num , 
+			@v_sin, 
+			@v_status, 
+			@v_borrow_signed, 
+			@v_sp_received, 
+			@v_new_issue_prov, 
+			@v_cancelled, 
+			@v_error_msg			
+    	);
+END
+GO
+
+-- Get Disbursements For Issue Dates
+CREATE OR ALTER FUNCTION sfa.fn_get_top_disbursements(@application_id INT)
+RETURNS TABLE
+AS
+RETURN
+SELECT TOP 2
+	d.*
+FROM sfa.disbursement d 
+	INNER JOIN sfa.funding_request fr
+		ON d.funding_request_id = fr.id
+		AND fr.request_type_id IN (4,29,32,35)
+WHERE fr.application_id = @application_id
+ORDER BY d.due_date DESC;
+GO

db/migrations/011_msfa_import_table.sql

@@ -0,0 +1,11 @@
+
+CREATE TABLE sfa.msfaa_import (
+    agreement_number varchar(10) NULL,
+    sin varchar(9) NULL,
+    status_code varchar(1) NULL,
+    borrower_signed_date varchar(8) NULL,
+    sp_received_date varchar(8) NULL,
+    new_issue_prov varchar(2) NULL,
+    cancel_date varchar(8) NULL,
+    error_message varchar(4000) NULL
+);

db/migrations/012_ecert_import_table.sql

@@ -0,0 +1,10 @@
+CREATE TABLE sfa.ecert_import (
+    sequence_number varchar(20) NULL,
+    sin varchar(9) NULL,
+    certificate_number varchar(20) NULL,
+    ecert_sent_date datetime2(0) NULL,
+    response_date datetime2(0) NULL,
+    is_resend_flg varchar(3) NULL,
+    error_message varchar(4000) NULL,
+    disbursement_id float(8) NULL
+);

src/api/models/dto/CsgThresholdDTO.ts

@@ -0,0 +1,14 @@
+export interface CsgThresholdDTO {
+    id?: number;
+    academic_year_id?: number;
+    family_size?: number;
+    income_threshold?: number;
+    income_cutoff?: number;
+    phase_out_rate?: number;
+    low_income_threshold?: number;
+    middle_income_threshold?: number;
+    csgpt_phase_out_rate?: number;
+    csgpt_dep2_phase_out_rate?: number;
+    csgpt_dep3_phase_out_rate?: number;
+    csgft_dep_phase_out_rate?: number;
+}

src/api/models/dto/DisbursementDTO.ts

@@ -1,27 +1,28 @@
 export interface DisbursementDTO {
-    id?: number,
-    disbursement_type_id?: number,
-    assessment_id?: number,
-    funding_request_id?: number,
-    disbursed_amount?: number,
-    due_date?: Date | string,
-    tax_year?: number,
-    issue_date?: Date | string,
-    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,
-    csl_cert_seq_number?: number,
-    ecert_sent_date?: Date,
-    ecert_response_date?: Date,
-    ecert_status?: string,
-    ecert_portal_status_id?: number,
+    id?: number;
+    disbursement_type_id?: number;
+    assessment_id?: number;
+    funding_request_id?: number;
+    disbursed_amount?: number;
+    due_date?: Date | string;
+    tax_year?: number;
+    issue_date?: Date | string;
+    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;
+    csl_cert_seq_number?: number;
+    ecert_sent_date?: Date;
+    ecert_response_date?: Date;
+    ecert_status?: string;
+    ecert_portal_status_id?: number;
+    delete_flag?: boolean;
 }
 
-export type DisbursementTable = Omit<DisbursementDTO, "id">;
+export type DisbursementTable = Omit<DisbursementDTO, "id" | "delete_flag">;
 
 export const disbursementColumns: (keyof DisbursementTable)[] = [
     "disbursement_type_id",

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

@@ -33,4 +33,12 @@ export interface IAssessmentCalculated {
     new_calc?: boolean;
     previous_upgrade_weeks?: number;
     max_allowable?: number;
+    weekly_rate?: number;
+    phase_out_rate?: number;
+    weekly_phase_out_rate?: number;
+    last_issue_date?: Date;
+    last_due_date?: Date;
+    second_last_issue_date?: Date;
+    second_last_due_date?: Date;
+    category_desc?: string;
 }

src/api/models/dto/index.ts

@@ -10,4 +10,5 @@ export * from "./CslReasonDTO";
 export * from "./MsfaaDTO";
 export * from "./MailAddressDTO";
 export * from "./ExpensesDTO";
-export * from "./CsgLookupDTO";
+export * from "./CsgLookupDTO";
+export * from "./CsgThresholdDTO";

src/api/models/result/assessments/csgft/CsgftGlobalDTO.ts

@@ -1,3 +1,5 @@
 import { BaseGlobalDTO } from "../BaseGlobalDTO";
 
-export interface CsgftGlobalDTO extends BaseGlobalDTO {}
+export interface CsgftGlobalDTO extends BaseGlobalDTO {
+    csl_funding_request_id?: number;
+}

src/api/models/result/assessments/csgft/CsgftResultDTO.ts

@@ -0,0 +1,9 @@
+import { AssessmentDTO, DisbursementDTO, FundingRequestDTO } from "models/dto";
+import { ResultDTO } from "../../ResultDTO";
+import { CsgftGlobalDTO } from "./CsgftGlobalDTO";
+
+export interface CsgftResultDTO extends ResultDTO<AssessmentDTO> {
+    funding_request?: FundingRequestDTO;
+    disbursements: Array<DisbursementDTO>;
+    globals: CsgftGlobalDTO;
+}

src/api/models/result/index.ts

@@ -2,4 +2,5 @@ export * from "./ResultDTO";
 export * from "./assessments/BaseGlobalDTO"
 export * from "./assessments/cslft/CslftResultDTO";
 export * from "./assessments/cslft/CslftGlobalDTO";
+export * from "./assessments/csgft/CsgftResultDTO";
 export * from "./assessments/csgft/CsgftGlobalDTO";