resolve conflicts

Admiral-Piett · Jun 6, 2024 · 4b7133a · 4b7133a
1 parent 312704b
commit 4b7133a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/gosqs/get_queue_url.go b/app/gosqs/get_queue_url.go
@@ -13,7 +13,7 @@ import (
 func GetQueueUrlV1(req *http.Request) (int, interfaces.AbstractResponseBody) {
 
 	requestBody := models.NewGetQueueUrlRequest()
-	ok := utils.REQUEST_TRANSFORMER(requestBody, req)
+	ok := utils.REQUEST_TRANSFORMER(requestBody, req, false)
 	if !ok {
 		log.Error("Invalid Request - GetQueueUrlV1")
 		return createErrorResponseV1(ErrInvalidParameterValue.Type)

diff --git a/app/gosqs/get_queue_url_test.go b/app/gosqs/get_queue_url_test.go
@@ -21,7 +21,7 @@ func TestGetQueueUrlV1_success(t *testing.T) {
 		utils.REQUEST_TRANSFORMER = utils.TransformRequest
 	}()
 
-	utils.REQUEST_TRANSFORMER = func(resultingStruct interfaces.AbstractRequestBody, req *http.Request) (success bool) {
+	utils.REQUEST_TRANSFORMER = func(resultingStruct interfaces.AbstractRequestBody, req *http.Request, emptyRequestValid bool) (success bool) {
 		v := resultingStruct.(*models.GetQueueUrlRequest)
 		*v = models.GetQueueUrlRequest{
 			QueueName:              "unit-queue1",
@@ -53,7 +53,7 @@ func TestGetQueueUrlV1_error_no_queue(t *testing.T) {
 		utils.REQUEST_TRANSFORMER = utils.TransformRequest
 	}()
 
-	utils.REQUEST_TRANSFORMER = func(resultingStruct interfaces.AbstractRequestBody, req *http.Request) (success bool) {
+	utils.REQUEST_TRANSFORMER = func(resultingStruct interfaces.AbstractRequestBody, req *http.Request, emptyRequestValid bool) (success bool) {
 		v := resultingStruct.(*models.GetQueueUrlRequest)
 		*v = models.GetQueueUrlRequest{
 			QueueName:              "not-exist-unit-queue1",
@@ -88,7 +88,7 @@ func TestGetQueueUrlV1_error_request_transformer(t *testing.T) {
 		utils.REQUEST_TRANSFORMER = utils.TransformRequest
 	}()
 
-	utils.REQUEST_TRANSFORMER = func(resultingStruct interfaces.AbstractRequestBody, req *http.Request) (success bool) {
+	utils.REQUEST_TRANSFORMER = func(resultingStruct interfaces.AbstractRequestBody, req *http.Request, emptyRequestValid bool) (success bool) {
 		return false
 	}
 

diff --git a/app/router/router_test.go b/app/router/router_test.go
@@ -268,12 +268,12 @@ func TestActionHandler_v0_xml(t *testing.T) {
 			"ReceiveMessage":          sqs.ReceiveMessageV1,
 			"DeleteMessage":           sqs.DeleteMessageV1,
 			"ChangeMessageVisibility": sqs.ChangeMessageVisibilityV1,
+			"GetQueueUrl":             sqs.GetQueueUrlV1,
 		}
 		routingTable = map[string]http.HandlerFunc{
 			// SQS
 			"SendMessageBatch":   sqs.SendMessageBatch,
 			"DeleteMessageBatch": sqs.DeleteMessageBatch,
-			"GetQueueUrl":        sqs.GetQueueUrl,
 			"PurgeQueue":         sqs.PurgeQueue,
 			"DeleteQueue":        sqs.DeleteQueue,