Send and receive SMS messages using your Android phone programmatically via a simple HTTP API
Add debug logs for failed bulk messages
Acho Arnolde4e90f0dccdb
diff --git a/api/pkg/handlers/bulk_message_handler.go b/api/pkg/handlers/bulk_message_handler.goindex d29a907d..5299fb0f 100644--- a/api/pkg/handlers/bulk_message_handler.go+++ b/api/pkg/handlers/bulk_message_handler.go@@ -3,6 +3,7 @@ package handlersimport ("fmt""sync"+ "sync/atomic""github.com/NdoleStudio/httpsms/pkg/requests""github.com/google/uuid"@@ -85,22 +86,25 @@ func (h *BulkMessageHandler) Store(c *fiber.Ctx) error {requestID := uuid.New()wg := sync.WaitGroup{}- for _, message := range messages {+ count := atomic.Int64{}++ for index, message := range messages {wg.Add(1)- go func(message *requests.BulkMessage) {+ go func(message *requests.BulkMessage, index int) {+ count.Add(1)_, err = h.messageService.SendMessage(ctx,message.ToMessageSendParams(h.userIDFomContext(c), requestID, c.OriginalURL()),)-if err != nil {- msg := fmt.Sprintf("cannot send message with paylod [%s]", c.Body())+ count.Add(-1)+ msg := fmt.Sprintf("cannot send message with paylod [%s] at index [%d]", spew.Sdump(message), index)ctxLogger.Error(stacktrace.Propagate(err, msg))}wg.Done()- }(message)+ }(message, index)}wg.Wait()- return h.responseAccepted(c, fmt.Sprintf("Added %d messages to the queue", len(messages)))+ return h.responseAccepted(c, fmt.Sprintf("Added %d out of %d messages to the queue", count.Load(), len(messages)))}diff --git a/api/pkg/handlers/message_handler.go b/api/pkg/handlers/message_handler.goindex 6280f118..6f812554 100644--- a/api/pkg/handlers/message_handler.go+++ b/api/pkg/handlers/message_handler.go@@ -4,6 +4,7 @@ import ("fmt""strings""sync"+ "sync/atomic""time""github.com/NdoleStudio/httpsms/pkg/entities"@@ -153,10 +154,12 @@ func (h *MessageHandler) BulkSend(c *fiber.Ctx) error {wg := sync.WaitGroup{}params := request.ToMessageSendParams(h.userIDFomContext(c), c.OriginalURL())responses := make([]*entities.Message, len(params))+ count := atomic.Int64{}for index, message := range params {wg.Add(1)go func(message services.MessageSendParams, index int) {+ count.Add(1)if message.SendAt == nil {sentAt := time.Now().UTC().Add(time.Duration(index) * time.Second)message.SendAt = &sentAt@@ -164,7 +167,8 @@ func (h *MessageHandler) BulkSend(c *fiber.Ctx) error {response, err := h.service.SendMessage(ctx, message)if err != nil {- msg := fmt.Sprintf("cannot send message with paylod [%s]", c.Body())+ count.Add(-1)+ msg := fmt.Sprintf("cannot send message with paylod [%s] at index [%d]", spew.Sdump(message), index)ctxLogger.Error(stacktrace.Propagate(err, msg))}responses[index] = response@@ -173,7 +177,7 @@ func (h *MessageHandler) BulkSend(c *fiber.Ctx) error {}wg.Wait()- return h.responseOK(c, fmt.Sprintf("[%d] messages processed successfully", len(responses)), responses)+ return h.responseOK(c, fmt.Sprintf("%d out of %d messages processed successfully", count.Load(), len(responses)), responses)}// GetOutstanding returns an entities.Message which is still to be sent by the mobile phone