Merge pull request #106 from Neur0toxine/update-phoneiso

update iso3166 prefixes

Author: Neur0toxine

core/util/phone.go

@@ -8,8 +8,8 @@ import (
 	"strconv"
 	"strings"
 
+	phoneiso3166 "github.com/Neur0toxine/go-phone-iso3166"
 	pn "github.com/nyaruka/phonenumbers"
-	phoneiso3166 "github.com/onlinecity/go-phone-iso3166"
 )
 
 const (
@@ -32,7 +32,7 @@ var (
 	ErrCannotParsePhone       = errors.New("cannot parse phone number")
 
 	TrimmedPhoneRegexp = regexp.MustCompile(`\D+`)
-	UndefinedUSCodes   = []string{"1943", "1445", "1945", "1840", "1448", "1279", "1839", "1555", "1771", "1645"}
+	UndefinedUSCodes   = []string{"1555"}
 )
 
 // FormatNumberForWA forms in the format according to the rules https://faq.whatsapp.com/1294841057948784

core/util/phone_test.go

@@ -48,7 +48,7 @@ func TestParsePhone(t *testing.T) {
 	})
 
 	t.Run("us numbers", func(t *testing.T) {
-		for _, usMask := range UndefinedUSCodes {
+		for _, usMask := range []string{"1943", "1445", "1945", "1840", "1448", "1279", "1839", "1555", "1771", "1645", "1640"} {
 			t.Run(fmt.Sprintf("mask %s", usMask), func(t *testing.T) {
 				pNumber := usMask + "7043340"
 				pPhone, err := ParsePhone(pNumber)

go.mod

@@ -6,6 +6,7 @@ toolchain go1.23.4
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.2
+	github.com/Neur0toxine/go-phone-iso3166 v0.0.3
 	github.com/aws/aws-sdk-go v1.36.30
 	github.com/aws/aws-sdk-go-v2 v1.18.0
 	github.com/aws/aws-sdk-go-v2/config v1.18.22
@@ -27,7 +28,6 @@ require (
 	github.com/jinzhu/gorm v1.9.11
 	github.com/nicksnyder/go-i18n/v2 v2.4.1
 	github.com/nyaruka/phonenumbers v1.5.0
-	github.com/onlinecity/go-phone-iso3166 v0.0.1
 	github.com/retailcrm/api-client-go/v2 v2.1.17
 	github.com/retailcrm/mg-transport-api-client-go v1.3.23
 	github.com/retailcrm/zabbix-metrics-collector v1.0.0

go.sum

@@ -37,6 +37,8 @@ github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
 github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
+github.com/Neur0toxine/go-phone-iso3166 v0.0.3 h1:8zXDumas8c/hUD8TQ7YFv3ZnYTr8rd3Ap2mKJixUOIQ=
+github.com/Neur0toxine/go-phone-iso3166 v0.0.3/go.mod h1:KT+RhWWrAeHk/FbMHxMsh7eX0V5XaG27bsEuzWtugqk=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -289,8 +291,6 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWb
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nyaruka/phonenumbers v1.5.0 h1:0M+Gd9zl53QC4Nl5z1Yj1O/zPk2XXBUwR/vlzdXSJv4=
 github.com/nyaruka/phonenumbers v1.5.0/go.mod h1:gv+CtldaFz+G3vHHnasBSirAi3O2XLqZzVWz4V1pl2E=
-github.com/onlinecity/go-phone-iso3166 v0.0.1 h1:srN6o8NjxBWIrlK6Z+zD9wGMSGYi4itWA/fRyaxetqs=
-github.com/onlinecity/go-phone-iso3166 v0.0.1/go.mod h1:n8+yIOCu9O63MH3WVwlWq1YVF6ZuAG5xlZ4mZ5ZzKF8=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=