Fix definition override for scope's route

Author: rlebran

apistos/src/internal/actix/scope.rs

@@ -10,12 +10,11 @@ use actix_web::Error;
 use apistos_models::components::Components;
 use apistos_models::paths::PathItem;
 use indexmap::IndexMap;
-use std::collections::BTreeMap;
 use std::fmt::Debug;
 use std::future::Future;
 
 pub struct Scope<S = actix_web::Scope> {
-  pub(crate) item_map: BTreeMap<String, PathItem>,
+  pub(crate) item_map: IndexMap<String, PathItem>,
   pub(crate) components: Vec<Components>,
   tags: Vec<String>,
   path: String,
@@ -175,9 +174,10 @@ where
   }
 
   fn update_from_def_holder<D: DefinitionHolder>(&mut self, dh: &mut D) {
-    self.components.extend(dh.components());
-    let mut item_map = IndexMap::new();
+    let mut item_map: IndexMap<String, PathItem> = IndexMap::new();
     dh.update_path_items(&mut item_map);
+
+    self.components.extend(dh.components());
     for (path, mut path_item) in item_map {
       let p = [self.path.clone(), path]
         .iter()
@@ -191,7 +191,9 @@ where
         operation.tags.append(&mut self.tags.clone());
       }
 
-      self.item_map.insert(p, path_item);
+      let op_map = self.item_map.entry(p).or_default();
+      //@todo we should probably merge the path items together instead but for now only operations can be defined using apistos here
+      op_map.operations.extend(path_item.operations);
     }
   }
 }

apistos/tests/routing.rs

@@ -2,12 +2,14 @@ use actix_web::middleware::Logger;
 use actix_web::web::{Json, Path};
 use actix_web::{App, Error};
 
+use actix_web::test::{call_service, init_service, try_read_body_json, TestRequest};
 use apistos::app::OpenApiWrapper;
 use apistos::spec::Spec;
 use apistos::web::{delete, get, patch, post, put, resource, scope, tagged_resource, tagged_scope, ServiceConfig};
 use apistos_gen::api_operation;
 use apistos_models::info::Info;
 use apistos_models::tag::Tag;
+use apistos_models::OpenApi;
 
 #[actix_web::test]
 async fn actix_routing() {
@@ -62,7 +64,8 @@ async fn actix_routing() {
         .route("test3", patch().to(test))
         .route("test4/{test_id}", patch().to(test))
         .app_data("")
-        .configure(my_routes),
+        .configure(my_routes)
+        .service(scope("test5").route("", post().to(test)).route("", get().to(test))),
     )
     .build("/openapi.json");
   let app = init_service(app).await;
@@ -80,19 +83,20 @@ async fn actix_routing() {
     "/test/test2/",
     "/test/test3",
     "/test/test4/{test_id}",
+    "/test/test5",
     "/test/users/{user_id}",
     "/test/{plop_id}/{clap_name}",
   ];
 
-  assert_eq!(paths, expected_paths)
+  assert_eq!(paths, expected_paths);
+
+  assert_eq!(body.paths.paths.values().flat_map(|v| v.operations.values()).count(), 8);
 }
 
 // Imports bellow aim at making clippy happy. Those dependencies are necessary for integration-test.
 use actix_service as _;
-use actix_web::test::{call_service, init_service, try_read_body_json, TestRequest};
 use actix_web_lab as _;
 use apistos_core as _;
-use apistos_models::OpenApi;
 use apistos_plugins as _;
 use apistos_rapidoc as _;
 use apistos_redoc as _;