i18n.DeriveCountryFromTel shouldn't return non-country codes like '001'

Author: rowanseymour

i18n/country.go

@@ -2,6 +2,7 @@ package i18n
 
 import (
 	"database/sql/driver"
+	"regexp"
 
 	"github.com/nyaruka/null/v2"
 	"github.com/nyaruka/phonenumbers"
@@ -13,13 +14,23 @@ type Country string
 // NilCountry represents our nil, or unknown country
 var NilCountry = Country("")
 
+var countryPattern = regexp.MustCompile(`^[A-Z][A-Z]$`)
+
 // DeriveCountryFromTel attempts to derive a country code (e.g. RW) from a phone number
 func DeriveCountryFromTel(number string) Country {
 	parsed, err := phonenumbers.Parse(number, "")
 	if err != nil {
 		return ""
 	}
-	return Country(phonenumbers.GetRegionCodeForNumber(parsed))
+
+	region := phonenumbers.GetRegionCodeForNumber(parsed)
+
+	// check this is an actual country code and not a special "region" like 001
+	if countryPattern.MatchString(region) {
+		return Country(region)
+	}
+
+	return NilCountry
 }
 
 // Place nicely with NULLs if persisting to a database or JSON

i18n/country_test.go

@@ -10,6 +10,8 @@ import (
 func TestDeriveCountryFromTel(t *testing.T) {
 	assert.Equal(t, i18n.Country("RW"), i18n.DeriveCountryFromTel("+250788383383"))
 	assert.Equal(t, i18n.Country("EC"), i18n.DeriveCountryFromTel("+593979000000"))
+
+	assert.Equal(t, i18n.NilCountry, i18n.DeriveCountryFromTel("+80000000000")) // ignore 001
 	assert.Equal(t, i18n.NilCountry, i18n.DeriveCountryFromTel("1234"))
 
 	v, err := i18n.Country("RW").Value()