From 7a8768923cf885920ebef08d1ea1dbd6945e7d41 Mon Sep 17 00:00:00 2001 From: Andrey Ivanov Date: Mon, 24 Aug 2020 10:45:48 +0300 Subject: [PATCH] HW10 is completed --- hw10_program_optimization/stats.go | 3 ++- hw10_program_optimization/stats_test.go | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/hw10_program_optimization/stats.go b/hw10_program_optimization/stats.go index 2fd55d3..20741c7 100644 --- a/hw10_program_optimization/stats.go +++ b/hw10_program_optimization/stats.go @@ -35,7 +35,8 @@ func GetDomainStat(r io.Reader, domain string) (DomainStat, error) { if err = json.Unmarshal(line, &user); err != nil { return DomainStat{}, err } - if strings.Contains(user.Email, "."+domain) { + + if strings.HasSuffix(user.Email, "."+domain) { result[strings.ToLower(strings.SplitN(user.Email, "@", 2)[1])]++ } } diff --git a/hw10_program_optimization/stats_test.go b/hw10_program_optimization/stats_test.go index ec7ecf7..a358b65 100644 --- a/hw10_program_optimization/stats_test.go +++ b/hw10_program_optimization/stats_test.go @@ -19,6 +19,10 @@ func TestGetDomainStat(t *testing.T) { dataNeg := `{"Id":1,"Name":"Howard Mendoza","Username":"0Oliver","Email":"aliquid_qui_ea@Brow@sedrive.gov","Phone":"6-866-899-36-79","Password":"InAQJvsq","Address":"Blackbird Place 25" {"Id":2,"Name":"Jesse Vasquez","Username":"qRichardson","Email":"mLynchbroWsecat.com","Phone":"9-373-949-64-00","Password":"SiZLeNSGn","Address":"Fulton Hill 80"}` + dataCase1 := `{"Id":1,"Name":"Howard Mendoza","Username":"0Oliver","Email":"aliquid_qui_ea@Browsedrive.run","Phone":"6-866-899-36-79","Password":"InAQJvsq","Address":"Blackbird Place 25"} +{"Id":2,"Name":"Jesse Vasquez","Username":"qRichardson","Email":"mLynch@broWsecat.run","Phone":"9-373-949-64-00","Password":"SiZLeNSGn","Address":"Fulton Hill 80"} +{"Id":4,"Name":"Gregory Reid","Username":"tButler","Email":"5Moore@Teklist.ru","Phone":"520-04-16","Password":"r639qLNu","Address":"Sunfield Park 20"}` + t.Run("find 'com'", func(t *testing.T) { result, err := GetDomainStat(bytes.NewBufferString(data), "com") require.NoError(t, err) @@ -45,4 +49,10 @@ func TestGetDomainStat(t *testing.T) { require.Error(t, err) require.Equal(t, DomainStat{}, result) }) + + t.Run("Case1 test", func(t *testing.T) { + result, err := GetDomainStat(bytes.NewBufferString(dataCase1), "ru") + require.NoError(t, err) + require.Equal(t, DomainStat{"teklist.ru":1}, result) + }) }