Merge pull request #96 from ogen-go/refactor/camel-cased-query

refactor: use json name for query

Author: sashamelentyev

internal/gen/_golden/path_n_query_param_for_get_method.json

@@ -1 +1 @@
-{"openapi":"3.1.0","info":{"title":"","version":""},"paths":{"/api/v1/{id}":{"get":{"operationId":"getMethod","parameters":[{"name":"id","in":"path","required":true,"schema":{"type":"string"}},{"name":"query","in":"query","schema":{"type":"string"}}],"responses":{"200":{"description":"service.v1.Service.GetMethod response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/Response"}}}}}}}},"components":{"schemas":{"Response":{"type":"object"}}}}
+{"openapi":"3.1.0","info":{"title":"","version":""},"paths":{"/api/v1/{id}":{"get":{"operationId":"getMethod","parameters":[{"name":"id","in":"path","required":true,"schema":{"type":"string"}},{"name":"query","in":"query","schema":{"type":"string"}},{"name":"queryParam","in":"query","schema":{"type":"string"}}],"responses":{"200":{"description":"service.v1.Service.GetMethod response","content":{"application/json":{"schema":{"$ref":"#/components/schemas/Response"}}}}}}}},"components":{"schemas":{"Response":{"type":"object"}}}}

internal/gen/_golden/path_n_query_param_for_get_method.yaml

@@ -16,6 +16,10 @@ paths:
           in: query
           schema:
             type: string
+        - name: queryParam
+          in: query
+          schema:
+            type: string
       responses:
         "200":
           description: service.v1.Service.GetMethod response

internal/gen/_testdata/path_n_query_param_for_get_method.textproto

@@ -17,6 +17,13 @@ proto_file: {
       type: TYPE_STRING
       json_name: "query"
     }
+    field: {
+      name: "query_param"
+      number: 3
+      label: LABEL_OPTIONAL
+      type: TYPE_STRING
+      json_name: "queryParam"
+    }
   }
   message_type: {
     name: "Response"

internal/gen/generator.go

@@ -300,7 +300,7 @@ func (g *Generator) mkQueryParameters(op *ogen.Operation, fields map[string]*pro
 	walkFields = func(prefix string, fields []*protogen.Field) error {
 		for _, f := range fields {
 			fd := f.Desc
-			name := prefix + fd.TextName()
+			name := prefix + fd.JSONName()
 
 			switch kind := fd.Kind(); kind {
 			case protoreflect.MessageKind: