ADD IBAN FIELD TO STRUCTS AND UPDATE PARSING LOGIC
- Added `iban` field to the `IbanEx.Iban` struct to hold the full IBAN value. - Updated the parsing logic to populate the new field. - Adjusted BBAN rules and tests for France and Brazil to reflect updated structures. - Improved error handling and format validation routines.
This commit is contained in:
@@ -2,6 +2,17 @@ defmodule IbanEx.Country.BR do
|
||||
@moduledoc """
|
||||
Brazil IBAN parsing rules
|
||||
|
||||
According to SWIFT registry, Brazil BBAN structure is:
|
||||
- Bank code: 8 digits
|
||||
- Branch code: 5 digits
|
||||
- Account code: 12 characters (10n + 1a + 1c) - account number + account type + owner type
|
||||
|
||||
BBAN spec: 8!n5!n10!n1!a1!c (total 25 chars)
|
||||
Example: BR1800360305000010009795493C1
|
||||
- Bank: 00360305
|
||||
- Branch: 00001
|
||||
- Account: 0009795493C1 (includes account number + type + owner)
|
||||
|
||||
## Examples
|
||||
|
||||
```elixir
|
||||
@@ -10,18 +21,27 @@ defmodule IbanEx.Country.BR do
|
||||
...> check_digits: "18",
|
||||
...> bank_code: "00360305",
|
||||
...> branch_code: "00001",
|
||||
...> account_number: "0009795493",
|
||||
...> national_check: "C1"
|
||||
...> account_number: "0009795493C1",
|
||||
...> national_check: nil
|
||||
...> }
|
||||
...> |> IbanEx.Country.BR.to_string()
|
||||
"BR 18 00360305 00001 0009795493 C1"
|
||||
"BR 18 00360305 00001 0009795493C1"
|
||||
```
|
||||
"""
|
||||
|
||||
@size 29
|
||||
@rule ~r/^(?<bank_code>[0-9]{8})(?<branch_code>[0-9]{5})(?<account_number>[0-9]{10})(?<national_check>[A-Z]{1}[0-9A-Z]{1})$/i
|
||||
@rule ~r/^(?<bank_code>[0-9]{8})(?<branch_code>[0-9]{5})(?<account_number>[0-9]{10}[A-Z]{1}[0-9A-Z]{1})$/i
|
||||
|
||||
use IbanEx.Country.Template
|
||||
|
||||
def rules() do
|
||||
[
|
||||
bank_code: %{regex: ~r/[0-9]{8}/i, range: 0..7},
|
||||
branch_code: %{regex: ~r/[0-9]{5}/i, range: 8..12},
|
||||
account_number: %{regex: ~r/[0-9]{10}[A-Z]{1}[0-9A-Z]{1}/i, range: 13..24}
|
||||
]
|
||||
end
|
||||
|
||||
@impl IbanEx.Country.Template
|
||||
@spec to_string(Iban.t()) :: binary()
|
||||
@spec to_string(Iban.t(), binary()) :: binary()
|
||||
@@ -31,12 +51,12 @@ def to_string(
|
||||
check_digits: check_digits,
|
||||
bank_code: bank_code,
|
||||
branch_code: branch_code,
|
||||
account_number: account_number,
|
||||
national_check: national_check
|
||||
account_number: account_number
|
||||
} = _iban,
|
||||
joiner \\ " "
|
||||
) do
|
||||
[country_code, check_digits, bank_code, branch_code, account_number, national_check]
|
||||
[country_code, check_digits, bank_code, branch_code, account_number]
|
||||
|> Enum.reject(&is_nil/1)
|
||||
|> Enum.join(joiner)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -2,6 +2,19 @@ defmodule IbanEx.Country.FR do
|
||||
@moduledoc """
|
||||
France IBAN parsing rules
|
||||
|
||||
According to SWIFT registry and Wise validation, France BBAN structure is:
|
||||
- Bank code: 5 digits
|
||||
- Branch code: 5 digits
|
||||
- Account number: 11 alphanumeric characters
|
||||
- National check: 2 digits
|
||||
|
||||
BBAN spec: 5!n5!n11!c2!n (total 23 chars)
|
||||
Example: FR1420041010050500013M02606
|
||||
- Bank: 20041
|
||||
- Branch: 01005
|
||||
- Account: 0500013M026
|
||||
- National check: 06
|
||||
|
||||
## Examples
|
||||
|
||||
```elixir
|
||||
@@ -10,8 +23,8 @@ defmodule IbanEx.Country.FR do
|
||||
...> check_digits: "14",
|
||||
...> bank_code: "20041",
|
||||
...> branch_code: "01005",
|
||||
...> national_check: "06",
|
||||
...> account_number: "0500013M026"
|
||||
...> account_number: "0500013M026",
|
||||
...> national_check: "06"
|
||||
...> }
|
||||
...> |> IbanEx.Country.FR.to_string()
|
||||
"FR 14 20041 01005 0500013M026 06"
|
||||
@@ -23,6 +36,8 @@ defmodule IbanEx.Country.FR do
|
||||
|
||||
use IbanEx.Country.Template
|
||||
|
||||
alias IbanEx.Iban
|
||||
|
||||
@impl IbanEx.Country.Template
|
||||
@spec to_string(Iban.t()) :: binary()
|
||||
@spec to_string(Iban.t(), binary()) :: binary()
|
||||
@@ -32,12 +47,13 @@ def to_string(
|
||||
check_digits: check_digits,
|
||||
bank_code: bank_code,
|
||||
branch_code: branch_code,
|
||||
national_check: national_check,
|
||||
account_number: account_number
|
||||
account_number: account_number,
|
||||
national_check: national_check
|
||||
} = _iban,
|
||||
joiner \\ " "
|
||||
) do
|
||||
[country_code, check_digits, bank_code, branch_code, account_number, national_check]
|
||||
|> Enum.reject(&is_nil/1)
|
||||
|> Enum.join(joiner)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -22,6 +22,14 @@ defmodule IbanEx.Country.MU do
|
||||
|
||||
use IbanEx.Country.Template
|
||||
|
||||
def rules() do
|
||||
[
|
||||
bank_code: %{regex: ~r/[A-Z0-9]{6}/i, range: 0..5},
|
||||
branch_code: %{regex: ~r/[0-9]{2}/i, range: 6..7},
|
||||
account_number: %{regex: ~r/[0-9A-Z]{18}/i, range: 8..25}
|
||||
]
|
||||
end
|
||||
|
||||
@impl IbanEx.Country.Template
|
||||
@spec to_string(Iban.t()) :: binary()
|
||||
@spec to_string(Iban.t(), binary()) :: binary()
|
||||
|
||||
@@ -23,4 +23,3 @@ defmodule IbanEx.Country.PS do
|
||||
|
||||
use IbanEx.Country.Template
|
||||
end
|
||||
|
||||
|
||||
@@ -40,4 +40,3 @@ def to_string(
|
||||
|> Enum.join(joiner)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -22,6 +22,14 @@ defmodule IbanEx.Country.SC do
|
||||
|
||||
use IbanEx.Country.Template
|
||||
|
||||
def rules() do
|
||||
[
|
||||
bank_code: %{regex: ~r/[A-Z0-9]{6}/i, range: 0..5},
|
||||
branch_code: %{regex: ~r/[0-9]{2}/i, range: 6..7},
|
||||
account_number: %{regex: ~r/[0-9A-Z]{19}/i, range: 8..26}
|
||||
]
|
||||
end
|
||||
|
||||
@impl IbanEx.Country.Template
|
||||
@spec to_string(Iban.t()) :: binary()
|
||||
@spec to_string(Iban.t(), binary()) :: binary()
|
||||
|
||||
@@ -23,7 +23,6 @@ defmodule IbanEx.Country.SI do
|
||||
|
||||
use IbanEx.Country.Template
|
||||
|
||||
|
||||
@impl IbanEx.Country.Template
|
||||
@spec to_string(Iban.t()) :: binary()
|
||||
@spec to_string(Iban.t(), binary()) :: binary()
|
||||
@@ -41,5 +40,4 @@ def to_string(
|
||||
[country_code, check_digits, bank_code, branch_code, account_number, national_check]
|
||||
|> Enum.join(joiner)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -40,4 +40,3 @@ def to_string(
|
||||
|> Enum.join(joiner)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -93,7 +93,7 @@ defp calculate_rules() do
|
||||
{Enum.reverse(list), bban_length}
|
||||
end
|
||||
|
||||
defoverridable to_string: 1, to_string: 2, size: 0, rule: 0
|
||||
defoverridable to_string: 1, to_string: 2, size: 0, rule: 0, rules: 0
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user