Skip to content

Commit ae71763

Browse files
committed
Add phone number validator
1 parent f9bcf8d commit ae71763

4 files changed

Lines changed: 7 additions & 6 deletions

File tree

api/pkg/entities/message_thread.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ type MessageThread struct {
1111
ID uuid.UUID `json:"id" gorm:"primaryKey;type:uuid;" example:"32343a19-da5e-4b1b-a767-3298a73703ca"`
1212
Owner string `json:"owner" example:"+18005550199"`
1313
Contact string `json:"contact" example:"+18005550100"`
14+
IsArchived bool `json:"is_archived" example:"false"`
1415
UserID UserID `json:"user_id" example:"WB7DRDWrJZRGbYrv2CKGkqbzvqdC"`
1516
Color string `json:"color" example:"indigo"`
1617
LastMessageContent string `json:"last_message_content" example:"This is a sample message content"`

api/pkg/requests/message_send_request.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func (input *MessageSend) Sanitize() MessageSend {
2626
// ToMessageSendParams converts MessageSend to services.MessageSendParams
2727
func (input MessageSend) ToMessageSendParams(source string) services.MessageSendParams {
2828
from, _ := phonenumbers.Parse(input.From, phonenumbers.UNKNOWN_REGION)
29-
to, _ := phonenumbers.Parse(input.From, phonenumbers.UNKNOWN_REGION)
29+
to, _ := phonenumbers.Parse(input.To, phonenumbers.UNKNOWN_REGION)
3030

3131
return services.MessageSendParams{
3232
Source: source,

api/pkg/validators/message_handler_validator.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ import (
1313
"github.com/thedevsaddam/govalidator"
1414
)
1515

16-
const (
17-
phoneNumberRule = "phoneNumber"
18-
)
19-
2016
// MessageHandlerValidator validates models used in handlers.MessageHandler
2117
type MessageHandlerValidator struct {
2218
validator

api/pkg/validators/validator.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ import (
99

1010
type validator struct{}
1111

12+
const (
13+
phoneNumberRule = "phoneNumber"
14+
)
15+
1216
func init() {
1317
// custom rules to take fixed length word.
1418
// e.g: max_word:5 will throw error if the field contains more than 5 words
@@ -20,7 +24,7 @@ func init() {
2024

2125
_, err := phonenumbers.Parse(phoneNumber, phonenumbers.UNKNOWN_REGION)
2226
if err != nil {
23-
return err
27+
return fmt.Errorf("the %s field must be a valid E.164 phone number: https://en.wikipedia.org/wiki/E.164", field)
2428
}
2529

2630
return nil

0 commit comments

Comments
 (0)