diff --git a/server/myapi/models.py b/server/myapi/models.py index 55970d4..7f73a80 100644 --- a/server/myapi/models.py +++ b/server/myapi/models.py @@ -5,8 +5,8 @@ TODO implement validators - nullable or sure """ -class Film(models.Model): +class Film(models.Model): class MovieFormat(models.TextChoices): ANALOG_35 = '35mm' DVD = 'DVD' @@ -34,4 +34,3 @@ class Film(models.Model): def __str__(self): return f'{self.title} de {self.director} ({self.projection_date.strftime("%d/%m/%Y")})' - diff --git a/server/myapi/urls.py b/server/myapi/urls.py index 1941306..d43e639 100644 --- a/server/myapi/urls.py +++ b/server/myapi/urls.py @@ -1,9 +1,9 @@ from django.urls import include, path from rest_framework import routers -from . import views +from .views.std_views import (FilmViewSet) router = routers.DefaultRouter() -router.register(r'films', views.FilmViewSet) +router.register(r'films', FilmViewSet) # Wire up our API using automatic URL routing. # Additionally, we include login URLs for the browsable API. diff --git a/server/myapi/views.py b/server/myapi/views/std_views.py similarity index 76% rename from server/myapi/views.py rename to server/myapi/views/std_views.py index e5505b9..55b2fb3 100644 --- a/server/myapi/views.py +++ b/server/myapi/views/std_views.py @@ -1,8 +1,9 @@ # from django.shortcuts import render from rest_framework import viewsets -from .serializers import FilmSerializer -from .models import Film +from myapi.serializers import FilmSerializer +from myapi.models import Film + class FilmViewSet(viewsets.ModelViewSet): queryset = Film.objects.all().order_by('projection_date') diff --git a/server/requirements.txt b/server/requirements.txt index f34be2b..c9bc5b7 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -1,2 +1,3 @@ -Django>=3.0,<4.0 -psycopg2>=2.8 +Django>=3.2,<3.3 +djangorestframework==3.13.1 +django-cors-headers==3.5.0 diff --git a/server/ulm_cine_club_api/settings.py b/server/ulm_cine_club_api/settings.py index 0c1f65e..1747237 100644 --- a/server/ulm_cine_club_api/settings.py +++ b/server/ulm_cine_club_api/settings.py @@ -125,12 +125,3 @@ STATIC_URL = '/static/' # https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' - -REST_FRAMEWORK = { - 'DEFAULT_RENDERER_CLASSES': [ - 'rest_framework.renderers.JSONRenderer', - ], - 'DEFAULT_PARSER_CLASSES': [ - 'rest_framework.parsers.JSONParser', - ] -}