Merge pull request #90 from gocardless/aussie_national_id

Return correct swift national id for Australia
gocardless · Feb 8, 2018 · 60c616a · 60c616a
2 parents ee2a1d1 + a117dbb
commit 60c616a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/data/structures.yml b/data/structures.yml
@@ -58,6 +58,7 @@ AU:
   :pseudo_iban_bank_code_length: 0
   :pseudo_iban_branch_code_length: 6
   :pseudo_iban_account_number_length: 9
+  :national_id_length: 6
 AZ:
   :bank_code_position: 5
   :bank_code_length: 4

diff --git a/lib/ibandit/iban.rb b/lib/ibandit/iban.rb
@@ -45,7 +45,7 @@ def to_s(format = :compact)
     ###################
 
     def swift_national_id
-      return unless decomposable?
+      return if swift_bank_code.nil? && swift_branch_code.nil?
 
       national_id = swift_bank_code.to_s
       national_id += swift_branch_code.to_s

diff --git a/spec/ibandit/iban_spec.rb b/spec/ibandit/iban_spec.rb
@@ -175,6 +175,7 @@
       its(:swift_bank_code) { is_expected.to be_nil }
       its(:swift_branch_code) { is_expected.to eq("123456") }
       its(:swift_account_number) { is_expected.to eq("123456789") }
+      its(:swift_national_id) { is_expected.to eq("123456") }
       its(:iban) { is_expected.to be_nil }
       its(:pseudo_iban) { is_expected.to eq("AUZZ123456123456789") }
       its(:valid?) { is_expected.to eq(true) }
@@ -191,6 +192,7 @@
       its(:swift_bank_code) { is_expected.to be_nil }
       its(:swift_branch_code) { is_expected.to eq("123456") }
       its(:swift_account_number) { is_expected.to eq("123456789") }
+      its(:swift_national_id) { is_expected.to eq("123456") }
       its(:iban) { is_expected.to be_nil }
       its(:pseudo_iban) { is_expected.to eq("AUZZ123456123456789") }
       its(:valid?) { is_expected.to eq(true) }