Simplify

Author: blva

tools/cli/internal/openapi/oasdiff.go

@@ -118,7 +118,7 @@ func (o OasDiff) mergePaths() error {
 		if originalPath := basePaths.Value(externalPath); originalPath == nil {
 			basePaths.Set(externalPath, removeExternalRefs(externalPathData))
 		} else {
-			if shouldSkipPathConflict(originalPath, externalPathData, externalPath) {
+			if o.shouldSkipPathConflict(originalPath, externalPath) {
 				log.Printf("Skipping conflict for path: %s", externalPath)
 				if o.arePathsIdenticalWithExcludeExtensions(externalPath) {
 					log.Printf("No doc diff detected for path %s, merging the paths", externalPath)
@@ -172,6 +172,25 @@ func removeExternalRefs(path *openapi3.PathItem) *openapi3.PathItem {
 	return path
 }
 
+// shouldSkipConflict checks if the conflict should be skipped.
+// The method goes through each path operation and performs the following checks:
+// 1. Validates if both paths have same operations, if not, then it returns false.
+// 2. If both paths have the same operations, then it checks if there is an x-xgen-soa-migration annotation.
+// If there is no annotation, then it returns false.
+func (o OasDiff) shouldSkipPathConflict(basePath *openapi3.PathItem, basePathName string) bool {
+	if ok := o.specDiff.PathsDiff.Modified[basePathName].OperationsDiff.Added; !ok.Empty() {
+		return false
+	}
+
+	if ok := o.specDiff.PathsDiff.Modified[basePathName].OperationsDiff.Deleted; !ok.Empty() {
+		return false
+	}
+
+	// now check if there is an x-xgen-soa-migration annotation in any of the operations, but if any of the operations
+	// doesn't have, then we should not skip the conflict
+	return allOperationsHaveExtension(basePath, basePathName, xgenSoaMigration)
+}
+
 // updateExternalRefResponses updates the external references of OASes to remove the reference to openapi-mms.json
 // in the Responses.
 // A Response can have an external ref in Response.Ref or in its content (Response.Content.Schema.Ref)

tools/cli/internal/openapi/paths.go

@@ -24,37 +24,6 @@ const (
 	xgenSoaMigration = "x-xgen-soa-migration"
 )
 
-// shouldSkipConflict checks if the conflict should be skipped.
-// The method goes through each path operation and performs the following checks:
-// 1. Validates if both paths have same operations, if not, then it returns false.
-// 2. If both paths have the same operations, then it checks if there is an x-xgen-soa-migration annotation.
-// If there is no annotation, then it returns false.
-func shouldSkipPathConflict(basePath, externalPath *openapi3.PathItem, basePathName string) bool {
-	if basePath.Get != nil && externalPath.Get == nil || basePath.Get == nil && externalPath.Get != nil {
-		return false
-	}
-
-	if basePath.Put != nil && externalPath.Put == nil || basePath.Put == nil && externalPath.Put != nil {
-		return false
-	}
-
-	if basePath.Post != nil && externalPath.Post == nil || basePath.Post == nil && externalPath.Post != nil {
-		return false
-	}
-
-	if basePath.Patch != nil && externalPath.Patch == nil || basePath.Patch == nil && externalPath.Patch != nil {
-		return false
-	}
-
-	if basePath.Delete != nil && externalPath.Delete == nil || basePath.Delete == nil && externalPath.Delete != nil {
-		return false
-	}
-
-	// now check if there is an x-xgen-soa-migration annotation in any of the operations, but if any of the operations
-	// doesn't have, then we should not skip the conflict
-	return allOperationsHaveExtension(basePath, basePathName, xgenSoaMigration)
-}
-
 // allMethodsHaveExtension checks if all the operations in the base pat have the given extension name.
 func allOperationsHaveExtension(basePath *openapi3.PathItem, basePathName, extensionName string) bool {
 	if basePath.Get != nil {