Merge pull request #2965 from EarthSoar/fix-isssue-2967

casualjim · web-flow · commit b9afd5979a3b · 2023-08-21T15:25:45.000-07:00
fix: diff result has no URL, when there is an object type array field…
diff --git a/diff/spec_analyser.go b/diff/spec_analyser.go
@@ -746,7 +746,11 @@ func (sd *SpecAnalyser) schemaFromRef(ref spec.Ref, defns *spec.Definitions) (ac
 }
 
 func schemaLocationKey(location DifferenceLocation) string {
-	return location.Method + location.URL + location.Node.Field + location.Node.TypeName
+	k := location.Method + location.URL + location.Node.Field + location.Node.TypeName
+	if location.Node.ChildNode != nil && location.Node.ChildNode.IsArray {
+		k += location.Node.ChildNode.Field + location.Node.ChildNode.TypeName
+	}
+	return k
 }
 
 // PropertyDefn combines a property with its required-ness

Original file line number	Diff line number	Diff line change
`@@ -746,7 +746,11 @@ func (sd SpecAnalyser) schemaFromRef(ref spec.Ref, defns spec.Definitions) (ac`
`746`	`746`	`}`
`747`	`747`
`748`	`748`	`func schemaLocationKey(location DifferenceLocation) string {`
`749`		`- return location.Method + location.URL + location.Node.Field + location.Node.TypeName`
	`749`	`+ k := location.Method + location.URL + location.Node.Field + location.Node.TypeName`
	`750`	`+ if location.Node.ChildNode != nil && location.Node.ChildNode.IsArray {`
	`751`	`+ k += location.Node.ChildNode.Field + location.Node.ChildNode.TypeName`
	`752`	`+ }`
	`753`	`+ return k`
`750`	`754`	`}`
`751`	`755`
`752`	`756`	`// PropertyDefn combines a property with its required-ness`