Skip to content

Commit a403e4f

Browse files
committed
fix: urls structure
1 parent 16aa0b3 commit a403e4f

File tree

4 files changed

+32
-18
lines changed

4 files changed

+32
-18
lines changed

codeforlife/tests/api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ def generic(
338338
assert status_code_assertion(
339339
status_code
340340
), f"Unexpected status code: {status_code}." + (
341-
"\nValidation errors:: "
341+
"\nValidation errors: "
342342
+ json.dumps(
343343
# pylint: disable-next=no-member
344344
response.json(), # type: ignore[attr-defined]

codeforlife/urls/__init__.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
"""
2+
© Ocado Group
3+
Created on 16/09/2024 at 15:23:05(+01:00).
4+
"""
5+
6+
from .handlers import handler400, handler403, handler404, handler500
7+
from .patterns import get_urlpatterns

codeforlife/urls/handlers.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
"""
2+
© Ocado Group
3+
Created on 16/09/2024 at 15:19:54(+01:00).
4+
5+
Custom error handlers which override django's default behavior to render a
6+
template.
7+
8+
https://docs.djangoproject.com/en/3.2/ref/urls/#module-django.conf.urls
9+
"""
10+
11+
from django.http import (
12+
HttpResponseBadRequest,
13+
HttpResponseForbidden,
14+
HttpResponseNotFound,
15+
HttpResponseServerError,
16+
)
17+
18+
handler400 = lambda request: HttpResponseBadRequest()
19+
handler403 = lambda request: HttpResponseForbidden()
20+
handler404 = lambda request: HttpResponseNotFound()
21+
handler500 = lambda request: HttpResponseServerError()

codeforlife/urls.py renamed to codeforlife/urls/patterns.py

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,12 @@
66
import typing as t
77

88
from django.contrib import admin
9-
from django.http import (
10-
HttpResponse,
11-
HttpResponseBadRequest,
12-
HttpResponseForbidden,
13-
HttpResponseNotFound,
14-
HttpResponseServerError,
15-
)
9+
from django.http import HttpResponse
1610
from django.urls import URLPattern, URLResolver, include, path, re_path
1711
from rest_framework import status
1812

19-
from .settings import SERVICE_IS_ROOT, SERVICE_NAME
20-
from .views import CsrfCookieView, LogoutView
13+
from ..settings import SERVICE_IS_ROOT, SERVICE_NAME
14+
from ..views import CsrfCookieView, LogoutView
2115

2216
UrlPatterns = t.List[t.Union[URLResolver, URLPattern]]
2317

@@ -99,11 +93,3 @@ def get_urlpatterns(
9993
name="service-not-found",
10094
),
10195
]
102-
103-
104-
# Error handlers.
105-
# https://docs.djangoproject.com/en/3.2/ref/urls/#module-django.conf.urls
106-
handler400 = lambda request: HttpResponseBadRequest()
107-
handler403 = lambda request: HttpResponseForbidden()
108-
handler404 = lambda request: HttpResponseNotFound()
109-
handler500 = lambda request: HttpResponseServerError()

0 commit comments

Comments
 (0)