fix #2465 remote model with omitempty

codegen/util.go

@@ -41,6 +41,7 @@ func findGoInterface(def types.Type) (*types.Interface, error) {
 
 func equalFieldName(source, target string) bool {
 	source = strings.ReplaceAll(source, "_", "")
+	source = strings.ReplaceAll(source, ",omitempty", "")
 	target = strings.ReplaceAll(target, "_", "")
 	return strings.EqualFold(source, target)
 }

integration/gqlgen.yml

@@ -1,6 +1,7 @@
 schema:
   - "schema.graphql"
   - "user.graphql"
+  - "testomitempty.graphql"
 
 exec:
   filename: generated.go
@@ -10,6 +11,11 @@ resolver:
   filename: resolver.go
   type: Resolver
 
+struct_tag: json
+
+autobind:
+  - "github.com/99designs/gqlgen/integration/testomitempty"
+
 models:
   Element:
     model: github.com/99designs/gqlgen/integration/models-go.Element

integration/schema-expected.graphql

@@ -46,6 +46,10 @@ type Query {
   viewer: Viewer
 }
 
+type RemoteModelWithOmitempty {
+  newDesc: String
+}
+
 type User {
   likes: [String!]!
   name: String!

integration/testomitempty.graphql

@@ -0,0 +1,3 @@
+type RemoteModelWithOmitempty {
+    newDesc: String
+}

integration/testomitempty/testmodel.go

@@ -0,0 +1,5 @@
+package testomitempty
+
+type RemoteModelWithOmitempty struct {
+	Description string `json:"newDesc,omitempty"`
+}