fix fourcube/goiban-service#9

apilayer · Feb 7, 2017 · a97a7e8 · a97a7e8
1 parent c6d3f28
commit a97a7e8
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/bank_code_validation.go b/bank_code_validation.go
@@ -27,7 +27,6 @@ package goiban
 import (
 	"database/sql"
 	"strconv"
-	"strings"
 )
 
 var (
@@ -57,7 +56,7 @@ func ValidateBankCode(iban *Iban, intermediateResult *ValidationResult, db *sql.
 	}
 
 	bankCode := iban.bban[0:length]
-	bankCode = strings.TrimLeft(bankCode, "0")
+	//bankCode = strings.TrimLeft(bankCode, "0")
 
 	var res int
 	err := SELECT_BY_BANK_CODE_STMT.QueryRow(bankCode, iban.countryCode).Scan(&res)

diff --git a/countries/ch.go b/countries/ch.go
@@ -38,6 +38,7 @@ type SwitzerlandFileEntry struct {
 func SwitzerlandRowToEntry(row []string, bankCodeLengthMap map[string]int) SwitzerlandFileEntry {
 	bankCode, err := strconv.Atoi(row[1])
 	bankCodeNew, errNew := strconv.Atoi(row[3])
+	bankCodeLength := bankCodeLengthMap["CH"]
 	bankCodeStr := ""
 
 	if err == nil {
@@ -48,6 +49,8 @@ func SwitzerlandRowToEntry(row []string, bankCodeLengthMap map[string]int) Switz
 		bankCodeStr = strconv.Itoa(bankCodeNew)
 	}
 
+	bankCodeStr = PadLeftZero(bankCodeStr, bankCodeLength)
+
 	return SwitzerlandFileEntry{
 		Name:     strings.TrimSpace(row[12]),
 		Bankcode: bankCodeStr,

diff --git a/countries/helpers.go b/countries/helpers.go
@@ -1,10 +1,6 @@
 package countries
 
-import "strconv"
-
-func PadLeftZero(n int, length int) string {
-	s := strconv.Itoa(n)
-
+func PadLeftZero(s string, length int) string {
 	for len(s) < length {
 		s = "0" + s
 	}

diff --git a/external_data.go b/external_data.go
@@ -29,8 +29,6 @@ import (
 	"fmt"
 	"log"
 
-	"strings"
-
 	co "github.com/fourcube/goiban/countries"
 	"github.com/tealeg/xlsx"
 )
@@ -94,7 +92,7 @@ func getBankInformationByCountryAndBankCodeFromDb(countryCode string, bankCode s
 
 	var dbBankcode, dbName, dbZip, dbCity, dbBic string
 
-	bankCode = strings.TrimLeft(bankCode, "0")
+	//bankCode = strings.TrimLeft(bankCode, "0")
 
 	err := SELECT_BANK_INFORMATION_STMT.QueryRow(bankCode, countryCode).Scan(&dbBankcode, &dbName, &dbZip, &dbCity, &dbBic)
 

diff --git a/external_data_test.go b/external_data_test.go
@@ -64,6 +64,13 @@ func TestCanLoadBankInfoFromDatabase(t *testing.T) {
 	}
 }
 
+func TestCanLoadBankInfoFromDatabaseLeadingZeros(t *testing.T) {
+	bankInfo := getBankInformationByCountryAndBankCodeFromDb("BE", "001", db)
+	if bankInfo == nil {
+		t.Errorf("Cannot load data from db. Is it empty?")
+	}
+}
+
 func TestCanReadFromBelgiumXLSX(t *testing.T) {
 	ch := make(chan interface{})
 	go ReadFileToEntries("test/belgium.xlsx", &co.BelgiumFileEntry{}, ch)

diff --git a/iban_test.go b/iban_test.go
@@ -191,7 +191,7 @@ func TestCanGenerateIBANFromValidData(t *testing.T) {
 	}
 
 	if result.Data != "BE68539007547034" {
-		t.Errorf("expected result iban to match %v != %v", result.Data, "BE68539007547034")
+		t.Errorf("expected result iban to match, %v != %v", result.Data, "BE68539007547034")
 	}
 }
 
@@ -202,6 +202,6 @@ func TestCanGenerateIBANFromValidDataEnsureCheckdigitsLeadingZeroPresent(t *test
 	}
 
 	if result.Data != "DE22000000010000000009" {
-		t.Errorf("expected result iban to match %v != %v", result.Data, "DE0819")
+		t.Errorf("expected result iban to match, %v != %v", result.Data, "DE22000000010000000009")
 	}
 }