Skip to content
Snippets Groups Projects
Commit 08862159 authored by Andreas Ellewsen's avatar Andreas Ellewsen
Browse files

Merge branch 'GREG-76-remove-trailing-slash' into 'master'

Remove trailing slash from api paths

See merge request !102
parents aa2963a4 5176cf83
No related branches found
No related tags found
1 merge request!102Remove trailing slash from api paths
Pipeline #96786 passed
...@@ -23,34 +23,33 @@ router.register(r"orgunit", OrganizationalUnitViewSet, basename="orgunit") ...@@ -23,34 +23,33 @@ router.register(r"orgunit", OrganizationalUnitViewSet, basename="orgunit")
urlpatterns = router.urls urlpatterns = router.urls
# Allowing trailing slashes to be optional for the URLs below
urlpatterns += [ urlpatterns += [
re_path( re_path(
r"^persons/(?P<person_id>[0-9]+)/roles/?$", r"^persons/(?P<person_id>[0-9]+)/roles$",
RoleViewSet.as_view({"get": "list", "post": "create"}), RoleViewSet.as_view({"get": "list", "post": "create"}),
name="person_role-list", name="person_role-list",
), ),
re_path( re_path(
r"^persons/(?P<person_id>[0-9]+)/roles/(?P<id>[0-9]+)/?$", r"^persons/(?P<person_id>[0-9]+)/roles/(?P<id>[0-9]+)$",
RoleViewSet.as_view( RoleViewSet.as_view(
{"get": "retrieve", "patch": "partial_update", "delete": "destroy"} {"get": "retrieve", "patch": "partial_update", "delete": "destroy"}
), ),
name="person_role-detail", name="person_role-detail",
), ),
re_path( re_path(
r"^persons/(?P<person_id>[0-9]+)/identities/?$", r"^persons/(?P<person_id>[0-9]+)/identities$",
IdentityViewSet.as_view({"get": "list", "post": "create"}), IdentityViewSet.as_view({"get": "list", "post": "create"}),
name="person_identity-list", name="person_identity-list",
), ),
re_path( re_path(
r"^persons/(?P<person_id>[0-9]+)/identities/(?P<id>[0-9]+)/?$", r"^persons/(?P<person_id>[0-9]+)/identities/(?P<id>[0-9]+)$",
IdentityViewSet.as_view( IdentityViewSet.as_view(
{"get": "retrieve", "delete": "destroy", "patch": "partial_update"} {"get": "retrieve", "delete": "destroy", "patch": "partial_update"}
), ),
name="person_identity-detail", name="person_identity-detail",
), ),
re_path( re_path(
r"^sponsors/(?P<sponsor_id>[0-9]+)/guests/?$", r"^sponsors/(?P<sponsor_id>[0-9]+)/guests$",
SponsorGuestsViewSet.as_view({"get": "list"}), SponsorGuestsViewSet.as_view({"get": "list"}),
name="sponsor_guests-list", name="sponsor_guests-list",
), ),
......
...@@ -24,12 +24,12 @@ from greg.api.views.health import Health ...@@ -24,12 +24,12 @@ from greg.api.views.health import Health
urlpatterns: List[URLResolver] = [ urlpatterns: List[URLResolver] = [
path( path(
"schema/", "schema",
SpectacularAPIView.as_view(versioning_class=NamespaceVersioning), SpectacularAPIView.as_view(versioning_class=NamespaceVersioning),
name="schema", name="schema",
), # type: ignore ), # type: ignore
path( path(
"schema/swagger-ui/", "schema/swagger-ui",
SpectacularSwaggerView.as_view( SpectacularSwaggerView.as_view(
url_name="schema", versioning_class=NamespaceVersioning url_name="schema", versioning_class=NamespaceVersioning
), # type: ignore ), # type: ignore
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment