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 #708

Open
wants to merge 2 commits 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/permisions.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
from rest_framework.permissions import BasePermission, SAFE_METHODS

Choose a reason for hiding this comment

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

There is a syntax error in the import statement. The correct syntax should be from rest_framework.permissions import BasePermission, SAFE_METHODS without the slash (/).



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)
)
50 changes: 44 additions & 6 deletions cinema/views.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
from datetime import datetime

from django.db.models import F, Count
from rest_framework import viewsets
from rest_framework import viewsets, mixins
from rest_framework.authentication import TokenAuthentication
from rest_framework.pagination import PageNumberPagination
from rest_framework.permissions import IsAuthenticated
from rest_framework.viewsets import GenericViewSet, ReadOnlyModelViewSet

from cinema.models import Genre, Actor, CinemaHall, Movie, MovieSession, Order

from cinema.permisions import IsAdminOrIfAuthenticatedReadOnly

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


class GenreViewSet(viewsets.ModelViewSet):
class GenreViewSet(
mixins.CreateModelMixin,
mixins.ListModelMixin,
GenericViewSet
):
queryset = Genre.objects.all()
serializer_class = GenreSerializer
permission_classes = (IsAdminOrIfAuthenticatedReadOnly,)
authentication_classes = (TokenAuthentication,)


class ActorViewSet(viewsets.ModelViewSet):
class ActorViewSet(
mixins.CreateModelMixin,
mixins.ListModelMixin,
GenericViewSet
):
queryset = Actor.objects.all()
serializer_class = ActorSerializer
permission_classes = (IsAdminOrIfAuthenticatedReadOnly,)
authentication_classes = (TokenAuthentication,)


class CinemaHallViewSet(viewsets.ModelViewSet):
class CinemaHallViewSet(
mixins.CreateModelMixin,
mixins.ListModelMixin,
GenericViewSet
):
queryset = CinemaHall.objects.all()
serializer_class = CinemaHallSerializer
permission_classes = (IsAdminOrIfAuthenticatedReadOnly,)
authentication_classes = (TokenAuthentication,)


class MovieViewSet(viewsets.ModelViewSet):
class MovieViewSet(
mixins.CreateModelMixin,
mixins.ListModelMixin,
mixins.RetrieveModelMixin,
GenericViewSet
Comment on lines +62 to +66

Choose a reason for hiding this comment

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

The MovieViewSet should use ModelViewSet instead of GenericViewSet to support list, create, and retrieve actions as required by the task description.

):
queryset = Movie.objects.prefetch_related("genres", "actors")
serializer_class = MovieSerializer
permission_classes = (IsAdminOrIfAuthenticatedReadOnly,)
authentication_classes = (TokenAuthentication,)

@staticmethod
def _params_to_ints(qs):
Expand Down Expand Up @@ -87,6 +117,8 @@ class MovieSessionViewSet(viewsets.ModelViewSet):
)
)
serializer_class = MovieSessionSerializer
permission_classes = (IsAdminOrIfAuthenticatedReadOnly,)
authentication_classes = (TokenAuthentication,)

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


class OrderViewSet(viewsets.ModelViewSet):
class OrderViewSet(
mixins.CreateModelMixin,
mixins.ListModelMixin,
GenericViewSet
Comment on lines +153 to +156

Choose a reason for hiding this comment

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

The OrderViewSet should use ModelViewSet instead of GenericViewSet to ensure it supports the required actions (list and create) as per the task description.

):
queryset = Order.objects.prefetch_related(
"tickets__movie_session__movie", "tickets__movie_session__cinema_hall"
)
serializer_class = OrderSerializer
pagination_class = OrderPagination
permission_classes = (IsAuthenticated,)
authentication_classes = (TokenAuthentication,)

def get_queryset(self):
return Order.objects.filter(user=self.request.user)
Expand Down
1 change: 1 addition & 0 deletions cinema_service/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
urlpatterns = [
path("admin/", admin.site.urls),
path("api/cinema/", include("cinema.urls", namespace="cinema")),
path("api/user/", include("user.urls", namespace="user")),

Choose a reason for hiding this comment

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

The namespace argument in the include function should only be used if the included URLconf has an app_name attribute defined. Ensure that cinema.urls and user.urls have app_name set if you intend to use namespaces.

path("__debug__/", include("debug_toolbar.urls")),
]
35 changes: 34 additions & 1 deletion user/serializers.py
Original file line number Diff line number Diff line change
@@ -1 +1,34 @@
# 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
18 changes: 17 additions & 1 deletion user/urls.py
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
# write your code here
from django.urls import path, include

from rest_framework.authtoken import views

from user.views import (
CreateUserView,
LoginUserView,
ManageUserView
)

app_name = "user"

urlpatterns = [
path("register/", CreateUserView.as_view(), name="create"),
path("login/", LoginUserView.as_view(), name="login"),
path("me/", ManageUserView.as_view(), name="manage"),
]
26 changes: 25 additions & 1 deletion user/views.py
Original file line number Diff line number Diff line change
@@ -1 +1,25 @@
# 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.RetrieveUpdateAPIView):
serializer_class = UserSerializer
authentication_classes = (TokenAuthentication,)
permission_classes = (IsAuthenticated,)

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