Merge pull request #888 from DTS-STN/ado-141134

ADO-141134: Floor years in canada value & ADO-141547: Set limit to 20 when partner not living in Canada
DTS-STN · Sep 15, 2023 · 066cc07 · 066cc07
2 parents 5b0c458 + 36ef97f
commit 066cc07
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/utils/api/benefitHandler.ts b/utils/api/benefitHandler.ts
@@ -364,8 +364,10 @@ export class BenefitHandler {
       const partnerEliObj = OasEligibility(
         this.input.partner.age,
         this.input.partner.yearsInCanadaSince18,
-        this.input.partner.livedOnlyInCanada
+        this.input.partner.livedOnlyInCanada,
+        this.rawInput.partnerLivingCountry
       )
+
       if (this.input.partner.age > partnerEliObj.ageOfEligibility) {
         if (this.input.partner.age < 75) {
           this.input.partner.age = partnerEliObj.ageOfEligibility

diff --git a/utils/api/helpers/utils.ts b/utils/api/helpers/utils.ts
@@ -202,12 +202,13 @@ export function calculateAge(birthMonth: number, birthYear: number): number {
 export function OasEligibility(
   ageAtStart,
   yearsInCanadaAtStart,
-  livedOnlyInCanada = false
+  livedOnlyInCanada = false,
+  livingCountry = 'CAN'
 ) {
   let age = ageAtStart
   let yearsInCanada = yearsInCanadaAtStart
   const minAgeEligibility = 65
-  const minYearsOfResEligibility = 10
+  const minYearsOfResEligibility = livingCountry === 'CAN' ? 10 : 20
 
   let ageOfEligibility
   let yearsOfResAtEligibility
@@ -297,14 +298,15 @@ export function evaluateOASInput(input) {
     age > eliObj.ageOfEligibility
       ? input.yearsInCanadaSince18 - ageDiff
       : input.yearsInCanada + ageDiff
+
   if (deferralMonths !== 0 && !input.receiveOAS) {
     canDefer = true
     newInput['inputAge'] = input.age
     newInput['age'] = eliObj.ageOfEligibility
     newInput['receiveOAS'] = true
     newInput['yearsInCanadaSince18'] = input.livedOnlyInCanada
       ? 40
-      : Math.min(40, Math.round(newYearsInCan))
+      : Math.min(40, Math.floor(newYearsInCan))
     newInput['oasDeferDuration'] = JSON.stringify({
       months: Math.round(deferralMonths),
       years: 0,