Merge pull request #991 from DTS-STN/question-update

144220 Income questions updates
DTS-STN · Jan 10, 2024 · 088ac96 · 088ac96
2 parents 8aedc4b + 5643f8c
commit 088ac96
Show file tree

Hide file tree

Showing 30 changed files with 589 additions and 61 deletions.
diff --git a/__tests__/pages/api/benefits.test.ts b/__tests__/pages/api/benefits.test.ts
@@ -97,6 +97,8 @@ describe('consolidated benefit tests: unavailable and errors (screening out)', (
     const res = await mockGetRequest({
       ...income10k,
       ...age65NoDefer,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       receiveOAS: false,
       oasDeferDuration: undefined,
       maritalStatus: MaritalStatus.SINGLE,
@@ -124,6 +126,8 @@ describe('consolidated benefit tests: unavailable and errors (screening out)', (
     const res = await mockGetRequest({
       ...income10k,
       ...age65NoDefer,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       receiveOAS: false,
       oasDeferDuration: undefined,
       maritalStatus: MaritalStatus.SINGLE,
@@ -201,6 +205,8 @@ describe('consolidated benefit tests: unavailable and errors (screening out)', (
     const res = await mockGetRequest({
       ...income10k,
       ...age60NoDefer,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       receiveOAS: false,
       oasDeferDuration: undefined,
       maritalStatus: MaritalStatus.SINGLE,
@@ -256,6 +262,8 @@ describe('consolidated benefit tests: ineligible', () => {
     const res = await mockGetRequest({
       incomeAvailable: true,
       income: 20000,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       age: 50,
       oasDefer: false,
       receiveOAS: false,
@@ -340,6 +348,8 @@ describe('consolidated benefit tests: max income checks', () => {
       incomeAvailable: true,
       income: legalValues.gis.singleIncomeLimit,
       ...age65NoDefer,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       receiveOAS: false,
       oasDeferDuration: undefined,
       maritalStatus: MaritalStatus.SINGLE,
@@ -354,6 +364,8 @@ describe('consolidated benefit tests: max income checks', () => {
     res = await mockGetRequest({
       ...input,
       income: legalValues.gis.singleIncomeLimit - 1,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       invSeparated: false,
     })
     // expectGisEligible(res)
@@ -363,6 +375,8 @@ describe('consolidated benefit tests: max income checks', () => {
       incomeAvailable: true,
       income: legalValues.gis.spouseNoOasIncomeLimit,
       ...age65NoDefer,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       receiveOAS: false,
       oasDeferDuration: undefined,
       maritalStatus: MaritalStatus.PARTNERED,
@@ -392,6 +406,8 @@ describe('consolidated benefit tests: max income checks', () => {
       incomeAvailable: true,
       income: legalValues.gis.spouseOasIncomeLimit,
       ...age65NoDefer,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       receiveOAS: false,
       oasDeferDuration: undefined,
       maritalStatus: MaritalStatus.PARTNERED,
@@ -422,6 +438,8 @@ describe('consolidated benefit tests: max income checks', () => {
     const input = {
       incomeAvailable: true,
       income: legalValues.gis.spouseAlwIncomeLimit,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       ...age65NoDefer,
       receiveOAS: false,
       oasDeferDuration: undefined,
@@ -455,6 +473,8 @@ describe('consolidated benefit tests: max income checks', () => {
       incomeAvailable: true,
       income: legalValues.alw.alwIncomeLimit,
       ...age60NoDefer,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       receiveOAS: false,
       oasDeferDuration: undefined,
       maritalStatus: MaritalStatus.PARTNERED,
@@ -476,6 +496,8 @@ describe('consolidated benefit tests: max income checks', () => {
     res = await mockGetRequest({
       ...input,
       income: legalValues.alw.alwIncomeLimit - 1,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
     })
     // expectAlwEligible(res)
   })
@@ -485,6 +507,8 @@ describe('consolidated benefit tests: max income checks', () => {
       incomeAvailable: true,
       income: legalValues.alw.afsIncomeLimit,
       ...age60NoDefer,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       receiveOAS: false,
       oasDeferDuration: undefined,
       maritalStatus: MaritalStatus.WIDOWED,
@@ -505,6 +529,8 @@ describe('consolidated benefit tests: eligible: 65+', () => {
     const res = await mockGetRequest({
       ...income10k,
       ...age65NoDefer,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       receiveOAS: false,
       oasDeferDuration: undefined,
       maritalStatus: MaritalStatus.SINGLE,
@@ -527,6 +553,8 @@ describe('consolidated benefit tests: eligible: 65+', () => {
     const res = await mockGetRequest({
       incomeAvailable: true,
       income: 100000,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       ...age65NoDefer,
       receiveOAS: false,
       oasDeferDuration: undefined,
@@ -547,6 +575,8 @@ describe('consolidated benefit tests: eligible: 65+', () => {
   it('returns "eligible" - living in Canada, under 20 years in Canada, lived in social country', async () => {
     const res = await mockGetRequest({
       ...income10k,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       ...age65NoDefer,
       receiveOAS: false,
       oasDeferDuration: undefined,
@@ -567,6 +597,8 @@ describe('consolidated benefit tests: eligible: 65+', () => {
     const res = await mockGetRequest({
       ...income10k,
       ...age65NoDefer,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       receiveOAS: false,
       oasDeferDuration: undefined,
       maritalStatus: MaritalStatus.SINGLE,
@@ -599,6 +631,8 @@ describe('consolidated benefit tests: eligible: 65+', () => {
       ...income10k,
       ...age65NoDefer,
       receiveOAS: false,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       oasDeferDuration: undefined,
       maritalStatus: MaritalStatus.SINGLE,
       livingCountry: LivingCountry.NO_AGREEMENT,
@@ -629,6 +663,8 @@ describe('consolidated benefit tests: eligible: 65+', () => {
       ...income10k,
       ...age65NoDefer,
       receiveOAS: false,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       oasDeferDuration: undefined,
       maritalStatus: MaritalStatus.PARTNERED,
       ...canadian,
@@ -708,6 +744,8 @@ describe('consolidated benefit tests: eligible: 65+', () => {
     const res = await mockGetRequest({
       incomeAvailable: true,
       income: legalValues.oas.incomeLimit - 1,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       ...age65NoDefer,
       receiveOAS: false,
       oasDeferDuration: undefined,
@@ -744,6 +782,8 @@ describe('consolidated benefit tests: eligible: 65+', () => {
   it('returns "eligible" - married, full oas, age 75', async () => {
     const res = await mockGetRequest({
       ...income10k,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       age: 75,
       oasDefer: false,
       receiveOAS: false,
@@ -786,6 +826,8 @@ describe('consolidated benefit tests: eligible: 60-64', () => {
   it('returns "ALW eligible" - married', async () => {
     const res = await mockGetRequest({
       ...income10k,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       ...age60NoDefer,
       receiveOAS: false,
       oasDeferDuration: undefined,
@@ -837,6 +879,8 @@ describe('consolidated benefit tests: eligible: 60-64', () => {
     const res = await mockGetRequest({
       ...income10k,
       ...age60NoDefer,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       receiveOAS: false,
       oasDeferDuration: undefined,
       maritalStatus: MaritalStatus.PARTNERED,
@@ -862,6 +906,8 @@ describe('consolidated benefit tests: eligible: 60-64', () => {
     const res = await mockGetRequest({
       ...income10k,
       ...age60NoDefer,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       receiveOAS: false,
       oasDeferDuration: undefined,
       maritalStatus: MaritalStatus.PARTNERED,
@@ -888,6 +934,8 @@ describe('consolidated benefit tests: eligible: 60-64', () => {
     const res = await mockGetRequest({
       ...income10k,
       ...age60NoDefer,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       receiveOAS: false,
       oasDeferDuration: undefined,
       maritalStatus: MaritalStatus.PARTNERED,
@@ -915,6 +963,8 @@ describe('consolidated benefit tests: eligible: 60-64', () => {
   it('returns "ALW eligible" - age 64, married, 19 years in Canada, lived in social country', async () => {
     const res = await mockGetRequest({
       ...income10k,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       age: 64,
       oasDefer: false,
       receiveOAS: false,

diff --git a/__tests__/pages/api/field-reqs.test.ts b/__tests__/pages/api/field-reqs.test.ts
@@ -20,6 +20,8 @@ describe('field requirement analysis', () => {
     const res = await mockGetRequest({
       incomeAvailable: undefined,
       income: undefined,
+      incomeWork: undefined,
+      partnerIncomeWork: undefined,
       age: undefined,
       oasDefer: undefined,
       oasAge: undefined,
@@ -38,6 +40,7 @@ describe('field requirement analysis', () => {
     expect(res.body.missingFields).toEqual([
       FieldKey.AGE,
       FieldKey.INCOME,
+      FieldKey.INCOME_WORK,
       FieldKey.LEGAL_STATUS,
       FieldKey.LIVING_COUNTRY,
       FieldKey.LIVED_ONLY_IN_CANADA,
@@ -46,6 +49,7 @@ describe('field requirement analysis', () => {
     expect(res.body.visibleFields).toEqual([
       FieldKey.AGE,
       FieldKey.INCOME,
+      FieldKey.INCOME_WORK,
       FieldKey.LEGAL_STATUS,
       FieldKey.LIVING_COUNTRY,
       FieldKey.LIVED_ONLY_IN_CANADA,
@@ -56,6 +60,8 @@ describe('field requirement analysis', () => {
   it('requires no fields when all provided', async () => {
     const res = await mockGetRequest({
       ...income10k,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       age: 65,
       oasDefer: true,
       oasAge: 70,
@@ -84,6 +90,7 @@ describe('field requirement analysis', () => {
       FieldKey.OAS_AGE,
       // FieldKey.INCOME_AVAILABLE,
       FieldKey.INCOME,
+      FieldKey.INCOME_WORK,
       FieldKey.LEGAL_STATUS,
       FieldKey.LIVING_COUNTRY,
       FieldKey.LIVED_ONLY_IN_CANADA,
@@ -94,6 +101,7 @@ describe('field requirement analysis', () => {
       FieldKey.PARTNER_AGE,
       // FieldKey.PARTNER_INCOME_AVAILABLE,
       FieldKey.PARTNER_INCOME,
+      FieldKey.PARTNER_INCOME_WORK,
       // FieldKey.PARTNER_BENEFIT_STATUS,
       FieldKey.PARTNER_LEGAL_STATUS,
       FieldKey.PARTNER_LIVING_COUNTRY,
@@ -107,6 +115,8 @@ describe('field requirements analysis: conditional fields', () => {
   it('requires "yearsInCanadaSince18" when livedOnlyInCanada=true', async () => {
     const res = await mockGetRequest({
       ...income10k,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       ...age65NoDefer,
       receiveOAS: false,
       oasDeferDuration: undefined,
@@ -126,6 +136,8 @@ describe('field requirements analysis: conditional fields', () => {
   it('requires "everLivedSocialCountry" when living in Canada and under 10 years in Canada', async () => {
     const res = await mockGetRequest({
       ...income10k,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       ...age65NoDefer,
       receiveOAS: false,
       oasDeferDuration: undefined,
@@ -145,6 +157,8 @@ describe('field requirements analysis: conditional fields', () => {
   it('requires "everLivedSocialCountry" when living in No Agreement and under 20 years in Canada', async () => {
     const res = await mockGetRequest({
       ...income10k,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       ...age65NoDefer,
       receiveOAS: false,
       oasDeferDuration: undefined,
@@ -165,6 +179,8 @@ describe('field requirements analysis: conditional fields', () => {
   it('requires partner questions when marital=married', async () => {
     const res = await mockGetRequest({
       ...income10k,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       ...age65NoDefer,
       receiveOAS: false,
       oasDeferDuration: undefined,

diff --git a/__tests__/pages/api/help-me-find-out.test.ts b/__tests__/pages/api/help-me-find-out.test.ts
@@ -24,6 +24,8 @@ describe('Help Me Find Out scenarios', () => {
       incomeAvailable: true,
       income: legalValues.gis.spouseNoOasIncomeLimit,
       ...age65NoDefer,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       maritalStatus: MaritalStatus.PARTNERED,
       invSeparated: false,
       ...canadian,
@@ -45,6 +47,8 @@ describe('Help Me Find Out scenarios', () => {
     res = await mockGetRequest({
       ...input,
       income: legalValues.gis.spouseNoOasIncomeLimit - 1,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
     })
     // expectOasGisEligible(res)
     //expect(res.body.results.gis.entitlement.result).toEqual(0.72) // table 3
@@ -112,6 +116,8 @@ describe('Help Me Find Out scenarios', () => {
   it(`works when client old, partner young (partner=noAllowance, therefore gis table 3)`, async () => {
     const input = {
       incomeAvailable: true,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       income: legalValues.alw.alwIncomeLimit, // too high for allowance
       ...age65NoDefer,
       maritalStatus: MaritalStatus.PARTNERED,
@@ -137,6 +143,8 @@ describe('Help Me Find Out scenarios', () => {
     const input = {
       incomeAvailable: true,
       income: legalValues.alw.alwIncomeLimit - 1, // okay for allowance
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       ...age65NoDefer,
       maritalStatus: MaritalStatus.PARTNERED,
       invSeparated: false,
@@ -160,6 +168,8 @@ describe('Help Me Find Out scenarios', () => {
     const input = {
       ...incomeZero,
       ...age60NoDefer,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       maritalStatus: MaritalStatus.PARTNERED,
       invSeparated: false,
       ...canadian,
@@ -196,6 +206,8 @@ describe('Help Me Find Out scenarios', () => {
       ...age60NoDefer,
       maritalStatus: MaritalStatus.PARTNERED,
       invSeparated: false,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       ...canadian,
       livedOnlyInCanada: true,
       yearsInCanadaSince18: undefined,
@@ -223,6 +235,8 @@ describe('Help Me Find Out scenarios', () => {
     const input = {
       ...incomeZero,
       ...age60NoDefer,
+      incomeWork: 0,
+      partnerIncomeWork: 0,
       maritalStatus: MaritalStatus.PARTNERED,
       invSeparated: false,
       ...canadian,