Send and receive SMS messages using your Android phone programmatically via a simple HTTP API
Fix: parse time in user's location in CSV file
Acho Arnold808c0e1deb3f
diff --git a/api/pkg/handlers/bulk_message_handler.go b/api/pkg/handlers/bulk_message_handler.goindex c388ef14..27d6286d 100644--- a/api/pkg/handlers/bulk_message_handler.go+++ b/api/pkg/handlers/bulk_message_handler.go@@ -99,7 +99,7 @@ func (h *BulkMessageHandler) Store(c *fiber.Ctx) error {return h.responseBadRequest(c, err)}- messages, fileType, validationErrors := h.validator.ValidateStore(ctx, h.userIDFomContext(c), file)+ messages, fileType, userLocation, validationErrors := h.validator.ValidateStore(ctx, h.userIDFomContext(c), file)if len(validationErrors) != 0 {msg := fmt.Sprintf("validation errors [%s], while sending bulk sms from CSV file [%s] for [%s]", spew.Sdump(validationErrors), file.Filename, h.userIDFomContext(c))ctxLogger.Warn(stacktrace.NewError(msg))@@ -121,7 +121,7 @@ func (h *BulkMessageHandler) Store(c *fiber.Ctx) error {for _, message := range messages {wg.Add(1)var perPhoneIndex int- if message.GetSendTime() == nil {+ if message.GetSendTime(userLocation) == nil {perPhoneIndex = phoneIndexCounter[message.FromPhoneNumber]phoneIndexCounter[message.FromPhoneNumber]++}@@ -130,11 +130,11 @@ func (h *BulkMessageHandler) Store(c *fiber.Ctx) error {count.Add(1)_, err = h.messageService.SendMessage(ctx,- message.ToMessageSendParams(h.userIDFomContext(c), requestID, c.OriginalURL(), index),+ message.ToMessageSendParams(h.userIDFomContext(c), requestID, c.OriginalURL(), index, userLocation),)if err != nil {count.Add(-1)- msg := fmt.Sprintf("cannot send message with paylod [%s] at index [%d]", spew.Sdump(message), index)+ msg := fmt.Sprintf("cannot send message with payload [%s] at index [%d]", spew.Sdump(message), index)ctxLogger.Error(stacktrace.Propagate(err, msg))}wg.Done()diff --git a/api/pkg/requests/bulk_message_request.go b/api/pkg/requests/bulk_message_request.goindex b84425fc..345e24aa 100644--- a/api/pkg/requests/bulk_message_request.go+++ b/api/pkg/requests/bulk_message_request.go@@ -20,22 +20,33 @@ type BulkMessage struct {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 {+// GetSendTime parses the raw SendTime string into a *time.Time.+// For timezone-naive formats, the time is interpreted in the given location.+// For RFC3339 (which includes an offset), the embedded offset is used.+func (input *BulkMessage) GetSendTime(location *time.Location) *time.Time {raw := strings.TrimSpace(input.SendTime)if raw == "" {return nil}- formats := []string{- time.RFC3339,+ if location == nil {+ location = time.UTC+ }++ // RFC3339 already contains timezone offset, parse without location+ if t, err := time.Parse(time.RFC3339, raw); err == nil {+ utc := t.UTC()+ return &utc+ }++ // Naive formats: interpret in the user's location+ naiveFormats := []string{"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 {+ for _, format := range naiveFormats {+ if t, err := time.ParseInLocation(format, raw, location); err == nil {utc := t.UTC()return &utc}@@ -60,7 +71,7 @@ func (input *BulkMessage) Sanitize() *BulkMessage {}// ToMessageSendParams converts BulkMessage to services.MessageSendParams-func (input *BulkMessage) ToMessageSendParams(userID entities.UserID, requestID string, source string, index int) services.MessageSendParams {+func (input *BulkMessage) ToMessageSendParams(userID entities.UserID, requestID string, source string, index int, location *time.Location) services.MessageSendParams {from, _ := phonenumbers.Parse(input.FromPhoneNumber, phonenumbers.UNKNOWN_REGION)return services.MessageSendParams{@@ -68,7 +79,7 @@ func (input *BulkMessage) ToMessageSendParams(userID entities.UserID, requestIDOwner: from,RequestID: input.sanitizeStringPointer(requestID),UserID: userID,- SendAt: input.GetSendTime(),+ SendAt: input.GetSendTime(location),RequestReceivedAt: time.Now().UTC(),Contact: input.sanitizeAddress(input.ToPhoneNumber),Content: input.Content,diff --git a/api/pkg/validators/bulk_message_handler_validator.go b/api/pkg/validators/bulk_message_handler_validator.goindex 5976c2cc..f17f6adb 100644--- a/api/pkg/validators/bulk_message_handler_validator.go+++ b/api/pkg/validators/bulk_message_handler_validator.go@@ -52,7 +52,7 @@ func NewBulkMessageHandlerValidator(}// ValidateStore validates the requests.BillingUsageHistory request-func (v *BulkMessageHandlerValidator) ValidateStore(ctx context.Context, userID entities.UserID, header *multipart.FileHeader) ([]*requests.BulkMessage, string, url.Values) {+func (v *BulkMessageHandlerValidator) ValidateStore(ctx context.Context, userID entities.UserID, header *multipart.FileHeader) ([]*requests.BulkMessage, string, *time.Location, url.Values) {ctx, span, ctxLogger := v.tracer.StartWithLogger(ctx, v.logger)defer span.End()@@ -61,39 +61,39 @@ func (v *BulkMessageHandlerValidator) ValidateStore(ctx context.Context, userIDresult := url.Values{}result.Add("document", "Cannot load your account. Please try again later or contact support.")ctxLogger.Error(v.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, fmt.Sprintf("cannot load user [%s]", userID))))- return nil, "", result+ return nil, "", nil, result}messages, fileType, result := v.parseFile(ctxLogger, user, header)if len(result) != 0 {- return messages, fileType, result+ return messages, fileType, user.Location(), result}if len(messages) == 0 {result.Add("document", "The uploaded file doesn't contain any valid records. Make sure you are using the official httpSMS template.")- return messages, fileType, result+ return messages, fileType, user.Location(), result}if len(messages) > 1000 {result.Add("document", "The uploaded file must contain less than 1000 records.")- return messages, fileType, result+ return messages, fileType, user.Location(), result}for index, message := range messages {messages[index] = message.Sanitize()}- result = v.validateMessages(ctx, messages)+ result = v.validateMessages(ctx, messages, user.Location())if len(result) != 0 {- return messages, fileType, result+ return messages, fileType, user.Location(), result}result = v.validateOwners(ctx, userID, messages)if len(result) != 0 {- return messages, fileType, result+ return messages, fileType, user.Location(), result}- return messages, fileType, result+ return messages, fileType, user.Location(), result}func (v *BulkMessageHandlerValidator) parseFile(ctxLogger telemetry.Logger, user *entities.User, header *multipart.FileHeader) ([]*requests.BulkMessage, string, url.Values) {@@ -143,8 +143,9 @@ func (v *BulkMessageHandlerValidator) parseXlsx(ctxLogger telemetry.Logger, uservar sendTimeRaw stringif len(row) > 3 && strings.TrimSpace(row[3]) != "" {ctxLogger.Info(fmt.Sprintf("excel time = [%s]", row[3]))- sendAt, err := v.convertExcelTime(user, row[3])- if err != nil {+ msg := &requests.BulkMessage{SendTime: strings.TrimSpace(row[3])}+ sendAt := msg.GetSendTime(user.Location())+ if sendAt == 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}@@ -168,15 +169,6 @@ func (v *BulkMessageHandlerValidator) parseXlsx(ctxLogger telemetry.Logger, userreturn messages, url.Values{}}-func (v *BulkMessageHandlerValidator) convertExcelTime(user *entities.User, value string) (*time.Time, error) {- t, err := time.ParseInLocation("2006-01-02T15:04:05", value, user.Location())- if err != nil {- return nil, stacktrace.Propagate(err, fmt.Sprintf("cannot parse excel time [%s] as [%T]", value, t))- }-- return &t, nil-}-func (v *BulkMessageHandlerValidator) parseBytes(ctxLogger telemetry.Logger, userID entities.UserID, header *multipart.FileHeader) ([]byte, url.Values) {result := url.Values{}@@ -223,7 +215,7 @@ func (v *BulkMessageHandlerValidator) parseCSV(ctxLogger telemetry.Logger, userreturn messages, url.Values{}}-func (v *BulkMessageHandlerValidator) validateMessages(_ context.Context, messages []*requests.BulkMessage) url.Values {+func (v *BulkMessageHandlerValidator) validateMessages(_ context.Context, messages []*requests.BulkMessage, location *time.Location) url.Values {result := url.Values{}for index, message := range messages {@@ -269,7 +261,7 @@ func (v *BulkMessageHandlerValidator) validateMessages(_ context.Context, messag}if strings.TrimSpace(message.SendTime) != "" {- sendTime := message.GetSendTime()+ sendTime := message.GetSendTime(location)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.SendTime))} else if sendTime.After(time.Now().Add(420 * time.Hour)) {