OTUS
/
Golang_HomeWork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HW10 is completed

pull/11/head
Andrey Ivanov 2020-08-24 10:45:48 +03:00 committed by Andrey Ivanov
parent f523504ee4
commit 7a8768923c
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw10_program_optimization/stats.go
View File

@ -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])]++
}
}

10
hw10_program_optimization/stats_test.go
View File

@ -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)
})
}