diff --git a/internal/toukibo/parse.go b/internal/toukibo/parse.go index 9d9a7f6..f7f43ec 100644 --- a/internal/toukibo/parse.go +++ b/internal/toukibo/parse.go @@ -72,6 +72,10 @@ func (h *Houjin) GetToukiboCreatedAt() time.Time { return h.header.CreatedAt } +func (h *Houjin) GetHoujinNumber() string { + return h.body.HoujinNumber +} + func (h *Houjin) GetHoujinKaku() string { return string(h.body.HoujinKaku) } diff --git a/internal/toukibo/parse_body.go b/internal/toukibo/parse_body.go index c436e98..e1e0b63 100644 --- a/internal/toukibo/parse_body.go +++ b/internal/toukibo/parse_body.go @@ -332,7 +332,9 @@ func (h *HoujinBody) ConsumeHoujinNumber(s string) bool { matches := regex.FindStringSubmatch(s) if len(matches) > 0 { - h.HoujinNumber = ZenkakuToHankaku(matches[1]) + //2600-01-037869 + houjinNumber := ZenkakuToHankaku(matches[1]) + h.HoujinNumber = houjinNumber[:4] + houjinNumber[5:7] + houjinNumber[8:] return true } return false diff --git a/scripts/main.go b/scripts/main.go index b1fe234..b5be230 100644 --- a/scripts/main.go +++ b/scripts/main.go @@ -57,6 +57,7 @@ func mainRun() error { stock := h.GetHoujinStock() + fmt.Println("HoujinNumber: " + h.GetHoujinNumber()) fmt.Println("HoujinKaku: " + h.GetHoujinKaku()) fmt.Println("HoujinName: " + h.GetHoujinName()) fmt.Println("HoujinAddress: " + h.GetHoujinAddress()) diff --git a/toukibo_parser_test.go b/toukibo_parser_test.go index e59bd2b..195f8f6 100644 --- a/toukibo_parser_test.go +++ b/toukibo_parser_test.go @@ -10,6 +10,7 @@ import ( ) type TestData struct { + HoujinNumber string `yaml:"HoujinNumber"` HoujinKaku string `yaml:"HoujinKaku"` HoujinName string `yaml:"HoujinName"` HoujinAddress string `yaml:"HoujinAddress"` @@ -69,6 +70,9 @@ func TestToukiboParser(t *testing.T) { } // check + if h.GetHoujinNumber() != td.HoujinNumber { + t.Fatalf("number is not match,\nwant : %s,\ngot : %s,", td.HoujinNumber, h.GetHoujinNumber()) + } if h.GetHoujinKaku() != td.HoujinKaku { t.Fatalf("kaku is not match,\nwant : %s,\ngot : %s,", td.HoujinKaku, h.GetHoujinKaku()) }