Skip to content

Commit 6ff06ad

Browse files
authored
Merge pull request #15 from SpokaneTech/apis
Apis
2 parents c5b8a6b + 0e591c0 commit 6ff06ad

File tree

13 files changed

+1103
-55
lines changed

13 files changed

+1103
-55
lines changed

pyproject.toml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ dependencies = [
1212
"drf-flex-fields",
1313
"drf-spectacular",
1414
"drf-renderer-xlsx",
15+
"whitenoise",
1516
]
1617
description = "Spokane Python Community"
1718
dynamic = ["version"]
@@ -44,7 +45,6 @@ dev = [
4445
docker = [
4546
"gunicorn",
4647
"psycopg2-binary",
47-
"whitenoise",
4848
]
4949

5050

@@ -64,11 +64,11 @@ show_missing = true
6464
branch = true
6565
source = ["src/django_project"]
6666
omit = [
67-
"django_project/manage.py",
68-
"django_project/core/asgi.py",
69-
"django_project/core/wsgi.py",
70-
"django_project/*/scripts/*",
71-
"django_project/tests/*",
67+
"src/django_project/manage.py",
68+
"src/django_project/core/asgi.py",
69+
"src/django_project/core/wsgi.py",
70+
"src/django_project/*/scripts/*",
71+
"src/django_project/tests/*",
7272
]
7373

7474

@@ -97,7 +97,13 @@ filterwarnings = [
9797

9898
[tool.ruff]
9999
line-length = 120
100-
exclude = ["django_project/manage.py", "django_project/tests", "django_project/*/migrations", "django_project/*/scripts", "django_project/*/local_test"]
100+
exclude = [
101+
"src/django_project/manage.py",
102+
"src/django_project/tests",
103+
"src/django_project/*/migrations",
104+
"src/django_project/*/scripts",
105+
"src/django_project/*/local_test"
106+
]
101107

102108

103109
[tool.setuptools.packages.find]

src/django_project/core/settings.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
BASE_DIR = Path(__file__).resolve().parent.parent
2121

2222

23-
ENV_PATH = os.environ.get("ENV_PATH", f"{BASE_DIR.parent}/envs/.env.local")
23+
# ENV_PATH = os.environ.get("ENV_PATH", f"{BASE_DIR.parent}/envs/.env.local")
24+
ENV_PATH = os.environ.get("ENV_PATH")
2425
# now load the contents of the defined .env file
2526
env = environ.Env()
26-
if os.path.exists(ENV_PATH):
27+
if ENV_PATH and os.path.exists(ENV_PATH):
2728
print(f"loading ENV vars from {ENV_PATH}")
2829
environ.Env.read_env(ENV_PATH)
2930
else:
@@ -37,7 +38,7 @@
3738
SECRET_KEY = env.str("SECRET_KEY", "default_key-this_is_insecure_and_should_be_changed")
3839

3940
# SECURITY WARNING: don't run with debug turned on in production!
40-
DEBUG = env.bool("DEBUG", True)
41+
DEBUG = env.bool("DEBUG", False)
4142
DEPLOYMENT_ENV = env.str("DEPLOYMENT_ENV", "local")
4243

4344

@@ -268,7 +269,9 @@
268269
# drf configuration
269270
REST_FRAMEWORK = {
270271
"DEFAULT_FILTER_BACKENDS": ("django_filters.rest_framework.DjangoFilterBackend",),
271-
"DEFAULT_PERMISSION_CLASSES": ("rest_framework.permissions.IsAuthenticatedOrReadOnly",),
272+
"DEFAULT_PERMISSION_CLASSES": ("rest_framework.permissions.IsAuthenticatedOrReadOnly",)
273+
if DEBUG
274+
else ("rest_framework.permissions.IsAuthenticated",),
272275
"DEFAULT_AUTHENTICATION_CLASSES": (
273276
"rest_framework.authentication.TokenAuthentication",
274277
"rest_framework.authentication.SessionAuthentication",
Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
from django.conf.urls import include
22
from django.urls import path
33
from rest_framework import routers
4+
from web.views import viewsets
45

56
app_name = "rest"
67

7-
v1_router = routers.DefaultRouter()
8+
router = routers.DefaultRouter()
9+
10+
# web API Endpoints
11+
router.register(r"event", viewsets.EventViewSet, "event")
12+
router.register(r"presentationrequest", viewsets.PresentationRequestViewSet, "presentationrequest")
13+
router.register(r"resource", viewsets.ResourceViewSet, "resource")
14+
router.register(r"resourcecategory", viewsets.ResourceCategoryViewSet, "resourcecategory")
15+
router.register(r"topicsuggestion", viewsets.TopicSuggestionViewSet, "topicsuggestion")
816

917

1018
urlpatterns = [
1119
# API views
12-
path("", include(v1_router.urls)),
13-
path("v1/", include(v1_router.urls)),
20+
path("", include(router.urls)),
21+
path("v1/", include(router.urls)),
1422
]

src/django_project/core/urls/urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
# 3rd party URLs
3232
path("handyhelpers/", include("handyhelpers.urls")),
3333
# RESTful API URLs
34-
path("rest/", include("core.urls.rest", namespace="rest")),
34+
path("rest/", include("core.urls.rest", namespace="")),
3535
path("rest/schema/", SpectacularAPIView.as_view(), name="schema"),
3636
path("rest/swagger/", SpectacularSwaggerView.as_view(url_name="schema"), name="swagger"),
3737
path("rest/redoc/", SpectacularRedocView.as_view(url_name="schema"), name="redoc"),

src/django_project/tests/unit/web/test_model_crud.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
BASE_DIR = Path(__file__).parents[4]
1010
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "core.settings")
11+
os.environ.setdefault("ENV_PATH", "../envs/.env.test")
1112
django.setup()
1213
from model_bakery import baker # noqa: E402
1314

0 commit comments

Comments
 (0)