-
Notifications
You must be signed in to change notification settings - Fork 693
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
solution #705
base: master
Are you sure you want to change the base?
solution #705
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
from rest_framework.permissions import SAFE_METHODS, BasePermission | ||
|
||
|
||
class IsAdminOrIfAuthenticatedReadOnly(BasePermission): | ||
def has_permission(self, request, view): | ||
return bool( | ||
( | ||
request.method in SAFE_METHODS | ||
and request.user | ||
and request.user.is_authenticated | ||
) | ||
or (request.user and request.user.is_staff) | ||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,8 @@ | ||
from django.urls import path, include | ||
from django.urls import include, path | ||
from rest_framework import routers | ||
|
||
from cinema.views import ( | ||
GenreViewSet, | ||
ActorViewSet, | ||
CinemaHallViewSet, | ||
MovieViewSet, | ||
MovieSessionViewSet, | ||
OrderViewSet, | ||
) | ||
from cinema.views import (ActorViewSet, CinemaHallViewSet, GenreViewSet, | ||
MovieSessionViewSet, MovieViewSet, OrderViewSet) | ||
|
||
Comment on lines
+4
to
+5
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. and here |
||
router = routers.DefaultRouter() | ||
router.register("genres", GenreViewSet) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,44 +1,57 @@ | ||
from datetime import datetime | ||
|
||
from django.db.models import F, Count | ||
from rest_framework import viewsets | ||
from django.db.models import Count, F | ||
from rest_framework import mixins, viewsets | ||
from rest_framework.authentication import TokenAuthentication | ||
from rest_framework.pagination import PageNumberPagination | ||
from rest_framework.permissions import IsAuthenticated | ||
|
||
from cinema.models import Genre, Actor, CinemaHall, Movie, MovieSession, Order | ||
from cinema.models import Actor, CinemaHall, Genre, Movie, MovieSession, Order | ||
from cinema.permissions import IsAdminOrIfAuthenticatedReadOnly | ||
from cinema.serializers import (ActorSerializer, CinemaHallSerializer, | ||
GenreSerializer, MovieDetailSerializer, | ||
MovieListSerializer, MovieSerializer, | ||
MovieSessionDetailSerializer, | ||
MovieSessionListSerializer, | ||
MovieSessionSerializer, OrderListSerializer, | ||
OrderSerializer) | ||
Comment on lines
+9
to
+17
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. here too |
||
|
||
from cinema.serializers import ( | ||
GenreSerializer, | ||
ActorSerializer, | ||
CinemaHallSerializer, | ||
MovieSerializer, | ||
MovieSessionSerializer, | ||
MovieSessionListSerializer, | ||
MovieDetailSerializer, | ||
MovieSessionDetailSerializer, | ||
MovieListSerializer, | ||
OrderSerializer, | ||
OrderListSerializer, | ||
) | ||
|
||
|
||
class GenreViewSet(viewsets.ModelViewSet): | ||
class GenreViewSet(viewsets.GenericViewSet, | ||
mixins.ListModelMixin, mixins.CreateModelMixin): | ||
Comment on lines
+20
to
+21
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. better to transfer every parent to next line, same in ActorViewSet |
||
queryset = Genre.objects.all() | ||
serializer_class = GenreSerializer | ||
authentication_classes = (TokenAuthentication,) | ||
permission_classes = (IsAdminOrIfAuthenticatedReadOnly,) | ||
|
||
|
||
class ActorViewSet(viewsets.ModelViewSet): | ||
class ActorViewSet(viewsets.GenericViewSet, | ||
mixins.ListModelMixin, mixins.CreateModelMixin): | ||
queryset = Actor.objects.all() | ||
serializer_class = ActorSerializer | ||
authentication_classes = (TokenAuthentication,) | ||
permission_classes = (IsAdminOrIfAuthenticatedReadOnly,) | ||
|
||
|
||
class CinemaHallViewSet(viewsets.ModelViewSet): | ||
class CinemaHallViewSet( | ||
viewsets.GenericViewSet, | ||
mixins.ListModelMixin, | ||
mixins.CreateModelMixin | ||
): | ||
queryset = CinemaHall.objects.all() | ||
serializer_class = CinemaHallSerializer | ||
authentication_classes = (TokenAuthentication,) | ||
permission_classes = (IsAdminOrIfAuthenticatedReadOnly,) | ||
|
||
|
||
class MovieViewSet(viewsets.ModelViewSet): | ||
class MovieViewSet(viewsets.GenericViewSet, | ||
mixins.ListModelMixin, | ||
mixins.CreateModelMixin, | ||
mixins.RetrieveModelMixin): | ||
queryset = Movie.objects.prefetch_related("genres", "actors") | ||
serializer_class = MovieSerializer | ||
authentication_classes = (TokenAuthentication,) | ||
permission_classes = (IsAdminOrIfAuthenticatedReadOnly,) | ||
|
||
@staticmethod | ||
def _params_to_ints(qs): | ||
|
@@ -87,6 +100,8 @@ class MovieSessionViewSet(viewsets.ModelViewSet): | |
) | ||
) | ||
serializer_class = MovieSessionSerializer | ||
authentication_classes = (TokenAuthentication,) | ||
permission_classes = (IsAdminOrIfAuthenticatedReadOnly,) | ||
|
||
def get_queryset(self): | ||
date = self.request.query_params.get("date") | ||
|
@@ -118,12 +133,18 @@ class OrderPagination(PageNumberPagination): | |
max_page_size = 100 | ||
|
||
|
||
class OrderViewSet(viewsets.ModelViewSet): | ||
class OrderViewSet( | ||
mixins.ListModelMixin, | ||
mixins.CreateModelMixin, | ||
viewsets.GenericViewSet | ||
): | ||
queryset = Order.objects.prefetch_related( | ||
"tickets__movie_session__movie", "tickets__movie_session__cinema_hall" | ||
) | ||
serializer_class = OrderSerializer | ||
pagination_class = OrderPagination | ||
authentication_classes = (TokenAuthentication,) | ||
permission_classes = (IsAuthenticated,) | ||
|
||
def get_queryset(self): | ||
return Order.objects.filter(user=self.request.user) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -125,7 +125,7 @@ | |
|
||
USE_I18N = True | ||
|
||
USE_TZ = False | ||
USE_TZ = True | ||
|
||
|
||
# Static files (CSS, JavaScript, Images) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,9 @@ | ||
from django.contrib import admin | ||
from django.urls import path, include | ||
from django.urls import include, path | ||
|
||
urlpatterns = [ | ||
path("admin/", admin.site.urls), | ||
path("api/cinema/", include("cinema.urls", namespace="cinema")), | ||
path("__debug__/", include("debug_toolbar.urls")), | ||
path("api/user/", include("user.urls", namespace="user")), | ||
] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,23 @@ | ||
# write your code here | ||
from django.contrib.auth import get_user_model | ||
from rest_framework import serializers | ||
|
||
|
||
class UserSerializer(serializers.ModelSerializer): | ||
class Meta: | ||
model = get_user_model() | ||
fields = ("id", "username", "email", "password", "is_staff") | ||
read_only_fields = ("id", "is_staff") | ||
extra_kwargs = {"password": {"write_only": True, "min_length": 5}} | ||
|
||
def create(self, validated_data): | ||
return get_user_model().objects.create_user(**validated_data) | ||
|
||
def update(self, instance, validated_data): | ||
password = validated_data.pop("password", None) | ||
user = super().update(instance, validated_data) | ||
|
||
if password: | ||
user.set_password(password) | ||
user.save() | ||
|
||
return user |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,12 @@ | ||
# write your code here | ||
from django.urls import path | ||
|
||
from user.views import CreateUserView, LoginUserView, ManageUserView | ||
|
||
urlpatterns = [ | ||
path("register/", CreateUserView.as_view(), name="create"), | ||
path("login/", LoginUserView.as_view(), name="login"), | ||
path("me/", ManageUserView.as_view(), name="manage") | ||
|
||
] | ||
|
||
app_name = "user" |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,24 @@ | ||
# write your code here | ||
from rest_framework import generics | ||
from rest_framework.authentication import TokenAuthentication | ||
from rest_framework.authtoken.views import ObtainAuthToken | ||
from rest_framework.permissions import IsAuthenticated | ||
from rest_framework.settings import api_settings | ||
|
||
from user.serializers import UserSerializer | ||
|
||
|
||
class CreateUserView(generics.CreateAPIView): | ||
serializer_class = UserSerializer | ||
|
||
|
||
class LoginUserView(ObtainAuthToken): | ||
renderer_classes = api_settings.DEFAULT_RENDERER_CLASSES | ||
|
||
|
||
class ManageUserView(generics.RetrieveUpdateDestroyAPIView): | ||
serializer_class = UserSerializer | ||
authentication_classes = (TokenAuthentication,) | ||
permission_classes = (IsAuthenticated,) | ||
|
||
def get_object(self): | ||
return self.request.user |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fix formatting here