From b6f6d8938b7176732b2df3efa91e9c96d37d3c3c Mon Sep 17 00:00:00 2001 From: taxio Date: Sun, 31 Mar 2024 13:07:10 +0900 Subject: [PATCH 1/2] fix: use named key in QueryParameterObjectField --- gen/templates.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen/templates.go b/gen/templates.go index 8aaff1920..02eb0f2c8 100644 --- a/gen/templates.go +++ b/gen/templates.go @@ -265,7 +265,7 @@ func paramObjectFields(typ *ir.Type) string { req = "true" } - fields = append(fields, "{\""+f.Spec.Name+"\","+req+"}") + fields = append(fields, "{Name:\""+f.Spec.Name+"\",Required:"+req+"}") } return "[]uri.QueryParameterObjectField{" + strings.Join(fields, ",") + "}" From a89c573a6f0e70b0073b3f9fe8ba0d6671f35d04 Mon Sep 17 00:00:00 2001 From: taxio Date: Sun, 31 Mar 2024 13:08:51 +0900 Subject: [PATCH 2/2] chore: commit generated files --- internal/integration/test_form/oas_request_decoders_gen.go | 6 +++--- internal/integration/test_parameters/oas_parameters_gen.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/integration/test_form/oas_request_decoders_gen.go b/internal/integration/test_form/oas_request_decoders_gen.go index f9de668ab..30a749b89 100644 --- a/internal/integration/test_form/oas_request_decoders_gen.go +++ b/internal/integration/test_form/oas_request_decoders_gen.go @@ -452,7 +452,7 @@ func (s *Server) decodeTestFormURLEncodedRequest(r *http.Request) ( Name: "object", Style: uri.QueryStyleForm, Explode: true, - Fields: []uri.QueryParameterObjectField{{"min", false}, {"max", true}}, + Fields: []uri.QueryParameterObjectField{{Name: "min", Required: false}, {Name: "max", Required: true}}, } if err := q.HasParam(cfg); err == nil { if err := q.DecodeParam(cfg, func(d uri.Decoder) error { @@ -474,7 +474,7 @@ func (s *Server) decodeTestFormURLEncodedRequest(r *http.Request) ( Name: "deepObject", Style: uri.QueryStyleDeepObject, Explode: true, - Fields: []uri.QueryParameterObjectField{{"min", false}, {"max", true}}, + Fields: []uri.QueryParameterObjectField{{Name: "min", Required: false}, {Name: "max", Required: true}}, } if err := q.HasParam(cfg); err == nil { if err := q.DecodeParam(cfg, func(d uri.Decoder) error { @@ -697,7 +697,7 @@ func (s *Server) decodeTestMultipartRequest(r *http.Request) ( Name: "deepObject", Style: uri.QueryStyleDeepObject, Explode: true, - Fields: []uri.QueryParameterObjectField{{"min", false}, {"max", true}}, + Fields: []uri.QueryParameterObjectField{{Name: "min", Required: false}, {Name: "max", Required: true}}, } if err := q.HasParam(cfg); err == nil { if err := q.DecodeParam(cfg, func(d uri.Decoder) error { diff --git a/internal/integration/test_parameters/oas_parameters_gen.go b/internal/integration/test_parameters/oas_parameters_gen.go index e2a06ede1..01e700239 100644 --- a/internal/integration/test_parameters/oas_parameters_gen.go +++ b/internal/integration/test_parameters/oas_parameters_gen.go @@ -671,7 +671,7 @@ func decodeObjectQueryParameterParams(args [0]string, argsEscaped bool, r *http. Name: "formObject", Style: uri.QueryStyleForm, Explode: true, - Fields: []uri.QueryParameterObjectField{{"min", true}, {"max", true}, {"filter", true}}, + Fields: []uri.QueryParameterObjectField{{Name: "min", Required: true}, {Name: "max", Required: true}, {Name: "filter", Required: true}}, } if err := q.HasParam(cfg); err == nil { @@ -702,7 +702,7 @@ func decodeObjectQueryParameterParams(args [0]string, argsEscaped bool, r *http. Name: "deepObject", Style: uri.QueryStyleDeepObject, Explode: true, - Fields: []uri.QueryParameterObjectField{{"min", true}, {"max", true}, {"filter", true}}, + Fields: []uri.QueryParameterObjectField{{Name: "min", Required: true}, {Name: "max", Required: true}, {Name: "filter", Required: true}}, } if err := q.HasParam(cfg); err == nil {