Merge pull request #275 from bcgov/UpdateLast45dayRuleforNextTerm

Prashanthi-Sivanarayana · web-flow · commit 445d27d87415 · 2024-11-11T12:45:25.000-05:00
Update the payment rule for applying next term in advance
diff --git a/OFM.Infrastructure.WebAPI/Services/Processes/Payments/P520GenerateAllowancePaymentProvider.cs b/OFM.Infrastructure.WebAPI/Services/Processes/Payments/P520GenerateAllowancePaymentProvider.cs
@@ -413,7 +413,7 @@ private async Task<JsonObject> ProcessTransportationPayments(Application baseApp
         {
             if (approvedSA.ofm_allowance_type == ecc_allowance_type.Transportation)
             {
-                if (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value,firstAnniversaryDate) || CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) || CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value))
+                if ((CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value,firstAnniversaryDate) && approvedSA.ofm_renewal_term == 1) || (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) && approvedSA.ofm_renewal_term == 2) || (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value) && approvedSA.ofm_renewal_term == 3))
             
                 {
                     int retroActiveMonthsCount = approvedSA.ofm_retroactive_date!.HasValue ? (approvedSA.ofm_start_date.Value.Year - approvedSA.ofm_retroactive_date!.Value.Year) * 12 + approvedSA.ofm_start_date.Value.Month - approvedSA.ofm_retroactive_date.Value.Month : 0;
@@ -490,21 +490,21 @@ private async Task<JsonObject> CreateSinglePayment(SupplementaryApplication appr
             DateTime effectiveDate = invoiceDate;
             //this applies if supplementary application is submitted within last 45 days to last 30 days.
 
-            if ((CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) || CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) || CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, fundingEndDate.Value)))
+            if (((CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) &&  approvedSA.ofm_renewal_term == 1) || (CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) && approvedSA.ofm_renewal_term == 2) || (CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, fundingEndDate.Value) && approvedSA.ofm_renewal_term == 3)))
             {
                 invoiceReceivedDate = paymentDate.GetFirstDayOfFollowingNextMonth(holidaysList);
                 invoiceDate = invoiceReceivedDate.GetCFSInvoiceDate(holidaysList, _BCCASApi.PayableInDays);
                 effectiveDate = invoiceDate;
             }
-            else if ((CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) || CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) || CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value)))
+            else if (((CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) && approvedSA.ofm_renewal_term == 1) || (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) && approvedSA.ofm_renewal_term == 2) || (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value) && approvedSA.ofm_renewal_term == 3)))
             {
                 invoiceReceivedDate = paymentDate.GetFirstDayOfFollowingMonth(holidaysList);
                 invoiceDate = invoiceReceivedDate.GetCFSInvoiceDate(holidaysList, _BCCASApi.PayableInDays);
                 effectiveDate = invoiceDate;
             }
 
 
-                if (approvedSA.ofm_retroactive_date is not null && !(CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) || CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) || CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value)))
+                if (approvedSA.ofm_retroactive_date is not null && !((CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) && approvedSA.ofm_renewal_term == 1) || (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) && approvedSA.ofm_renewal_term == 2) || (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value) && approvedSA.ofm_renewal_term == 3)))
             {
                 // Date calculation logic is different for mid-year supp application. Overriding regular date logic above
                 // Invoice received date is always the last business date of previous month except for first payment of the First funding year, it is 5 business day after the last business day of the last month.
@@ -570,20 +570,20 @@ private async Task<JsonObject> CreatePaymentsInBatch(Application baseApplication
                 DateTime effectiveDate = invoiceDate;
 
                 //this applies if supplementary application is submitted within 45 days.
-                 if ((CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) || CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) || CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, fundingEndDate.Value)))
+                 if (((CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) && approvedSA.ofm_renewal_term == 1) || (CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) && approvedSA.ofm_renewal_term == 2) || (CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, fundingEndDate.Value) && approvedSA.ofm_renewal_term == 3)))
                 {
                     invoiceReceivedDate = paymentDate.GetFirstDayOfFollowingNextMonth(holidaysList);
                     invoiceDate = invoiceReceivedDate.GetCFSInvoiceDate(holidaysList, _BCCASApi.PayableInDays);
                     effectiveDate = invoiceDate;
-                }else if ((CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) || CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) || CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value)))
+                }else if (((CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) && approvedSA.ofm_renewal_term == 1) || (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) && approvedSA.ofm_renewal_term == 2) || (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value) && approvedSA.ofm_renewal_term == 3)))
                 {
                     invoiceReceivedDate = paymentDate.GetFirstDayOfFollowingMonth(holidaysList);
                     invoiceDate = invoiceReceivedDate.GetCFSInvoiceDate(holidaysList, _BCCASApi.PayableInDays);
                     effectiveDate = invoiceDate;
                 }
 
 
-                if (approvedSA.ofm_retroactive_date is not null && !(CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) || CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) || CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value)))
+                if (approvedSA.ofm_retroactive_date is not null && !((CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) && approvedSA.ofm_renewal_term == 1) || (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) && approvedSA.ofm_renewal_term == 2) || (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value) && approvedSA.ofm_renewal_term == 3)))
                 {
                     // Date calculation logic is different for mid-year supp application. Overriding regular date logic above
                     // Invoice received date is always the last business date of previous month except for first payment of the First funding year, it is 5 business day after the last business day of the last month.

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ private async Task<JsonObject> ProcessTransportationPayments(Application baseApp`
`413`	`413`	`{`
`414`	`414`	`if (approvedSA.ofm_allowance_type == ecc_allowance_type.Transportation)`
`415`	`415`	`{`
`416`		`- if (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value,firstAnniversaryDate) \|\| CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) \|\| CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value))`
	`416`	`+ if ((CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value,firstAnniversaryDate) && approvedSA.ofm_renewal_term == 1) \|\| (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) && approvedSA.ofm_renewal_term == 2) \|\| (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value) && approvedSA.ofm_renewal_term == 3))`
`417`	`417`
`418`	`418`	`{`
`419`	`419`	`int retroActiveMonthsCount = approvedSA.ofm_retroactive_date!.HasValue ? (approvedSA.ofm_start_date.Value.Year - approvedSA.ofm_retroactive_date!.Value.Year) * 12 + approvedSA.ofm_start_date.Value.Month - approvedSA.ofm_retroactive_date.Value.Month : 0;`
`@@ -490,21 +490,21 @@ private async Task<JsonObject> CreateSinglePayment(SupplementaryApplication appr`
`490`	`490`	`DateTime effectiveDate = invoiceDate;`
`491`	`491`	`//this applies if supplementary application is submitted within last 45 days to last 30 days.`
`492`	`492`
`493`		`- if ((CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) \|\| CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) \|\| CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, fundingEndDate.Value)))`
	`493`	`+ if (((CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) && approvedSA.ofm_renewal_term == 1) \|\| (CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) && approvedSA.ofm_renewal_term == 2) \|\| (CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, fundingEndDate.Value) && approvedSA.ofm_renewal_term == 3)))`
`494`	`494`	`{`
`495`	`495`	`invoiceReceivedDate = paymentDate.GetFirstDayOfFollowingNextMonth(holidaysList);`
`496`	`496`	`invoiceDate = invoiceReceivedDate.GetCFSInvoiceDate(holidaysList, _BCCASApi.PayableInDays);`
`497`	`497`	`effectiveDate = invoiceDate;`
`498`	`498`	`}`
`499`		`- else if ((CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) \|\| CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) \|\| CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value)))`
	`499`	`+ else if (((CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) && approvedSA.ofm_renewal_term == 1) \|\| (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) && approvedSA.ofm_renewal_term == 2) \|\| (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value) && approvedSA.ofm_renewal_term == 3)))`
`500`	`500`	`{`
`501`	`501`	`invoiceReceivedDate = paymentDate.GetFirstDayOfFollowingMonth(holidaysList);`
`502`	`502`	`invoiceDate = invoiceReceivedDate.GetCFSInvoiceDate(holidaysList, _BCCASApi.PayableInDays);`
`503`	`503`	`effectiveDate = invoiceDate;`
`504`	`504`	`}`
`505`	`505`
`506`	`506`
`507`		`- if (approvedSA.ofm_retroactive_date is not null && !(CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) \|\| CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) \|\| CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value)))`
	`507`	`+ if (approvedSA.ofm_retroactive_date is not null && !((CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) && approvedSA.ofm_renewal_term == 1) \|\| (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) && approvedSA.ofm_renewal_term == 2) \|\| (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value) && approvedSA.ofm_renewal_term == 3)))`
`508`	`508`	`{`
`509`	`509`	`// Date calculation logic is different for mid-year supp application. Overriding regular date logic above`
`510`	`510`	`// Invoice received date is always the last business date of previous month except for first payment of the First funding year, it is 5 business day after the last business day of the last month.`
`@@ -570,20 +570,20 @@ private async Task<JsonObject> CreatePaymentsInBatch(Application baseApplication`
`570`	`570`	`DateTime effectiveDate = invoiceDate;`
`571`	`571`
`572`	`572`	`//this applies if supplementary application is submitted within 45 days.`
`573`		`- if ((CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) \|\| CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) \|\| CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, fundingEndDate.Value)))`
	`573`	`+ if (((CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) && approvedSA.ofm_renewal_term == 1) \|\| (CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) && approvedSA.ofm_renewal_term == 2) \|\| (CheckSubmissionIsWithinLastMonth(approvedSA.ofm_submittedon.Value, fundingEndDate.Value) && approvedSA.ofm_renewal_term == 3)))`
`574`	`574`	`{`
`575`	`575`	`invoiceReceivedDate = paymentDate.GetFirstDayOfFollowingNextMonth(holidaysList);`
`576`	`576`	`invoiceDate = invoiceReceivedDate.GetCFSInvoiceDate(holidaysList, _BCCASApi.PayableInDays);`
`577`	`577`	`effectiveDate = invoiceDate;`
`578`		`- }else if ((CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) \|\| CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) \|\| CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value)))`
	`578`	`+ }else if (((CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) && approvedSA.ofm_renewal_term == 1) \|\| (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) && approvedSA.ofm_renewal_term == 2) \|\| (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value) && approvedSA.ofm_renewal_term == 3)))`
`579`	`579`	`{`
`580`	`580`	`invoiceReceivedDate = paymentDate.GetFirstDayOfFollowingMonth(holidaysList);`
`581`	`581`	`invoiceDate = invoiceReceivedDate.GetCFSInvoiceDate(holidaysList, _BCCASApi.PayableInDays);`
`582`	`582`	`effectiveDate = invoiceDate;`
`583`	`583`	`}`
`584`	`584`
`585`	`585`
`586`		`- if (approvedSA.ofm_retroactive_date is not null && !(CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) \|\| CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) \|\| CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value)))`
	`586`	`+ if (approvedSA.ofm_retroactive_date is not null && !((CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, firstAnniversaryDate) && approvedSA.ofm_renewal_term == 1) \|\| (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, secondAnniversaryDate) && approvedSA.ofm_renewal_term == 2) \|\| (CheckSubmissionIsWithinLast45days(approvedSA.ofm_submittedon.Value, fundingEndDate.Value) && approvedSA.ofm_renewal_term == 3)))`
`587`	`587`	`{`
`588`	`588`	`// Date calculation logic is different for mid-year supp application. Overriding regular date logic above`
`589`	`589`	`// Invoice received date is always the last business date of previous month except for first payment of the First funding year, it is 5 business day after the last business day of the last month.`