From 6de0ddd7dd1dfe95da1c28851a1ed17a547105f2 Mon Sep 17 00:00:00 2001
From: rgodden <7768980+goddenrich@users.noreply.github.com>
Date: Wed, 28 Aug 2024 17:10:07 +0100
Subject: [PATCH] fix send message

---
 app/gosqs/send_message.go       | 2 +-
 app/gosqs/send_message_batch.go | 2 +-
 app/models/sqs.go               | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/gosqs/send_message.go b/app/gosqs/send_message.go
index cc180f1a..8915978e 100644
--- a/app/gosqs/send_message.go
+++ b/app/gosqs/send_message.go
@@ -60,7 +60,7 @@ func SendMessageV1(req *http.Request) (int, interfaces.AbstractResponseBody) {
 	log.Debugf("Putting Message in Queue: [%s]", queueName)
 	msg := app.Message{MessageBody: []byte(messageBody)}
 	if len(messageAttributes) > 0 {
-		oldStyleMessageAttributes := utils.ConvertToOldMessageAttributeValueStructure(messageAttributes)
+		oldStyleMessageAttributes := requestBody.GetMessageAttributes()
 		msg.MessageAttributes = oldStyleMessageAttributes
 		msg.MD5OfMessageAttributes = common.HashAttributes(oldStyleMessageAttributes)
 	}
diff --git a/app/gosqs/send_message_batch.go b/app/gosqs/send_message_batch.go
index e670c0d4..9a8cf411 100644
--- a/app/gosqs/send_message_batch.go
+++ b/app/gosqs/send_message_batch.go
@@ -62,7 +62,7 @@ func SendMessageBatchV1(req *http.Request) (int, interfaces.AbstractResponseBody
 	for _, sendEntry := range sendEntries {
 		msg := app.Message{MessageBody: []byte(sendEntry.MessageBody)}
 		if len(sendEntry.MessageAttributes) > 0 {
-			oldStyleMessageAttributes := utils.ConvertToOldMessageAttributeValueStructure(sendEntry.MessageAttributes)
+			oldStyleMessageAttributes := sendEntry.GetMessageAttributes()
 			msg.MessageAttributes = oldStyleMessageAttributes
 			msg.MD5OfMessageAttributes = common.HashAttributes(oldStyleMessageAttributes)
 		}
diff --git a/app/models/sqs.go b/app/models/sqs.go
index 5bc9f464..e26f0efd 100644
--- a/app/models/sqs.go
+++ b/app/models/sqs.go
@@ -186,6 +186,10 @@ type SendMessageRequest struct {
 	QueueUrl                string                           `json:"QueueUrl" schema:"QueueUrl"`
 }
 
+func (r *SendMessageRequest) GetMessageAttributes() map[string]app.MessageAttributeValue {
+	return convertToOldMessageAttributeValueStructure(r.MessageAttributes)
+}
+
 func (r *SendMessageRequest) SetAttributesFromForm(values url.Values) {
 	for i := 1; true; i++ {
 		nameKey := fmt.Sprintf("MessageAttribute.%d.Name", i)
@@ -282,6 +286,10 @@ type SendMessageBatchRequestEntry struct {
 	MessageSystemAttributes map[string]MessageAttributeValue `json:"MessageSystemAttributes" schema:"MessageSystemAttributes"` // NOTE: not implemented
 }
 
+func (e *SendMessageBatchRequestEntry) GetMessageAttributes() map[string]app.MessageAttributeValue {
+	return convertToOldMessageAttributeValueStructure(e.MessageAttributes)
+}
+
 // Get Queue Url Request
 func NewGetQueueUrlRequest() *GetQueueUrlRequest {
 	return &GetQueueUrlRequest{}