From f25059448b64f9611bbb9c391a9c05505f472321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD?= <rus.efanov@bk.ru>
Date: Thu, 19 Dec 2024 12:38:51 +0300
Subject: [PATCH] edit parse function

---
 core/util/phone.go      | 59 +++++++++++++----------------------------
 core/util/phone_test.go | 15 ++++++++++-
 2 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/core/util/phone.go b/core/util/phone.go
index 2febb3a..c303147 100644
--- a/core/util/phone.go
+++ b/core/util/phone.go
@@ -33,8 +33,8 @@ var (
 	undefinedUSCodes          = []string{"1445", "1945", "1840", "1448", "1279", "1839"}
 )
 
-// FormatNumberForWA forms a number in E164 format without `+` symbol to send to whatsapp.
-func FormatNumberForWA(number string) (string, error) {
+// FormatNumberForWA forms in the specified format according to the rules https://faq.whatsapp.com/1294841057948784
+func FormatNumberForWA(number string, format pn.PhoneNumberFormat) (string, error) {
 	parsedPhone, err := ParsePhone(number)
 
 	if err != nil {
@@ -45,43 +45,16 @@ func FormatNumberForWA(number string) (string, error) {
 	switch parsedPhone.GetCountryCode() {
 	case CountryPhoneCodeAG:
 		formattedPhoneNumber = Add9AGIFNeed(parsedPhone)
-	case CountryPhoneCodeMX:
-		c := int32(CountryPhoneCodeMXWA)
-		parsedPhone.CountryCode = &c
-		fallthrough
 	default:
-		formattedPhoneNumber = pn.Format(parsedPhone, pn.E164)
+		formattedPhoneNumber = pn.Format(parsedPhone, format)
 	}
 
-	return formattedPhoneNumber[1:], nil
-}
-
-// FormatNumberForMG forms a number in E164 format without `+` symbol to send to Message Gateway
-// TODO Возможно, нет смысла в этих функция, так как в КР и 360 будет своя логика.
-func FormatNumberForMG(number string) (string, error) {
-	parsedPhone, err := ParsePhone(number)
-
-	if err != nil {
-		return "", err
-	}
-
-	var formattedPhoneNumber string
-	switch parsedPhone.GetCountryCode() {
-	case CountryPhoneCodeAG:
-		formattedPhoneNumber = Remove9AGIfNeed(parsedPhone)
-	case CountryPhoneCodeMX:
-		c := int32(CountryPhoneCodeMXWA)
-		parsedPhone.CountryCode = &c
-		fallthrough
-	default:
-		formattedPhoneNumber = pn.Format(parsedPhone, pn.E164)
-	}
-
-	return formattedPhoneNumber[1:], nil
+	return formattedPhoneNumber, nil
 }
 
 // ParsePhone this function parses the number as a string
-// Mexican numbers may not have a 1 after the country code 52.
+// For mexican numbers automatic add 1 after to the country code (521).
+// But for argentine numbers there is no automatic addition 9 to the country code.
 func ParsePhone(phoneNumber string) (*pn.PhoneNumber, error) {
 	trimmedPhone := regexp.MustCompile(`\D+`).ReplaceAllString(phoneNumber, "")
 	if len(trimmedPhone) < MinPhoneSymbolCount {
@@ -93,13 +66,7 @@ func ParsePhone(phoneNumber string) (*pn.PhoneNumber, error) {
 		return nil, ErrCannotDetermineCountry
 	}
 
-	// For russian numbers as 8800xxxxxxx
-	if strings.EqualFold(BangladeshRegion, countryCode) && IsRussianNumberWith8Prefix(trimmedPhone) {
-		countryCode = phoneiso3166.E164.LookupString("7" + trimmedPhone[1:])
-	}
-
 	parsedPhone, err := pn.Parse(trimmedPhone, countryCode)
-
 	if err != nil {
 		return nil, ErrCannotParsePhone
 	}
@@ -122,6 +89,11 @@ func ParsePhone(phoneNumber string) (*pn.PhoneNumber, error) {
 		parsedPhone.NationalNumber = &number
 	}
 
+	if IsMexicoNumber(trimmedPhone, parsedPhone) {
+		c := int32(CountryPhoneCodeMXWA)
+		parsedPhone.CountryCode = &c
+	}
+
 	return parsedPhone, err
 }
 
@@ -131,7 +103,9 @@ func IsRussianNumberWith8Prefix(phone string) bool {
 
 func IsMexicoNumber(phone string, parsed *pn.PhoneNumber) bool {
 	phoneNumber := regexp.MustCompile(`\D+`).ReplaceAllString(phone, "")
-	return len(phoneNumber) == 13 && parsed.GetCountryCode() == 52 && strings.HasPrefix(phoneNumber, "521")
+	return len(phoneNumber) == 13 &&
+		parsed.GetCountryCode() == CountryPhoneCodeMX &&
+		strings.HasPrefix(phoneNumber, "521")
 }
 
 func IsUSNumber(phone string) bool {
@@ -220,5 +194,10 @@ func getCountryCode(phone string) string {
 		}
 	}
 
+	// For russian numbers as 8800xxxxxxx
+	if strings.EqualFold(BangladeshRegion, countryCode) && IsRussianNumberWith8Prefix(phone) {
+		countryCode = phoneiso3166.E164.LookupString("7" + phone[1:])
+	}
+
 	return countryCode
 }
diff --git a/core/util/phone_test.go b/core/util/phone_test.go
index 589fa67..c4532e0 100644
--- a/core/util/phone_test.go
+++ b/core/util/phone_test.go
@@ -27,6 +27,13 @@ func TestParsePhone(t *testing.T) {
 		require.NoError(t, err)
 		assert.Equal(t, uint64(9521548787), pn.GetNationalNumber())
 		assert.Equal(t, int32(7), pn.GetCountryCode())
+
+		n = "+7-900-123-45-67"
+		pn, err = ParsePhone(n)
+		require.NoError(t, err)
+		assert.Equal(t, uint64(9001234567), pn.GetNationalNumber())
+		assert.Equal(t, int32(7), pn.GetCountryCode())
+
 	})
 
 	t.Run("german numbers", func(t *testing.T) {
@@ -48,7 +55,13 @@ func TestParsePhone(t *testing.T) {
 		pn, err := ParsePhone(n)
 		require.NoError(t, err)
 		assert.Equal(t, uint64(9982418333), pn.GetNationalNumber())
-		assert.Equal(t, int32(CountryPhoneCodeMX), pn.GetCountryCode())
+		assert.Equal(t, int32(CountryPhoneCodeMXWA), pn.GetCountryCode())
+
+		n = "+521 (998) 241 83 33"
+		pn, err = ParsePhone(n)
+		require.NoError(t, err)
+		assert.Equal(t, uint64(9982418333), pn.GetNationalNumber())
+		assert.Equal(t, int32(CountryPhoneCodeMXWA), pn.GetCountryCode())
 	})
 
 	t.Run("palestine number", func(t *testing.T) {