Merge paths if they already are added to the paths map (#1171)

juhaku · Oct 28, 2024 · 8a5ed1e · 8a5ed1e
1 parent d21c03e
commit 8a5ed1e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/utoipa-axum/CHANGELOG.md b/utoipa-axum/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog - utoipa-axum
 
+## Unreleased
+
+* Merge paths if they already are added to the paths map in utoipa-axum (https://github.com/juhaku/utoipa/pull/1171)
+
 ## 0.1.1 - Oct 16 2024
 
 ### Changed

diff --git a/utoipa-axum/src/router.rs b/utoipa-axum/src/router.rs
@@ -253,8 +253,15 @@ where
             })
         };
 
-        // add current paths to the OpenApi
-        self.1.paths.paths.extend(paths.paths.clone());
+        // add or merge current paths to the OpenApi
+        for (path, item) in paths.paths {
+            if let Some(it) = self.1.paths.paths.get_mut(&path) {
+                it.merge_operations(item);
+            } else {
+                self.1.paths.paths.insert(path, item);
+            }
+        }
+
         let components = self
             .1
             .components