fix: handle phone numbers without + prefix and fix CSV SendTime parsing

- Add + prefix normalization in validateMessages before phonenumbers.Parse
- Change SendTime from *time.Time to string (SendTimeRaw) for CSV unmarshaling
- Add GetSendTime() method that parses multiple date formats gracefully
- Empty SendTime fields no longer cause 'Cannot read contents' errors
- Support RFC3339, YYYY-MM-DDTHH:MM:SS, YYYY-MM-DD HH:MM:SS, YYYY-MM-DD formats

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: AchoArnold

api/pkg/handlers/bulk_message_handler.go

@@ -121,7 +121,7 @@ func (h *BulkMessageHandler) Store(c *fiber.Ctx) error {
 	for _, message := range messages {
 		wg.Add(1)
 		var perPhoneIndex int
-		if message.SendTime == nil {
+		if message.GetSendTime() == nil {
 			perPhoneIndex = phoneIndexCounter[message.FromPhoneNumber]
 			phoneIndexCounter[message.FromPhoneNumber]++
 		}

api/pkg/requests/bulk_message_request.go

@@ -14,11 +14,34 @@ import (
 // BulkMessage represents a single message in a bulk SMS request
 type BulkMessage struct {
 	request
-	FromPhoneNumber string     `csv:"FromPhoneNumber"`
-	ToPhoneNumber   string     `csv:"ToPhoneNumber"`
-	Content         string     `csv:"Content"`
-	SendTime        *time.Time `csv:"SendTime(optional)"`
-	AttachmentURLs  string     `csv:"AttachmentURLs(optional)" validate:"optional"` // Comma separated list of URLs
+	FromPhoneNumber string `csv:"FromPhoneNumber"`
+	ToPhoneNumber   string `csv:"ToPhoneNumber"`
+	Content         string `csv:"Content"`
+	SendTimeRaw     string `csv:"SendTime(optional)"`
+	AttachmentURLs  string `csv:"AttachmentURLs(optional)" validate:"optional"` // Comma separated list of URLs
+}
+
+// GetSendTime parses the raw SendTime string into a *time.Time
+func (input *BulkMessage) GetSendTime() *time.Time {
+	raw := strings.TrimSpace(input.SendTimeRaw)
+	if raw == "" {
+		return nil
+	}
+
+	formats := []string{
+		time.RFC3339,
+		"2006-01-02T15:04:05",
+		"2006-01-02 15:04:05",
+		"2006-01-02",
+	}
+
+	for _, format := range formats {
+		if t, err := time.Parse(format, raw); err == nil {
+			utc := t.UTC()
+			return &utc
+		}
+	}
+	return nil
 }
 
 // Sanitize sets defaults to BulkMessage
@@ -46,7 +69,7 @@ func (input *BulkMessage) ToMessageSendParams(userID entities.UserID, requestID
 		Owner:             from,
 		RequestID:         input.sanitizeStringPointer(fmt.Sprintf("bulk-%s", requestID.String())),
 		UserID:            userID,
-		SendAt:            input.SendTime,
+		SendAt:            input.GetSendTime(),
 		RequestReceivedAt: time.Now().UTC(),
 		Contact:           input.sanitizeAddress(input.ToPhoneNumber),
 		Content:           input.Content,

api/pkg/validators/bulk_message_handler_validator.go

@@ -138,14 +138,15 @@ func (v *BulkMessageHandlerValidator) parseXlsx(ctxLogger telemetry.Logger, user
 			continue
 		}
 
-		var sendAt *time.Time
+		var sendTimeRaw string
 		if len(row) > 3 && strings.TrimSpace(row[3]) != "" {
 			ctxLogger.Info(fmt.Sprintf("excel time = [%s]", row[3]))
-			sendAt, err = v.convertExcelTime(user, row[3])
+			sendAt, err := v.convertExcelTime(user, row[3])
 			if err != nil {
 				result.Add("document", fmt.Sprintf("Row [%d]: The SendTime [%s] is not in the correct format e.g [2006-01-02T15:04:05] where 2006 is the year, 01 is January, 02 is the second day of the month and the time is 15:04:05", index+1, row[3]))
 				return nil, result
 			}
+			sendTimeRaw = sendAt.Format(time.RFC3339)
 		}
 
 		var attachmentURLs string
@@ -157,7 +158,7 @@ func (v *BulkMessageHandlerValidator) parseXlsx(ctxLogger telemetry.Logger, user
 			FromPhoneNumber: strings.TrimSpace(row[0]),
 			ToPhoneNumber:   strings.TrimSpace(row[1]),
 			Content:         row[2],
-			SendTime:        sendAt,
+			SendTimeRaw:     sendTimeRaw,
 			AttachmentURLs:  attachmentURLs,
 		})
 	}
@@ -253,20 +254,33 @@ func (v *BulkMessageHandlerValidator) validateMessages(_ context.Context, messag
 			}
 		}
 
-		if _, err := phonenumbers.Parse(message.FromPhoneNumber, phonenumbers.UNKNOWN_REGION); err != nil {
+		fromNumber := message.FromPhoneNumber
+		if !strings.HasPrefix(fromNumber, "+") {
+			fromNumber = "+" + fromNumber
+		}
+		if _, err := phonenumbers.Parse(fromNumber, phonenumbers.UNKNOWN_REGION); err != nil {
 			result.Add("document", fmt.Sprintf("Row [%d]: The FromPhoneNumber [%s] is not a valid E.164 phone number", index+2, message.FromPhoneNumber))
 		}
 
-		if _, err := phonenumbers.Parse(message.ToPhoneNumber, phonenumbers.UNKNOWN_REGION); err != nil {
+		toNumber := message.ToPhoneNumber
+		if !strings.HasPrefix(toNumber, "+") {
+			toNumber = "+" + toNumber
+		}
+		if _, err := phonenumbers.Parse(toNumber, phonenumbers.UNKNOWN_REGION); err != nil {
 			result.Add("document", fmt.Sprintf("Row [%d]: The ToPhoneNumber [%s] is not a valid E.164 phone number", index+2, message.ToPhoneNumber))
 		}
 
 		if len(message.Content) > 1024 {
 			result.Add("document", fmt.Sprintf("Row [%d]: The message content must be less than 1024 characters.", index+2))
 		}
 
-		if message.SendTime != nil && message.SendTime.After(time.Now().Add(420*time.Hour)) {
-			result.Add("document", fmt.Sprintf("Row [%d]: The SendTime [%s] cannot be more than 20 days (420 hours) in the future.", index+2, message.SendTime.Format(time.RFC3339)))
+		if strings.TrimSpace(message.SendTimeRaw) != "" {
+			sendTime := message.GetSendTime()
+			if sendTime == nil {
+				result.Add("document", fmt.Sprintf("Row [%d]: The SendTime [%s] is not a valid date format. Use RFC3339 (e.g. 2023-11-11T02:10:01Z) or YYYY-MM-DDTHH:MM:SS.", index+2, message.SendTimeRaw))
+			} else if sendTime.After(time.Now().Add(420 * time.Hour)) {
+				result.Add("document", fmt.Sprintf("Row [%d]: The SendTime [%s] cannot be more than 20 days (420 hours) in the future.", index+2, sendTime.Format(time.RFC3339)))
+			}
 		}
 	}
 	return result

web/pages/bulk-messages/index.vue

@@ -98,7 +98,7 @@
         </v-row>
         <v-row class="mt-8">
           <v-col cols="12">
-            <h5 class="text-h5 mb-3">Bulk Message History</h5>
+            <h4 class="text-h4 mb-3">Bulk Message History</h4>
             <p class="text--secondary">
               Your 10 most recent bulk SMS uploads are listed below with a
               breakdown of message delivery status. Click