Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(old-age pension): Refactor bank functions #12963

Merged
merged 3 commits into from
Dec 4, 2023
Merged

feat(old-age pension): Refactor bank functions #12963

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f034f8
[TS-304] refactor bank functions?
veronikasif Dec 4, 2023
1b0388c
Fixed merge conflict
veronikasif Dec 4, 2023
756c941
Removed duplicate import
veronikasif Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions ...odules/templates/social-insurance-administration/social-insurance-administration-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ import {
} from '@island.is/application/templates/social-insurance-administration/old-age-pension'
import { getValueViaPath } from '@island.is/application/core'
import { BankAccountType } from '@island.is/application/templates/social-insurance-administration-core/constants'
import { formatBank } from '@island.is/application/templates/social-insurance-administration-core/socialInsuranceAdministrationUtils'
import {
formatBank,
shouldNotUpdateBankAccount,
} from '@island.is/application/templates/social-insurance-administration-core/socialInsuranceAdministrationUtils'

export const transformApplicationToOldAgePensionDTO = (
application: Application,
Expand All @@ -35,8 +38,12 @@ export const transformApplicationToOldAgePensionDTO = (
bankName,
bankAddress,
currency,
paymentInfo,
} = getApplicationAnswers(application.answers)
const { email } = getApplicationExternalData(application.externalData)
const { bankInfo, email } = getApplicationExternalData(
application.externalData,
)

// If foreign residence is found then this is always true
const residenceHistoryQuestion = getValueViaPath(
application.answers,
Expand All @@ -51,10 +58,7 @@ export const transformApplicationToOldAgePensionDTO = (
},
comment: comment,
applicationId: application.id,
...(!shouldNotUpdateBankAccount(
application.answers,
application.externalData,
) && {
...(!shouldNotUpdateBankAccount(bankInfo, paymentInfo) && {
...(bankAccountType === BankAccountType.ICELANDIC && {
domesticBankInfo: {
bank: formatBank(bank),
Expand Down
78 changes: 77 additions & 1 deletion ...lates/social-insurance-administration/core/src/socialInsuranceAdministrationUtils.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { BankAccountType } from './constants'
import {
friendlyFormatSWIFT,
getBankIsk,
friendlyFormatIBAN,
validIBAN,
validSWIFT,
shouldNotUpdateBankAccount,
} from './socialInsuranceAdministrationUtils'
import { BankInfo } from './types'
import { BankInfo, PaymentInfo } from './types'

describe('getBankIsk', () => {
it('should return icelandic bank number if bank, ledger and account number is returned', () => {
Expand Down Expand Up @@ -99,3 +101,77 @@ describe('friendlyFormat & valid', () => {
expect(true).toEqual(swift)
})
})

describe('shouldNotUpdateBankAccount', () => {
it('should return true if bank account returned from TR is not changed', () => {
const bankInfo: BankInfo = {
bank: '2222',
ledger: '00',
accountNumber: '123456',
}
const paymentInfo: PaymentInfo = {
bankAccountType: BankAccountType.ICELANDIC,
bank: '222200123456',
}
const res = shouldNotUpdateBankAccount(bankInfo, paymentInfo)

expect(true).toEqual(res)
})

it('should return false if bank account returned from TR is changed', () => {
const bankInfo: BankInfo = {
bank: '2222',
ledger: '00',
accountNumber: '123456',
}
const paymentInfo: PaymentInfo = {
bankAccountType: BankAccountType.ICELANDIC,
bank: '222200000000',
}
const res = shouldNotUpdateBankAccount(bankInfo, paymentInfo)

expect(false).toEqual(res)
})

it('should return true if foreign bank account returned from TR is not changed', () => {
const bankInfo: BankInfo = {
iban: 'NL91ABNA0417164300',
swift: 'NEDSZAJJXXX',
foreignBankName: 'Heiti banka',
foreignBankAddress: 'Heimili banka',
currency: 'EUR',
}
const paymentInfo: PaymentInfo = {
bankAccountType: BankAccountType.FOREIGN,
iban: 'NL91ABNA0417164300',
swift: 'NEDSZAJJXXX',
bankName: 'Heiti banka',
bankAddress: 'Heimili banka',
currency: 'EUR',
}
const res = shouldNotUpdateBankAccount(bankInfo, paymentInfo)

expect(true).toEqual(res)
})

it('should return false if foreign bank account returned from TR is changed', () => {
const bankInfo: BankInfo = {
iban: 'NLLLABNA0417164300',
swift: 'NEDSZAJJXXX',
foreignBankName: 'Heiti banka',
foreignBankAddress: 'Heimili banka',
currency: 'EUR',
}
const paymentInfo: PaymentInfo = {
bankAccountType: BankAccountType.FOREIGN,
iban: 'NL91ABNA0417164300',
swift: 'NEDSZAJJXXX',
bankName: 'Heiti banka',
bankAddress: 'Heimili banka',
currency: 'EUR',
}
const res = shouldNotUpdateBankAccount(bankInfo, paymentInfo)

expect(false).toEqual(res)
})
})
54 changes: 53 additions & 1 deletion .../templates/social-insurance-administration/core/src/socialInsuranceAdministrationUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import isEmpty from 'lodash/isEmpty'
import { BankInfo } from './types'
import { BankInfo, PaymentInfo } from './types'
import { BankAccountType } from './constants'

export const formatBankInfo = (bankInfo: string) => {
const formattedBankInfo = bankInfo.replace(/[^0-9]/g, '')
Expand Down Expand Up @@ -57,3 +58,54 @@ export const validSWIFT = (value: string | undefined) => {
export const formatBank = (bankInfo: string) => {
return bankInfo.replace(/^(.{4})(.{2})/, '$1-$2-')
}

// We should only send bank account to TR if applicant is registering
// new one or changing.
export const shouldNotUpdateBankAccount = (
bankInfo: BankInfo,
paymentInfo: PaymentInfo,
) => {
const {
bankAccountType,
bank,
iban,
swift,
bankName,
bankAddress,
currency,
} = paymentInfo
if (bankAccountType === BankAccountType.ICELANDIC) {
return getBankIsk(bankInfo) === bank ?? false
} else {
return (
!isEmpty(bankInfo) &&
bankInfo.iban === iban &&
bankInfo.swift === swift &&
bankInfo.foreignBankName === bankName &&
bankInfo.foreignBankAddress === bankAddress &&
bankInfo.currency === currency
)
}
}

export const getCurrencies = (currencies: string[]) => {
return (
currencies.map((i) => ({
label: i,
value: i,
})) ?? []
)
}

export const typeOfBankInfo = (
bankInfo: BankInfo,
bankAccountType: BankAccountType,
) => {
return bankAccountType
? bankAccountType
: !isEmpty(bankInfo)
? bankInfo.bank && bankInfo.ledger && bankInfo.accountNumber
? BankAccountType.ICELANDIC
: BankAccountType.FOREIGN
: BankAccountType.ICELANDIC
}
13 changes: 13 additions & 0 deletions libs/application/templates/social-insurance-administration/core/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { BankAccountType } from './constants'
import { MessageDescriptor } from 'react-intl'

export interface BankInfo {
Expand All @@ -17,6 +18,18 @@ export interface ApplicantInfo {
emailAddress?: string
}

export interface PaymentInfo {
bankAccountType: BankAccountType
bank?: string
ledger?: string
accountNumber?: string
iban?: string
swift?: string
bankName?: string
bankAddress?: string
currency?: string
}

export interface Attachments {
attachments: FileType[]
label: MessageDescriptor
Expand Down
79 changes: 56 additions & 23 deletions .../templates/social-insurance-administration/old-age-pension/src/forms/OldAgePensionForm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ import {
import {
getApplicationAnswers,
getApplicationExternalData,
getCurrencies,
getTaxOptions,
getYesNOOptions,
isEarlyRetirement,
typeOfBankInfo,
} from '../lib/oldAgePensionUtils'
import { ApplicantInfo } from '@island.is/application/templates/social-insurance-administration-core/types'
import {
friendlyFormatIBAN,
friendlyFormatSWIFT,
getBankIsk,
getCurrencies,
typeOfBankInfo,
} from '@island.is/application/templates/social-insurance-administration-core/socialInsuranceAdministrationUtils'
import { buildFormConclusionSection } from '@island.is/application/ui-forms'
import isEmpty from 'lodash/isEmpty'
Expand Down Expand Up @@ -264,12 +264,13 @@ export const OldAgePensionForm: Form = buildForm({
const { bankAccountType } = getApplicationAnswers(
application.answers,
)
const { bankInfo } = getApplicationExternalData(
application.externalData,
)

const type =
bankAccountType ??
typeOfBankInfo(
application.answers,
application.externalData,
)
typeOfBankInfo(bankInfo, bankAccountType)

return type === BankAccountType.ICELANDIC
? oldAgePensionFormMessage.payment.alertMessage
Expand All @@ -281,11 +282,16 @@ export const OldAgePensionForm: Form = buildForm({
buildRadioField({
id: 'paymentInfo.bankAccountType',
title: '',
defaultValue: (application: Application) =>
typeOfBankInfo(
defaultValue: (application: Application) => {
const { bankAccountType } = getApplicationAnswers(
application.answers,
)
const { bankInfo } = getApplicationExternalData(
application.externalData,
),
)

return typeOfBankInfo(bankInfo, bankAccountType)
},
options: [
{
label:
Expand Down Expand Up @@ -313,9 +319,13 @@ export const OldAgePensionForm: Form = buildForm({
return getBankIsk(bankInfo)
},
condition: (formValue: FormValue, externalData) => {
const { bankAccountType } = getApplicationAnswers(formValue)
const { bankInfo } =
getApplicationExternalData(externalData)

const radio =
(formValue.paymentInfo as FormValue)?.bankAccountType ??
typeOfBankInfo(formValue, externalData)
bankAccountType ??
typeOfBankInfo(bankInfo, bankAccountType)
return radio === BankAccountType.ICELANDIC
},
}),
Expand All @@ -330,9 +340,13 @@ export const OldAgePensionForm: Form = buildForm({
return friendlyFormatIBAN(bankInfo.iban)
},
condition: (formValue: FormValue, externalData) => {
const { bankAccountType } = getApplicationAnswers(formValue)
const { bankInfo } =
getApplicationExternalData(externalData)

const radio =
(formValue.paymentInfo as FormValue)?.bankAccountType ??
typeOfBankInfo(formValue, externalData)
bankAccountType ??
typeOfBankInfo(bankInfo, bankAccountType)
return radio === BankAccountType.FOREIGN
},
}),
Expand All @@ -353,9 +367,13 @@ export const OldAgePensionForm: Form = buildForm({
return friendlyFormatSWIFT(bankInfo.swift)
},
condition: (formValue: FormValue, externalData) => {
const { bankAccountType } = getApplicationAnswers(formValue)
const { bankInfo } =
getApplicationExternalData(externalData)

const radio =
(formValue.paymentInfo as FormValue)?.bankAccountType ??
typeOfBankInfo(formValue, externalData)
bankAccountType ??
typeOfBankInfo(bankInfo, bankAccountType)
return radio === BankAccountType.FOREIGN
},
}),
Expand All @@ -364,18 +382,25 @@ export const OldAgePensionForm: Form = buildForm({
title: oldAgePensionFormMessage.payment.currency,
width: 'half',
placeholder: oldAgePensionFormMessage.payment.selectCurrency,
options: ({ externalData }: Application) =>
getCurrencies(externalData),
options: ({ externalData }: Application) => {
const { currencies } =
getApplicationExternalData(externalData)
return getCurrencies(currencies)
},
defaultValue: (application: Application) => {
const { bankInfo } = getApplicationExternalData(
application.externalData,
)
return !isEmpty(bankInfo) ? bankInfo.currency : ''
},
condition: (formValue: FormValue, externalData) => {
const { bankAccountType } = getApplicationAnswers(formValue)
const { bankInfo } =
getApplicationExternalData(externalData)

const radio =
(formValue.paymentInfo as FormValue)?.bankAccountType ??
typeOfBankInfo(formValue, externalData)
bankAccountType ??
typeOfBankInfo(bankInfo, bankAccountType)
return radio === BankAccountType.FOREIGN
},
}),
Expand All @@ -390,9 +415,13 @@ export const OldAgePensionForm: Form = buildForm({
return !isEmpty(bankInfo) ? bankInfo.foreignBankName : ''
},
condition: (formValue: FormValue, externalData) => {
const { bankAccountType } = getApplicationAnswers(formValue)
const { bankInfo } =
getApplicationExternalData(externalData)

const radio =
(formValue.paymentInfo as FormValue)?.bankAccountType ??
typeOfBankInfo(formValue, externalData)
bankAccountType ??
typeOfBankInfo(bankInfo, bankAccountType)
return radio === BankAccountType.FOREIGN
},
}),
Expand All @@ -407,9 +436,13 @@ export const OldAgePensionForm: Form = buildForm({
return !isEmpty(bankInfo) ? bankInfo.foreignBankAddress : ''
},
condition: (formValue: FormValue, externalData) => {
const { bankAccountType } = getApplicationAnswers(formValue)
const { bankInfo } =
getApplicationExternalData(externalData)

const radio =
(formValue.paymentInfo as FormValue)?.bankAccountType ??
typeOfBankInfo(formValue, externalData)
bankAccountType ??
typeOfBankInfo(bankInfo, bankAccountType)
return radio === BankAccountType.FOREIGN
},
}),
Expand Down
Loading
Loading