Set the bulk send to happen in parallel

AchoArnold · AchoArnold · commit 28e4918da5f7 · 2023-11-22T21:35:31.000+02:00
diff --git a/api/cmd/loadtest/main.go b/api/cmd/loadtest/main.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"time"
 
 	"github.com/google/uuid"
 
@@ -20,9 +21,40 @@ func main() {
 		log.Fatal("Error loading .env file")
 	}
 
+	bulkSend()
+}
+
+func bulkSend() {
+	var to []string
+	for i := 0; i < 100; i++ {
+		to = append(to, os.Getenv("HTTPSMS_TO"))
+	}
+
+	var responsePayload string
+	err := requests.
+		URL("/v1/messages/send").
+		Host("api.httpsms.com").
+		// Host("localhost:8000").
+		// Scheme("http").
+		Header("x-api-key", os.Getenv("HTTPSMS_KEY")).
+		BodyJSON(&map[string]any{
+			"content":    fmt.Sprintf("Bulk Load Test [%s]", time.Now().Format(time.RFC850)),
+			"from":       os.Getenv("HTTPSMS_FROM_BULK"),
+			"to":         to,
+			"request_id": fmt.Sprintf("load-%s", uuid.NewString()),
+		}).
+		ToString(&responsePayload).
+		Fetch(context.Background())
+	if err != nil {
+		log.Fatal(stacktrace.Propagate(err, "cannot create json payload"))
+	}
+	log.Println(responsePayload)
+}
+
+func sendSingle() {
 	for i := 0; i < 100; i++ {
 		var responsePayload string
-		err = requests.
+		err := requests.
 			URL("/v1/messages/send").
 			Host("api.httpsms.com").
 			// Host("localhost:8000").
@@ -39,7 +71,6 @@ func main() {
 		if err != nil {
 			log.Fatal(stacktrace.Propagate(err, "cannot create json payload"))
 		}
-
 		log.Println(responsePayload)
 	}
 }
diff --git a/api/pkg/handlers/message_handler.go b/api/pkg/handlers/message_handler.go
@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"fmt"
+	"sync"
 	"time"
 
 	"github.com/NdoleStudio/httpsms/pkg/entities"
@@ -136,24 +137,30 @@ func (h *MessageHandler) BulkSend(c *fiber.Ctx) error {
 		return h.responseUnprocessableEntity(c, errors, "validation errors while sending messages")
 	}
 
-	var responses []*entities.Message
+	if msg := h.billingService.IsEntitledWithCount(ctx, h.userIDFomContext(c), uint(len(request.To))); msg != nil {
+		ctxLogger.Warn(stacktrace.NewError(fmt.Sprintf("user with ID [%s] is not entitled to send [%d] messages", h.userIDFomContext(c), len(request.To))))
+		return h.responsePaymentRequired(c, *msg)
+	}
+
+	wg := sync.WaitGroup{}
 	params := request.ToMessageSendParams(h.userIDFomContext(c), c.OriginalURL())
-	for _, param := range params {
-		if msg := h.billingService.IsEntitled(ctx, h.userIDFomContext(c)); msg != nil {
-			ctxLogger.Warn(stacktrace.NewError(fmt.Sprintf("user with ID [%s] can't send a message", h.userIDFomContext(c))))
-			break
-		}
-
-		message, err := h.service.SendMessage(ctx, param)
-		if err != nil {
-			msg := fmt.Sprintf("cannot send message with paylod [%s]", c.Body())
-			ctxLogger.Error(stacktrace.Propagate(err, msg))
-			break
-		}
-		responses = append(responses, message)
+	responses := make([]*entities.Message, len(params))
+
+	for index, message := range params {
+		wg.Add(1)
+		go func(message services.MessageSendParams, index int) {
+			response, err := h.service.SendMessage(ctx, message)
+			if err != nil {
+				msg := fmt.Sprintf("cannot send message with paylod [%s]", c.Body())
+				ctxLogger.Error(stacktrace.Propagate(err, msg))
+			}
+			responses[index] = response
+			wg.Done()
+		}(message, index)
 	}
 
-	return h.responseOK(c, "messages added to queue", responses)
+	wg.Wait()
+	return h.responseOK(c, fmt.Sprintf("[%d] messages processed successfully", len(responses)), responses)
 }
 
 // GetOutstanding returns an entities.Message which is still to be sent by the mobile phone
diff --git a/api/pkg/validators/message_handler_validator.go b/api/pkg/validators/message_handler_validator.go
@@ -127,7 +127,7 @@ func (validator MessageHandlerValidator) ValidateMessageBulkSend(ctx context.Con
 		Rules: govalidator.MapData{
 			"to": []string{
 				"required",
-				"max:50",
+				"max:1000",
 				"min:1",
 				multipleContactPhoneNumberRule,
 			},
