unify tax return possibilities iban page (#931)

* unify tax return possibilities iban page * add tex returns summary * ditch use memo * rever form.572 changes * revert test changes * revert changes * remove extra fields * update tests, lint * remove unnecessary test * run prettier * form calculator mozeZiadatVratitPreplatkyBonusyUroky * rever OutputJson change * change number calculations to use .plus methods in iban page * change iban step title * fix text formatiing * run prettier * update tests --------- Co-authored-by: Marek Vigaš <[email protected]>
slovensko-digital · Nov 16, 2024 · 79fd919 · 79fd919
1 parent c07b4b7
commit 79fd919
Show file tree

Hide file tree

Showing 16 changed files with 100 additions and 264 deletions.
diff --git a/__tests__/iban.test.ts b/__tests__/iban.test.ts
@@ -4,157 +4,34 @@ import { TaxForm } from '../src/types/TaxForm'
 
 describe('iban', () => {
   describe('#validate', () => {
-    describe('mozeZiadatVyplatitDanovyBonus', () => {
+    describe('mozeZiadatVratitPreplatkyBonusyUroky', () => {
       const taxFormMock = {
-        mozeZiadatVyplatitDanovyBonus: true,
-        mozeZiadatVratitDanovyPreplatok: false,
+        mozeZiadatVratitPreplatkyBonusyUroky: true,
       } as TaxForm
 
       testValidation(makeValidate(taxFormMock), [
         {
-          input: { ziadamVyplatitDanovyBonus: undefined },
-          expected: ['ziadamVyplatitDanovyBonus'],
+          input: { ziadamVyplatitDanovyBonusUrokPreplatok: undefined },
+          expected: ['ziadamVyplatitDanovyBonusUrokPreplatok'],
         },
-        { input: { ziadamVyplatitDanovyBonus: false }, expected: [] },
         {
-          input: { ziadamVyplatitDanovyBonus: true },
-          expected: ['iban'],
-        },
-        {
-          input: {
-            ziadamVyplatitDanovyBonus: true,
-            iban: 'a',
-          },
-          expected: ['iban'],
-        },
-        {
-          input: {
-            ziadamVyplatitDanovyBonus: true,
-            iban: 'SK6807200002891987426353',
-          },
-          expected: [],
-        },
-      ])
-    })
-
-    describe('mozeZiadatVratitDanovyPreplatok', () => {
-      const taxFormMock = {
-        mozeZiadatVyplatitDanovyBonus: false,
-        mozeZiadatVratitDanovyPreplatok: true,
-      } as TaxForm
-
-      testValidation(makeValidate(taxFormMock), [
-        {
-          input: { ziadamVratitDanovyPreplatok: undefined },
-          expected: ['ziadamVratitDanovyPreplatok'],
-        },
-        { input: { ziadamVratitDanovyPreplatok: false }, expected: [] },
-        {
-          input: { ziadamVratitDanovyPreplatok: true },
-          expected: ['iban'],
-        },
-        {
-          input: {
-            ziadamVratitDanovyPreplatok: true,
-            iban: 'a',
-          },
-          expected: ['iban'],
-        },
-        {
-          input: {
-            ziadamVratitDanovyPreplatok: true,
-            iban: 'SK6807200002891987426353',
-          },
-          expected: [],
-        },
-      ])
-    })
-
-    describe('mozeZiadatVyplatitDanovyBonus && mozeZiadatVratitDanovyPreplatok', () => {
-      const taxFormMock = {
-        mozeZiadatVyplatitDanovyBonus: true,
-        mozeZiadatVratitDanovyPreplatok: true,
-      } as TaxForm
-
-      testValidation(makeValidate(taxFormMock), [
-        {
-          input: {
-            ziadamVyplatitDanovyBonus: undefined,
-            ziadamVratitDanovyPreplatok: undefined,
-          },
-          expected: [
-            'ziadamVyplatitDanovyBonus',
-            'ziadamVratitDanovyPreplatok',
-          ],
-        },
-        {
-          input: {
-            ziadamVyplatitDanovyBonus: undefined,
-            ziadamVratitDanovyPreplatok: false,
-          },
-          expected: ['ziadamVyplatitDanovyBonus'],
-        },
-        {
-          input: {
-            ziadamVyplatitDanovyBonus: false,
-            ziadamVratitDanovyPreplatok: undefined,
-          },
-          expected: ['ziadamVratitDanovyPreplatok'],
-        },
-        {
-          input: {
-            ziadamVyplatitDanovyBonus: false,
-            ziadamVratitDanovyPreplatok: false,
-          },
+          input: { ziadamVyplatitDanovyBonusUrokPreplatok: false },
           expected: [],
         },
         {
-          input: {
-            ziadamVyplatitDanovyBonus: undefined,
-            ziadamVratitDanovyPreplatok: true,
-          },
-          expected: ['ziadamVyplatitDanovyBonus', 'iban'],
-        },
-        {
-          input: {
-            ziadamVyplatitDanovyBonus: true,
-            ziadamVratitDanovyPreplatok: undefined,
-          },
-          expected: ['ziadamVratitDanovyPreplatok', 'iban'],
-        },
-        {
-          input: {
-            ziadamVyplatitDanovyBonus: true,
-            ziadamVratitDanovyPreplatok: false,
-          },
-          expected: ['iban'],
-        },
-        {
-          input: {
-            ziadamVyplatitDanovyBonus: false,
-            ziadamVratitDanovyPreplatok: true,
-          },
-          expected: ['iban'],
-        },
-        {
-          input: {
-            ziadamVyplatitDanovyBonus: true,
-            ziadamVratitDanovyPreplatok: true,
-          },
+          input: { ziadamVyplatitDanovyBonusUrokPreplatok: true },
           expected: ['iban'],
         },
         {
           input: {
-            ziadamVyplatitDanovyBonus: true,
-            ziadamVratitDanovyPreplatok: true,
+            ziadamVyplatitDanovyBonusUrokPreplatok: true,
             iban: 'a',
           },
           expected: ['iban'],
         },
         {
           input: {
-            ziadamVyplatitDanovyBonus: true,
-            ziadamVratitDanovyPreplatok: true,
+            ziadamVyplatitDanovyBonusUrokPreplatok: true,
             iban: 'SK6807200002891987426353',
           },
           expected: [],

diff --git a/__tests__/routes.test.ts b/__tests__/routes.test.ts
@@ -51,7 +51,7 @@ describe('routes', () => {
     it('should return routes with children, with iban', () => {
       expect(
         getOrderedRoutes({
-          mozeZiadatVyplatitDanovyBonus: true,
+          mozeZiadatVratitPreplatkyBonusyUroky: true,
         } as TaxForm),
       ).toStrictEqual([
         homeRoute,
@@ -75,7 +75,7 @@ describe('routes', () => {
     it('should return routes without children, with iban', () => {
       expect(
         getOrderedRoutes({
-          mozeZiadatVyplatitDanovyBonus: true,
+          mozeZiadatVratitPreplatkyBonusyUroky: true,
         } as TaxForm),
       ).toStrictEqual([
         homeRoute,
@@ -114,7 +114,7 @@ describe('routes', () => {
 
         it('should be correct when eligible for refund', () => {
           const { nextRoute } = getRoutes('/suhrn', {
-            mozeZiadatVyplatitDanovyBonus: true,
+            mozeZiadatVratitPreplatkyBonusyUroky: true,
           } as TaxForm)
           expect(nextRoute()).toBe('/iban')
         })
@@ -137,7 +137,7 @@ describe('routes', () => {
 
         it('should be correct when eligible for refund', () => {
           const { previousRoute } = getRoutes('/vysledky', {
-            mozeZiadatVyplatitDanovyBonus: true,
+            mozeZiadatVratitPreplatkyBonusyUroky: true,
           } as TaxForm)
           expect(previousRoute()).toBe('/iban')
         })

diff --git a/__tests__/testCases/bugReport6Input.ts b/__tests__/testCases/bugReport6Input.ts
@@ -58,9 +58,8 @@ export const bugReport6Input: E2eTestUserInput = {
   r142_obchMeno: '',
   XIIoddiel_suhlasZaslUdaje: false,
   iban: 'SK6807200002891987426353',
-  ziadamVyplatitDanovyBonus: true,
+  ziadamVyplatitDanovyBonusUrokPreplatok: true,
   datum: '',
   partner_spolocna_domacnost: true,
   r006_titul_za: '',
-  ziadamVratitDanovyPreplatok: true,
 }
diff --git a/__tests__/testCases/withBonusInput.ts b/__tests__/testCases/withBonusInput.ts
@@ -48,7 +48,7 @@ export const withBonusInput: E2eTestUserInput = {
   hasChildren: true,
 
   /** SECTION Danovy bonus */
-  ziadamVyplatitDanovyBonus: true,
+  ziadamVyplatitDanovyBonusUrokPreplatok: true,
   iban: 'SK6807200002891987426353',
 
   expectNgoDonationValue: false,

diff --git a/__tests__/testCases/withEmploymentBonusInput.ts b/__tests__/testCases/withEmploymentBonusInput.ts
@@ -41,8 +41,7 @@ export const withEmploymentBonusInput: E2eTestUserInput = {
     },
   ],
   datum: '22.02.2020',
-  ziadamVyplatitDanovyBonus: false,
-  ziadamVratitDanovyPreplatok: true,
+  ziadamVyplatitDanovyBonusUrokPreplatok: true,
   iban: 'SK6807200002891987426353',
 
   expectNgoDonationValue: false,

diff --git a/__tests__/testCases/withTaxReturnInput.ts b/__tests__/testCases/withTaxReturnInput.ts
@@ -19,7 +19,7 @@ export const withTaxReturnInput: E2eTestUserInput = {
   children: [],
 
   /** SECTION Danovy preplatok */
-  ziadamVratitDanovyPreplatok: true,
+  ziadamVyplatitDanovyBonusUrokPreplatok: true,
   iban: 'SK6807200002891987426353',
 
   expectNgoDonationValue: true,

diff --git a/cypress/e2e/executeCase.ts b/cypress/e2e/executeCase.ts
@@ -351,54 +351,32 @@ const executeTestCase = (testCase: string) => {
 
         const taxForm = calculate(input)
 
-        if (taxForm.mozeZiadatVyplatitDanovyBonus) {
+        if (taxForm.mozeZiadatVratitPreplatkyBonusyUroky) {
           /** SECTION IBAN */
           assertUrl('/iban')
 
           cy.contains(
-            'Žiadam o vyplatenie daňového bonusu alebo rozdielu daňového bonusu',
+            'Chcete požiadať o vyplatenie daňových bonusov alebo preplatkov vo výške',
           )
           cy.get('[data-test=ineligible-message]').should('not.exist')
 
-          if (input.ziadamVyplatitDanovyBonus) {
-            getInput('ziadamVyplatitDanovyBonus', '-yes').click()
+          if (input.ziadamVyplatitDanovyBonusUrokPreplatok) {
+            getInput('ziadamVyplatitDanovyBonusUrokPreplatok', '-yes').click()
             typeToInput('iban', input)
           } else {
-            getInput('ziadamVyplatitDanovyBonus', '-no').click()
+            getInput('ziadamVyplatitDanovyBonusUrokPreplatok', '-no').click()
           }
 
-          next()
-        }
-
-        if (taxForm.mozeZiadatVratitDanovyBonusUroky) {
-          /** SECTION IBAN */
-          assertUrl('/iban')
-
-          cy.contains('Žiadam o vyplatenie daňového bonusu na zaplatené úroky')
-          cy.get('[data-test=ineligible-message]').should('not.exist')
-
-          if (input.ziadamVratitDanovyBonusUroky) {
-            getInput('ziadamVratitDanovyBonusUroky', '-yes').click()
-            typeToInput('iban', input)
-          } else {
-            getInput('ziadamVratitDanovyBonusUroky', '-no').click()
+          if (taxForm.mozeZiadatVyplatitDanovyBonus) {
+            cy.contains('Daňový bonus: ')
           }
 
-          next()
-        }
-
-        if (taxForm.mozeZiadatVratitDanovyPreplatok) {
-          /** SECTION IBAN */
-          assertUrl('/iban')
-
-          cy.contains('Žiadam o vrátenie daňového preplatku')
-          cy.get('[data-test=ineligible-message]').should('not.exist')
+          if (taxForm.mozeZiadatVratitDanovyBonusUroky) {
+            cy.contains('Daňový bonus na zaplatené úroky: ')
+          }
 
-          if (input.ziadamVratitDanovyPreplatok) {
-            getInput('ziadamVratitDanovyPreplatok', '-yes').click()
-            typeToInput('iban', input)
-          } else {
-            getInput('ziadamVratitDanovyPreplatok', '-no').click()
+          if (taxForm.mozeZiadatVratitDanovyPreplatok) {
+            cy.contains('Daňový preplatok: ')
           }
 
           next()

diff --git a/cypress/e2e/pages.spec.ts b/cypress/e2e/pages.spec.ts
@@ -902,15 +902,15 @@ describe('IBAN page', () => {
 
     getError().should('have.length', 1)
 
-    getInput('ziadamVyplatitDanovyBonus', '-no').click()
+    getInput('ziadamVyplatitDanovyBonusUrokPreplatok', '-no').click()
     next()
     getError().should('have.length', 0)
 
     assertUrl('/vysledky')
     cy.get('.govuk-back-link').click()
     getError().should('have.length', 0)
 
-    getInput('ziadamVyplatitDanovyBonus', '-yes').click()
+    getInput('ziadamVyplatitDanovyBonusUrokPreplatok', '-yes').click()
     getInput('iban').should('exist')
     next()
 

diff --git a/src/lib/calculation.ts b/src/lib/calculation.ts
@@ -732,6 +732,13 @@ export function calculate(input: TaxFormUserInput): TaxForm {
     get mozeZiadatVratitDanovyBonusUroky() {
       return this.r127.gt(0)
     },
+    get mozeZiadatVratitPreplatkyBonusyUroky() {
+      return (
+        this.mozeZiadatVyplatitDanovyBonus ||
+        this.mozeZiadatVratitDanovyPreplatok ||
+        this.mozeZiadatVratitDanovyBonusUroky
+      )
+    },
     get r127() {
       return round(Decimal.max(this.r126.minus(this.r118), 0))
     },
@@ -849,9 +856,8 @@ export function calculate(input: TaxFormUserInput): TaxForm {
     },
 
     /** SECTION Danovy bonus */
-    ziadamVyplatitDanovyBonus: input?.ziadamVyplatitDanovyBonus ?? false,
-    ziadamVratitDanovyPreplatok: input?.ziadamVratitDanovyPreplatok ?? false,
-    ziadamVratitDanovyBonusUroky: input?.ziadamVratitDanovyBonusUroky ?? false,
+    ziadamVyplatitDanovyBonusUrokPreplatok:
+      input?.ziadamVyplatitDanovyBonusUrokPreplatok ?? false,
     iban: input?.iban ? input?.iban.replace(/\s/g, '') : '',
 
     datum: input.datum,

diff --git a/src/lib/initialValues.ts b/src/lib/initialValues.ts
@@ -117,7 +117,7 @@ export const twoPercentInitialValues: TwoPercentUserInput = {
 
 export const taxBonusInitialInput: TaxBonusUserInput = {
   iban: '',
-  ziadamVyplatitDanovyBonus: undefined,
+  ziadamVyplatitDanovyBonusUrokPreplatok: undefined,
 }
 
 export const initTaxFormUserInputValues: TaxFormUserInput = {

diff --git a/src/lib/routes.ts b/src/lib/routes.ts
@@ -29,10 +29,7 @@ export type Route =
 
 export const getOrderedRoutes = (taxForm: TaxForm): ReadonlyArray<Route> => {
   const getIbanRoute = (): Route[] => {
-    const isIbanRequired =
-      taxForm.mozeZiadatVyplatitDanovyBonus ||
-      taxForm.mozeZiadatVratitDanovyPreplatok ||
-      taxForm.mozeZiadatVratitDanovyBonusUroky
+    const isIbanRequired = taxForm.mozeZiadatVratitPreplatkyBonusyUroky
     return isIbanRequired ? ['/iban'] : []
   }