Skip to content

Commit

Permalink
test_solution
Browse files Browse the repository at this point in the history
  • Loading branch information
xtsvi committed Nov 16, 2024
1 parent 93c12eb commit 47ab7f6
Show file tree
Hide file tree
Showing 10 changed files with 131 additions and 17 deletions.
3 changes: 2 additions & 1 deletion cinema/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ class Migration(migrations.Migration):
(
"movie",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE, to="cinema.movie"
on_delete=django.db.models.deletion.CASCADE,
to="cinema.movie",
),
),
],
Expand Down
6 changes: 4 additions & 2 deletions cinema/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,10 @@ def save(
)

def __str__(self):
return (f"{str(self.movie_session)} "
f"(row: {self.row}, seat: {self.seat})")
return (
f"{str(self.movie_session)} "
f"(row: {self.row}, seat: {self.seat})"
)

class Meta:
unique_together = ("movie_session", "row", "seat")
Expand Down
15 changes: 15 additions & 0 deletions cinema/permissions.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from rest_framework.permissions import BasePermission, SAFE_METHODS


class IsAdminAllORIsAuthenticatedOrReadOnly(BasePermission):
"""
The request is authenticated as an admin - read/write,
if as user - a read-only.
"""

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)
6 changes: 0 additions & 6 deletions cinema/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,6 @@ class Meta:


class TicketSerializer(serializers.ModelSerializer):
def validate(self, attrs):
data = super(TicketSerializer, self).validate(attrs=attrs)
Ticket.validate_ticket(
attrs["row"], attrs["seat"], attrs["movie_session"]
)
return data

class Meta:
model = Ticket
Expand Down
33 changes: 29 additions & 4 deletions cinema/views.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
from datetime import datetime

from django.db import transaction
from django.db.models import F, Count
from rest_framework import viewsets
from rest_framework.authentication import TokenAuthentication
from rest_framework.pagination import PageNumberPagination

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

from rest_framework.permissions import IsAuthenticated

from cinema.models import (
Genre,
Actor,
CinemaHall,
Movie,
MovieSession,
Order,
Ticket,
)
from cinema.permissions import IsAdminAllORIsAuthenticatedOrReadOnly
from cinema.serializers import (
GenreSerializer,
ActorSerializer,
Expand All @@ -24,21 +35,29 @@
class GenreViewSet(viewsets.ModelViewSet):
queryset = Genre.objects.all()
serializer_class = GenreSerializer
authentication_classes = (TokenAuthentication,)
permission_classes = (IsAdminAllORIsAuthenticatedOrReadOnly,)


class ActorViewSet(viewsets.ModelViewSet):
queryset = Actor.objects.all()
serializer_class = ActorSerializer
authentication_classes = (TokenAuthentication,)
permission_classes = (IsAdminAllORIsAuthenticatedOrReadOnly,)


class CinemaHallViewSet(viewsets.ModelViewSet):
queryset = CinemaHall.objects.all()
serializer_class = CinemaHallSerializer
authentication_classes = (TokenAuthentication,)
permission_classes = (IsAdminAllORIsAuthenticatedOrReadOnly,)


class MovieViewSet(viewsets.ModelViewSet):
queryset = Movie.objects.prefetch_related("genres", "actors")
serializer_class = MovieSerializer
authentication_classes = (TokenAuthentication,)
permission_classes = (IsAdminAllORIsAuthenticatedOrReadOnly,)

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

def get_queryset(self):
date = self.request.query_params.get("date")
Expand Down Expand Up @@ -124,14 +145,18 @@ class OrderViewSet(viewsets.ModelViewSet):
)
serializer_class = OrderSerializer
pagination_class = OrderPagination
authentication_classes = (TokenAuthentication,)
permission_classes = (IsAuthenticated,)
lookup_field = "id"

def get_queryset(self):
return Order.objects.filter(user=self.request.user)

def get_serializer_class(self):
if self.action == "list":
return OrderListSerializer

elif self.action == "retrieve":
return OrderSerializer
return OrderSerializer

def perform_create(self, serializer):
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 @@ -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")),
path("__debug__/", include("debug_toolbar.urls")),
]
39 changes: 38 additions & 1 deletion user/serializers.py
Original file line number Diff line number Diff line change
@@ -1 +1,38 @@
# 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):
"""
create user with encrypted password
"""
return get_user_model().objects.create_user(**validated_data)

def update(self, instance, validated_data):
"""
Update User with encrypted password
"""
password = validated_data.pop("password", None)
user = super().update(instance, validated_data)
if password:
user.set_password(password)
user.save()
return user
13 changes: 12 additions & 1 deletion user/urls.py
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

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")

]
30 changes: 29 additions & 1 deletion user/views.py
Original file line number Diff line number Diff line change
@@ -1 +1,29 @@
# 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):
"""
Retrieve and return the authenticated user.
"""
return self.request.user

0 comments on commit 47ab7f6

Please sign in to comment.