funcodingdev
diff --git a/‎api/pkg/services/message_service.go‎
Lines changed: 7 additions & 1 deletion b/‎api/pkg/services/message_service.go‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎api/pkg/validators/bulk_message_handler_validator.go‎
Lines changed: 2 additions & 2 deletions b/‎api/pkg/validators/bulk_message_handler_validator.go‎
Lines changed: 2 additions & 2 deletions
@@ -338,14 +338,20 @@ func (service *MessageService) SendMessage(ctx context.Context, params MessageSe
 	}
 	ctxLogger.Info(fmt.Sprintf("created event [%s] with id [%s] and message id [%s] and user [%s]", event.Type(), event.ID(), eventPayload.MessageID, eventPayload.UserID))
 
+	message, err := service.storeSentMessage(ctx, eventPayload)
+	if err != nil {
+		msg := fmt.Sprintf("cannot store message with id [%s]", eventPayload.MessageID)
+		return nil, service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+	}
+
 	timeout := service.getSendDelay(ctxLogger, eventPayload, params.SendAt)
 	if _, err = service.eventDispatcher.DispatchWithTimeout(ctx, event, timeout); err != nil {
 		msg := fmt.Sprintf("cannot dispatch event type [%s] and id [%s]", event.Type(), event.ID())
 		return nil, service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
 	}
 
 	ctxLogger.Info(fmt.Sprintf("[%s] event with ID [%s] dispatched succesfully for message [%s] with user [%s] and delay [%s]", event.Type(), event.ID(), eventPayload.MessageID, eventPayload.UserID, timeout))
-	return service.storeSentMessage(ctx, eventPayload)
+	return message, err
 }
 
 func (service *MessageService) getSendDelay(ctxLogger telemetry.Logger, eventPayload events.MessageAPISentPayload, sendAt *time.Time) time.Duration {
 
@@ -151,7 +151,7 @@ func (v *BulkMessageHandlerValidator) parseXlsx(ctxLogger telemetry.Logger, user
 		})
 	}
 
-	return messages, nil
+	return messages, url.Values{}
 }
 
 func (v *BulkMessageHandlerValidator) convertExcelTime(user *entities.User, value string) (*time.Time, error) {
@@ -206,7 +206,7 @@ func (v *BulkMessageHandlerValidator) parseCSV(ctxLogger telemetry.Logger, user
 		return nil, result
 	}
 
-	return messages, nil
+	return messages, url.Values{}
 }
 
 func (v *BulkMessageHandlerValidator) validateMessages(messages []*requests.BulkMessage) url.Values {
Original file line number	Diff line number	Diff line change
`@@ -338,14 +338,20 @@ func (service *MessageService) SendMessage(ctx context.Context, params MessageSe`
`338`	`338`	`}`
`339`	`339`	`ctxLogger.Info(fmt.Sprintf("created event [%s] with id [%s] and message id [%s] and user [%s]", event.Type(), event.ID(), eventPayload.MessageID, eventPayload.UserID))`
`340`	`340`
	`341`	`+ message, err := service.storeSentMessage(ctx, eventPayload)`
	`342`	`+ if err != nil {`
	`343`	`+ msg := fmt.Sprintf("cannot store message with id [%s]", eventPayload.MessageID)`
	`344`	`+ return nil, service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))`
	`345`	`+ }`
	`346`	`+`
`341`	`347`	`timeout := service.getSendDelay(ctxLogger, eventPayload, params.SendAt)`
`342`	`348`	`if _, err = service.eventDispatcher.DispatchWithTimeout(ctx, event, timeout); err != nil {`
`343`	`349`	`msg := fmt.Sprintf("cannot dispatch event type [%s] and id [%s]", event.Type(), event.ID())`
`344`	`350`	`return nil, service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))`
`345`	`351`	`}`
`346`	`352`
`347`	`353`	`ctxLogger.Info(fmt.Sprintf("[%s] event with ID [%s] dispatched succesfully for message [%s] with user [%s] and delay [%s]", event.Type(), event.ID(), eventPayload.MessageID, eventPayload.UserID, timeout))`
`348`		`- return service.storeSentMessage(ctx, eventPayload)`
	`354`	`+ return message, err`
`349`	`355`	`}`
`350`	`356`
`351`	`357`	`func (service MessageService) getSendDelay(ctxLogger telemetry.Logger, eventPayload events.MessageAPISentPayload, sendAt time.Time) time.Duration {`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ func (v *BulkMessageHandlerValidator) parseXlsx(ctxLogger telemetry.Logger, user`
`151`	`151`	`})`
`152`	`152`	`}`
`153`	`153`
`154`		`- return messages, nil`
	`154`	`+ return messages, url.Values{}`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`func (v BulkMessageHandlerValidator) convertExcelTime(user entities.User, value string) (*time.Time, error) {`
`@@ -206,7 +206,7 @@ func (v *BulkMessageHandlerValidator) parseCSV(ctxLogger telemetry.Logger, user`
`206`	`206`	`return nil, result`
`207`	`207`	`}`
`208`	`208`
`209`		`- return messages, nil`
	`209`	`+ return messages, url.Values{}`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`func (v BulkMessageHandlerValidator) validateMessages(messages []requests.BulkMessage) url.Values {`