Skip to content
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 #717

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions cinema/permissions.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
from rest_framework.permissions import BasePermission, SAFE_METHODS
A-n-a-s-t-a-s-i-i-a marked this conversation as resolved.
Show resolved Hide resolved


class IsAdminOrIfAuthenticatedReadOnly(BasePermission):

def has_permission(self, request, view):
if request.user and request.user.is_staff:
return True

if request.user and request.user.is_authenticated:
return request.method in SAFE_METHODS

return False
40 changes: 34 additions & 6 deletions cinema/views.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
from datetime import datetime

from django.db.models import F, Count
from rest_framework import viewsets
from rest_framework import viewsets, status, mixins
from rest_framework.authentication import TokenAuthentication
from rest_framework.pagination import PageNumberPagination
from rest_framework.permissions import IsAuthenticated, IsAdminUser
from rest_framework.response import Response
from rest_framework.viewsets import GenericViewSet

from cinema.models import Genre, Actor, CinemaHall, Movie, MovieSession, Order
from cinema.permissions import IsAdminOrIfAuthenticatedReadOnly
A-n-a-s-t-a-s-i-i-a marked this conversation as resolved.
Show resolved Hide resolved

from cinema.serializers import (
GenreSerializer,
Expand All @@ -21,24 +26,41 @@
)


class GenreViewSet(viewsets.ModelViewSet):
class GenreViewSet(mixins.ListModelMixin,
mixins.CreateModelMixin,
GenericViewSet):
queryset = Genre.objects.all()
serializer_class = GenreSerializer
authentication_classes = (TokenAuthentication,)
permission_classes = [IsAdminOrIfAuthenticatedReadOnly]
A-n-a-s-t-a-s-i-i-a marked this conversation as resolved.
Show resolved Hide resolved


class ActorViewSet(viewsets.ModelViewSet):
class ActorViewSet(mixins.ListModelMixin,
mixins.CreateModelMixin,
GenericViewSet):
queryset = Actor.objects.all()
serializer_class = ActorSerializer
authentication_classes = (TokenAuthentication,)
permission_classes = [IsAdminOrIfAuthenticatedReadOnly]
A-n-a-s-t-a-s-i-i-a marked this conversation as resolved.
Show resolved Hide resolved


class CinemaHallViewSet(viewsets.ModelViewSet):
class CinemaHallViewSet(mixins.ListModelMixin,
mixins.CreateModelMixin,
GenericViewSet):
queryset = CinemaHall.objects.all()
serializer_class = CinemaHallSerializer
authentication_classes = (TokenAuthentication,)
permission_classes = [IsAdminOrIfAuthenticatedReadOnly]
A-n-a-s-t-a-s-i-i-a marked this conversation as resolved.
Show resolved Hide resolved


class MovieViewSet(viewsets.ModelViewSet):
class MovieViewSet(mixins.ListModelMixin,
mixins.CreateModelMixin,
mixins.RetrieveModelMixin,
GenericViewSet):
queryset = Movie.objects.prefetch_related("genres", "actors")
serializer_class = MovieSerializer
authentication_classes = (TokenAuthentication,)
permission_classes = [IsAdminOrIfAuthenticatedReadOnly]

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The MovieViewSet is configured correctly with the necessary authentication and permission classes.


@staticmethod
def _params_to_ints(qs):
Expand Down Expand Up @@ -87,6 +109,8 @@ class MovieSessionViewSet(viewsets.ModelViewSet):
)
)
serializer_class = MovieSessionSerializer
authentication_classes = (TokenAuthentication,)
permission_classes = [IsAdminOrIfAuthenticatedReadOnly]
A-n-a-s-t-a-s-i-i-a marked this conversation as resolved.
Show resolved Hide resolved

def get_queryset(self):
date = self.request.query_params.get("date")
Expand Down Expand Up @@ -118,12 +142,16 @@ class OrderPagination(PageNumberPagination):
max_page_size = 100


class OrderViewSet(viewsets.ModelViewSet):
class OrderViewSet(mixins.ListModelMixin,
mixins.CreateModelMixin,
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]
A-n-a-s-t-a-s-i-i-a marked this conversation as resolved.
Show resolved Hide resolved

def get_queryset(self):
return Order.objects.filter(user=self.request.user)
Expand Down
2 changes: 1 addition & 1 deletion cinema_service/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@

USE_I18N = True

USE_TZ = False
USE_TZ = True


# Static files (CSS, JavaScript, Images)
Expand Down
1 change: 1 addition & 0 deletions cinema_service/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
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")),
A-n-a-s-t-a-s-i-i-a marked this conversation as resolved.
Show resolved Hide resolved
]
31 changes: 30 additions & 1 deletion user/serializers.py
Original file line number Diff line number Diff line change
@@ -1 +1,30 @@
# write your code here
from django.contrib.auth import get_user_model
from rest_framework import serializers

from user.models import User

A-n-a-s-t-a-s-i-i-a marked this conversation as resolved.
Show resolved Hide resolved

class UserSerializer(serializers.ModelSerializer):
class Meta:
model = User
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):
user = get_user_model().objects.create_user(**validated_data)
return user

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
8 changes: 2 additions & 6 deletions user/tests/test_user_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ def test_password_too_short(self):
res = self.client.post(CREATE_USER_URL, payload)

self.assertEqual(res.status_code, status.HTTP_400_BAD_REQUEST)
user_exists = (
get_user_model().objects.filter(email=payload["email"]).exists()
)
user_exists = get_user_model().objects.filter(email=payload["email"]).exists()
self.assertFalse(user_exists)

def test_create_token_for_user(self):
Expand All @@ -79,9 +77,7 @@ def test_create_token_for_user(self):

def test_create_token_invalid_credentials(self):
"""Test that token is not created if invalid credentials are given"""
create_user(
username="user12345", email="[email protected]", password="test123"
)
create_user(username="user12345", email="[email protected]", password="test123")
payload = {
"username": "user12345",
"email": "[email protected]",
Expand Down
12 changes: 11 additions & 1 deletion user/urls.py
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
# 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"
29 changes: 28 additions & 1 deletion user/views.py
Original file line number Diff line number Diff line change
@@ -1 +1,28 @@
# write your code here
from contextvars import Token

A-n-a-s-t-a-s-i-i-a marked this conversation as resolved.
Show resolved Hide resolved
from django.contrib.auth import get_user_model
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):
queryset = get_user_model().objects.all()
serializer_class = UserSerializer


class LoginUserView(ObtainAuthToken):
renderer_classes = api_settings.DEFAULT_RENDERER_CLASSES


class ManageUserView(generics.RetrieveUpdateAPIView):
serializer_class = UserSerializer
authentication_classes = (TokenAuthentication,)
permission_classes = (IsAuthenticated,)

def get_object(self):
return self.request.user
Loading