Skip to content

Commit 465cc3e

Browse files
AchoArnoldCopilot
andcommitted
revert: remove + prefix normalization in phone number validation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent f8fc25b commit 465cc3e

2 files changed

Lines changed: 6 additions & 15 deletions

File tree

api/pkg/validators/bulk_message_handler_validator.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -254,19 +254,11 @@ func (v *BulkMessageHandlerValidator) validateMessages(_ context.Context, messag
254254
}
255255
}
256256

257-
fromNumber := message.FromPhoneNumber
258-
if !strings.HasPrefix(fromNumber, "+") {
259-
fromNumber = "+" + fromNumber
260-
}
261-
if _, err := phonenumbers.Parse(fromNumber, phonenumbers.UNKNOWN_REGION); err != nil {
257+
if _, err := phonenumbers.Parse(message.FromPhoneNumber, phonenumbers.UNKNOWN_REGION); err != nil {
262258
result.Add("document", fmt.Sprintf("Row [%d]: The FromPhoneNumber [%s] is not a valid E.164 phone number", index+2, message.FromPhoneNumber))
263259
}
264260

265-
toNumber := message.ToPhoneNumber
266-
if !strings.HasPrefix(toNumber, "+") {
267-
toNumber = "+" + toNumber
268-
}
269-
if _, err := phonenumbers.Parse(toNumber, phonenumbers.UNKNOWN_REGION); err != nil {
261+
if _, err := phonenumbers.Parse(message.ToPhoneNumber, phonenumbers.UNKNOWN_REGION); err != nil {
270262
result.Add("document", fmt.Sprintf("Row [%d]: The ToPhoneNumber [%s] is not a valid E.164 phone number", index+2, message.ToPhoneNumber))
271263
}
272264

web/pages/bulk-messages/index.vue

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,14 @@
114114
<thead>
115115
<tr class="text-uppercase subtitle-2">
116116
<th class="text-left">Name</th>
117+
<th class="text-center">Created At</th>
117118
<th class="text-center">Total</th>
118119
<th class="text-center">Pending</th>
119120
<th class="text-center">Scheduled</th>
120121
<th class="text-center">Sent</th>
121122
<th class="text-center">Delivered</th>
122123
<th class="text-center">Failed</th>
123124
<th class="text-center">Expired</th>
124-
<th class="text-center">Created At</th>
125125
<th class="text-center">Action</th>
126126
</tr>
127127
</thead>
@@ -130,21 +130,20 @@
130130
<td class="text-left font-weight-medium">
131131
{{ order.request_id }}
132132
</td>
133+
<td class="text-center">
134+
{{ order.created_at | timestamp }}
135+
</td>
133136
<td class="text-center">{{ order.total }}</td>
134137
<td class="text-center">{{ order.pending_count }}</td>
135138
<td class="text-center">{{ order.scheduled_count }}</td>
136139
<td class="text-center">{{ order.sent_count }}</td>
137140
<td class="text-center">{{ order.delivered_count }}</td>
138141
<td class="text-center">{{ order.failed_count }}</td>
139142
<td class="text-center">{{ order.expired_count }}</td>
140-
<td class="text-center">
141-
{{ order.created_at | timestamp }}
142-
</td>
143143
<td class="text-center">
144144
<v-btn
145145
small
146146
color="primary"
147-
text
148147
:to="`/search-messages?query=${order.request_id}`"
149148
>
150149
<v-icon small left>{{ mdiEye }}</v-icon>

0 commit comments

Comments
 (0)