-
Notifications
You must be signed in to change notification settings - Fork 728
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
Develop #769
Open
frezworx
wants to merge
10
commits into
mate-academy:master
Choose a base branch
from
frezworx:develop
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Develop #769
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
bf5030d
Update .gitignore to fix and extend ignored entries
frezworx 1ad824b
Add new models: Actor, Genre, CinemaHall, and MovieHall
frezworx 2185488
Add serializers and update models for actors and genres
frezworx e262c33
Add serializers for Actor, Genre, and CinemaHall models
frezworx 64e8032
Add models for Actor, Genre, and CinemaHall, and relations to Movie
frezworx f78505d
Refactor movie views to preparation for class-based views.
frezworx a2ecf69
Add viewsets and routers for movies and cinema halls
frezworx 4923b60
Add viewsets and routers for movies and cinema halls
frezworx 02041dc
Refactor Genre and Actor views, update URL patterns.
frezworx f9d9e61
Add PUT, PATCH, and DELETE methods to GenreDetail view
frezworx File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,10 @@ | ||
.idea/ | ||
.vscode/ | ||
*.iml | ||
.env | ||
.envпше | ||
.DS_Store | ||
venv/ | ||
.venv/ | ||
.pytest_cache/ | ||
**__pycache__/ | ||
*.pyc | ||
|
71 changes: 71 additions & 0 deletions
71
cinema/migrations/0002_actor_cinemahall_genre_movie_actors_movie_genres.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
# Generated by Django 4.1 on 2024-12-19 15:54 | ||
|
||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
("cinema", "0001_initial"), | ||
] | ||
|
||
operations = [ | ||
migrations.CreateModel( | ||
name="Actor", | ||
fields=[ | ||
( | ||
"id", | ||
models.BigAutoField( | ||
auto_created=True, | ||
primary_key=True, | ||
serialize=False, | ||
verbose_name="ID", | ||
), | ||
), | ||
("first_name", models.CharField(max_length=63)), | ||
("last_name", models.CharField(max_length=63)), | ||
], | ||
), | ||
migrations.CreateModel( | ||
name="CinemaHall", | ||
fields=[ | ||
( | ||
"id", | ||
models.BigAutoField( | ||
auto_created=True, | ||
primary_key=True, | ||
serialize=False, | ||
verbose_name="ID", | ||
), | ||
), | ||
("name", models.CharField(max_length=63)), | ||
("rows", models.IntegerField()), | ||
("seats_in_row", models.IntegerField()), | ||
], | ||
), | ||
migrations.CreateModel( | ||
name="Genre", | ||
fields=[ | ||
( | ||
"id", | ||
models.BigAutoField( | ||
auto_created=True, | ||
primary_key=True, | ||
serialize=False, | ||
verbose_name="ID", | ||
), | ||
), | ||
("name", models.CharField(max_length=63, unique=True)), | ||
], | ||
), | ||
migrations.AddField( | ||
model_name="movie", | ||
name="actors", | ||
field=models.ManyToManyField(related_name="movies", to="cinema.actor"), | ||
), | ||
migrations.AddField( | ||
model_name="movie", | ||
name="genres", | ||
field=models.ManyToManyField(related_name="movies", to="cinema.genre"), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,24 @@ | ||
from django.urls import path | ||
from django.urls import path, include | ||
from rest_framework.routers import DefaultRouter | ||
|
||
from cinema.views import movie_list, movie_detail | ||
from cinema.views import ( | ||
GenreList, | ||
CinemaHallViewSet, | ||
MovieViewSet, | ||
ActorList, ActorDetail, GenreDetail, | ||
# ActorDetail, | ||
) | ||
|
||
router = DefaultRouter() | ||
router.register("cinema_halls", CinemaHallViewSet, basename="cinema_hall") | ||
router.register("movies", MovieViewSet, basename="movie") | ||
|
||
urlpatterns = [ | ||
path("movies/", movie_list, name="movie-list"), | ||
path("movies/<int:pk>/", movie_detail, name="movie-detail"), | ||
path("genres/", GenreList.as_view(), name="genre-list"), | ||
path("genres/<int:pk>/", GenreDetail.as_view(), name="genre-detail"), | ||
path("actors/", ActorList.as_view(), name="actor-list"), | ||
path("actors/<int:pk>/", ActorDetail.as_view(), name="actor-detail"), | ||
path("", include(router.urls)), | ||
] | ||
|
||
app_name = "cinema" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,45 +1,105 @@ | ||
from rest_framework.decorators import api_view | ||
from django.http import Http404 | ||
from rest_framework.mixins import ( | ||
ListModelMixin, | ||
CreateModelMixin, | ||
RetrieveModelMixin, | ||
UpdateModelMixin, | ||
DestroyModelMixin, | ||
) | ||
from rest_framework.views import APIView | ||
from rest_framework.generics import GenericAPIView, RetrieveAPIView, \ | ||
UpdateAPIView, CreateAPIView, DestroyAPIView | ||
from rest_framework.response import Response | ||
from rest_framework import status | ||
from rest_framework.viewsets import GenericViewSet, ModelViewSet | ||
|
||
from django.shortcuts import get_object_or_404 | ||
from cinema.models import Genre, Movie, CinemaHall, Actor | ||
from cinema.serializers import ( | ||
GenreSerializer, | ||
MovieSerializer, | ||
CinemaHallSerializer, | ||
ActorSerializer, | ||
) | ||
|
||
from cinema.models import Movie | ||
from cinema.serializers import MovieSerializer | ||
|
||
class GenreList(APIView): | ||
def get(self, request): | ||
genres = Genre.objects.all() | ||
serializer = GenreSerializer(genres, many=True) | ||
return Response(serializer.data) | ||
|
||
@api_view(["GET", "POST"]) | ||
def movie_list(request): | ||
if request.method == "GET": | ||
movies = Movie.objects.all() | ||
serializer = MovieSerializer(movies, many=True) | ||
return Response(serializer.data, status=status.HTTP_200_OK) | ||
|
||
if request.method == "POST": | ||
serializer = MovieSerializer(data=request.data) | ||
def post(self, request): | ||
serializer = GenreSerializer(data=request.data) | ||
if serializer.is_valid(): | ||
serializer.save() | ||
return Response(serializer.data, status=status.HTTP_201_CREATED) | ||
|
||
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) | ||
|
||
|
||
@api_view(["GET", "PUT", "DELETE"]) | ||
def movie_detail(request, pk): | ||
movie = get_object_or_404(Movie, pk=pk) | ||
class GenreDetail(APIView): | ||
def get_object(self, pk): | ||
try: | ||
return Genre.objects.get(pk=pk) | ||
except Genre.DoesNotExist: | ||
raise Http404 | ||
|
||
if request.method == "GET": | ||
serializer = MovieSerializer(movie) | ||
return Response(serializer.data, status=status.HTTP_200_OK) | ||
def get(self, request, pk): | ||
genre = self.get_object(pk) | ||
serializer = GenreSerializer(genre) | ||
return Response(serializer.data) | ||
|
||
if request.method == "PUT": | ||
serializer = MovieSerializer(movie, data=request.data) | ||
if serializer.is_valid(): | ||
serializer.save() | ||
return Response(serializer.data, status=status.HTTP_200_OK) | ||
|
||
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) | ||
class ActorDetail( | ||
CreateAPIView, | ||
DestroyAPIView, | ||
UpdateAPIView, | ||
RetrieveAPIView, | ||
): | ||
queryset = Actor.objects.all() | ||
serializer_class = ActorSerializer | ||
|
||
|
||
class ActorList( | ||
GenericAPIView, | ||
ListModelMixin, | ||
CreateModelMixin, | ||
RetrieveModelMixin, | ||
UpdateModelMixin, | ||
DestroyModelMixin | ||
): | ||
queryset = Actor.objects.all() | ||
serializer_class = ActorSerializer | ||
|
||
def get(self, request, *args, **kwargs): | ||
if "pk" in kwargs: | ||
return self.retrieve(request, *args, **kwargs) | ||
return self.list(request, *args, **kwargs) | ||
|
||
def post(self, request, *args, **kwargs): | ||
return self.create(request, *args, **kwargs) | ||
|
||
def put(self, request, *args, **kwargs): | ||
return self.update(request, *args, **kwargs) | ||
|
||
def patch(self, request, *args, **kwargs): | ||
return self.partial_update(request, *args, **kwargs) | ||
|
||
def delete(self, request, *args, **kwargs): | ||
return self.destroy(request, *args, **kwargs) | ||
|
||
|
||
class CinemaHallViewSet( | ||
GenericViewSet, | ||
ListModelMixin, | ||
CreateModelMixin, | ||
RetrieveModelMixin, | ||
UpdateModelMixin, | ||
DestroyModelMixin | ||
): | ||
queryset = CinemaHall.objects.all() | ||
serializer_class = CinemaHallSerializer | ||
|
||
|
||
if request.method == "DELETE": | ||
movie.delete() | ||
return Response(status=status.HTTP_204_NO_CONTENT) | ||
class MovieViewSet(ModelViewSet): | ||
queryset = Movie.objects.all() | ||
serializer_class = MovieSerializer |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
There seems to be a typo in the
.envпше
entry. It should likely be.env
to correctly ignore environment variable files.