Manage DuplicateComponentNameError apispec error.

Ref #137
algoo · Feb 4, 2019 · 41d085e · 41d085e
1 parent 2ad8d18
commit 41d085e
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 22 deletions.
diff --git a/hapic/doc/main.py b/hapic/doc/main.py
@@ -4,6 +4,7 @@
 
 from apispec import APISpec
 from apispec import BasePlugin
+from apispec.exceptions import DuplicateComponentNameError
 import yaml
 
 from hapic.context import ContextInterface
@@ -319,14 +320,17 @@ def get_doc(
                     schema_usages.append(SchemaUsage(error_schema))
 
         for schema_usage in set(schema_usages):
-            spec.components.schema(
-                main_plugin.schema_name_resolver(
-                    schema_usage.schema,
-                    **schema_usage.plugin_name_resolver_kwargs,
-                ),
-                schema=schema_usage.schema,
-                **schema_usage.plugin_helper_kwargs,
-            )
+            try:
+                spec.components.schema(
+                    main_plugin.schema_name_resolver(
+                        schema_usage.schema,
+                        **schema_usage.plugin_name_resolver_kwargs,
+                    ),
+                    schema=schema_usage.schema,
+                    **schema_usage.plugin_helper_kwargs,
+                )
+            except DuplicateComponentNameError:
+                pass  # Already registered schema
 
         # add views
         for controller in controllers:

diff --git a/hapic/ext/aiohttp/context.py b/hapic/ext/aiohttp/context.py
@@ -207,7 +207,9 @@ def add_view(
         http_method: str,
         view_func: typing.Callable[..., typing.Any],
     ) -> None:
-        self.app.router.add_routes([web.route(http_method, path=route, handler=view_func)])
+        self.app.router.add_routes(
+            [web.route(http_method, path=route, handler=view_func)]
+        )
 
     def serve_directory(self, route_prefix: str, directory_path: str) -> None:
         self.app.router.add_static(route_prefix, path=directory_path)

diff --git a/hapic/processor/marshmallow.py b/hapic/processor/marshmallow.py
@@ -1,12 +1,12 @@
 import typing
 
 from apispec import BasePlugin
+from apispec_marshmallow_advanced import MarshmallowAdvancedPlugin
 from apispec_marshmallow_advanced.common import generate_schema_name
 from apispec_marshmallow_advanced.common import (
     schema_class_resolver as schema_class_resolver_
 )
 
-from apispec_marshmallow_advanced import MarshmallowAdvancedPlugin
 from hapic.doc.schema import SchemaUsage
 from hapic.error.main import ErrorBuilderInterface
 from hapic.error.marshmallow import MarshmallowDefaultErrorBuilder

diff --git a/tests/func/fake_api/test_fake_api.py b/tests/func/fake_api/test_fake_api.py
@@ -187,10 +187,25 @@ def test_func__test_fake_api_doc_ok__all_framework(context):
         doc["definitions"]["AboutResponseSchema"]
         == SWAGGER_DOC_API["definitions"]["AboutResponseSchema"]
     )
-    assert (
-        doc["definitions"]["ListsUserSchema"]
-        == SWAGGER_DOC_API["definitions"]["ListsUserSchema"]
-    )
+
+    # FIXME BS 2019-02-04: With irregularity,
+    # apispec.ext.marshmallow.common.get_unique_schema_name increment counter
+    # on UserSchema_without_email_address_first_name_last_name . See #136
+    try:
+        assert (
+            "#/definitions/UserSchema_without_email_address_first_name_last_name"
+            == doc["definitions"]["ListsUserSchema"]["properties"]["items"][
+                "items"
+            ]["$ref"]
+        )
+    except AssertionError:
+        assert (
+            "#/definitions/UserSchema_without_email_address_first_name_last_name1"
+            == doc["definitions"]["ListsUserSchema"]["properties"]["items"][
+                "items"
+            ]["$ref"]
+        )
+
     assert (
         doc["definitions"]["NoContentSchema"]
         == SWAGGER_DOC_API["definitions"]["NoContentSchema"]
@@ -212,11 +227,25 @@ def test_func__test_fake_api_doc_ok__all_framework(context):
         doc["definitions"]["UserSchema_without_id"]
         == SWAGGER_DOC_API["definitions"]["UserSchema_without_id"]
     )
-    assert (
-        doc["definitions"][
-            "UserSchema_without_email_address_first_name_last_name"
-        ]
-        == SWAGGER_DOC_API["definitions"][
-            "UserSchema_without_email_address_first_name_last_name"
-        ]
-    )
+
+    # FIXME BS 2019-02-04: With irregularity,
+    # apispec.ext.marshmallow.common.get_unique_schema_name increment counter
+    # on UserSchema_without_email_address_first_name_last_name . See #136
+    try:
+        assert (
+            doc["definitions"][
+                "UserSchema_without_email_address_first_name_last_name"
+            ]
+            == SWAGGER_DOC_API["definitions"][
+                "UserSchema_without_email_address_first_name_last_name"
+            ]
+        )
+    except AssertionError:
+        assert (
+            doc["definitions"][
+                "UserSchema_without_email_address_first_name_last_name1"
+            ]
+            == SWAGGER_DOC_API["definitions"][
+                "UserSchema_without_email_address_first_name_last_name"
+            ]
+        )