From 7a45ff3c012abe0f85c5d602260918890294e8b4 Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Sun, 8 Dec 2024 19:38:01 +0200 Subject: [PATCH 1/3] solution --- cinema/serializes.py | 24 ++++++++++++++++++++++++ cinema/urls.py | 8 ++++++++ 2 files changed, 32 insertions(+) create mode 100644 cinema/serializes.py create mode 100644 cinema/urls.py diff --git a/cinema/serializes.py b/cinema/serializes.py new file mode 100644 index 000000000..a03580d1b --- /dev/null +++ b/cinema/serializes.py @@ -0,0 +1,24 @@ +from rest_framework import serializers + +from cinema.models import Movie + + +class MovieSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + title = serializers.CharField(required=True) + description = serializers.CharField(required=True) + duration = serializers.IntegerField(required=True) + def create(self, validated_data): + return Movie.objects.create(**validated_data) + def update(self, instance, validated_data): + instance.title = validated_data.get("title", instance.title) + instance.description = validated_data.get( + "description", + instance.description + ) + instance.duration = validated_data.get( + "duration", + instance.duration + ) + instance.save() + return instance \ No newline at end of file diff --git a/cinema/urls.py b/cinema/urls.py new file mode 100644 index 000000000..5e1dc3ef8 --- /dev/null +++ b/cinema/urls.py @@ -0,0 +1,8 @@ +from django.urls import path +from cinema.views import movie_list, movie_detail + +urlpatterns = [ + path("movies/", movie_list, name="movie-list"), + path("movies//", movie_detail, name="movie-detail"), +] +app_name = "cinema" From 78c211ae9547b0fe16b071e28855a1e5300d23c5 Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Sun, 8 Dec 2024 19:59:35 +0200 Subject: [PATCH 2/3] add files to commit --- .gitignore | 9 +++ cinema/__init__.py | 0 cinema/admin.py | 5 ++ cinema/apps.py | 6 ++ cinema/migrations/0001_initial.py | 30 +++++++ cinema/migrations/__init__.py | 0 cinema/models.py | 10 +++ cinema/tests.py | 3 + cinema/views.py | 43 ++++++++++ manage.py | 22 ++++++ movie/__init__.py | 0 movie/asgi.py | 16 ++++ movie/settings.py | 125 ++++++++++++++++++++++++++++++ movie/urls.py | 23 ++++++ movie/wsgi.py | 16 ++++ requirement.txt | 6 ++ 16 files changed, 314 insertions(+) create mode 100644 .gitignore create mode 100644 cinema/__init__.py create mode 100644 cinema/admin.py create mode 100644 cinema/apps.py create mode 100644 cinema/migrations/0001_initial.py create mode 100644 cinema/migrations/__init__.py create mode 100644 cinema/models.py create mode 100644 cinema/tests.py create mode 100644 cinema/views.py create mode 100644 manage.py create mode 100644 movie/__init__.py create mode 100644 movie/asgi.py create mode 100644 movie/settings.py create mode 100644 movie/urls.py create mode 100644 movie/wsgi.py create mode 100644 requirement.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..804cd0a23 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +.idea/ +.vscode/ +*.iml +.env +.DS_Store +venv/ +.pytest_cache/ +**__pycache__/ +db.sqlite3 \ No newline at end of file diff --git a/cinema/__init__.py b/cinema/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/cinema/admin.py b/cinema/admin.py new file mode 100644 index 000000000..534ff8ba8 --- /dev/null +++ b/cinema/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin +from cinema.models import Movie + + +admin.site.register(Movie) diff --git a/cinema/apps.py b/cinema/apps.py new file mode 100644 index 000000000..c730aa2b0 --- /dev/null +++ b/cinema/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class CinemaConfig(AppConfig): + default_auto_field = "django.db.models.BigAutoField" + name = "cinema" diff --git a/cinema/migrations/0001_initial.py b/cinema/migrations/0001_initial.py new file mode 100644 index 000000000..6106e086b --- /dev/null +++ b/cinema/migrations/0001_initial.py @@ -0,0 +1,30 @@ +# Generated by Django 5.1.4 on 2024-12-08 17:35 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [] + + operations = [ + migrations.CreateModel( + name="Movie", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("title", models.CharField(max_length=255)), + ("description", models.CharField(max_length=255)), + ("duration", models.IntegerField()), + ], + ), + ] diff --git a/cinema/migrations/__init__.py b/cinema/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/cinema/models.py b/cinema/models.py new file mode 100644 index 000000000..d540c15a7 --- /dev/null +++ b/cinema/models.py @@ -0,0 +1,10 @@ +from django.db import models + + +class Movie(models.Model): + title = models.CharField(max_length=255) + description = models.CharField(max_length=255) + duration = models.IntegerField() + + def __str__(self): + return self.title diff --git a/cinema/tests.py b/cinema/tests.py new file mode 100644 index 000000000..7ce503c2d --- /dev/null +++ b/cinema/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/cinema/views.py b/cinema/views.py new file mode 100644 index 000000000..1dcd983ee --- /dev/null +++ b/cinema/views.py @@ -0,0 +1,43 @@ +from django.shortcuts import get_object_or_404 +from rest_framework import status +from rest_framework.decorators import api_view +from rest_framework.response import Response +from cinema.models import Movie +from cinema.serializes import MovieSerializer + + +@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) + else: + serializer = MovieSerializer(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) + if request.method == "GET": + serializer = MovieSerializer(movie) + return Response(serializer.data, status=status.HTTP_200_OK) + elif 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 + ) + else: + movie.delete() + return Response(status=status.HTTP_204_NO_CONTENT) diff --git a/manage.py b/manage.py new file mode 100644 index 000000000..75ffe5d53 --- /dev/null +++ b/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + """Run administrative tasks.""" + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "movie.settings") + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == "__main__": + main() diff --git a/movie/__init__.py b/movie/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/movie/asgi.py b/movie/asgi.py new file mode 100644 index 000000000..be35e1053 --- /dev/null +++ b/movie/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for movie project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/5.1/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "movie.settings") + +application = get_asgi_application() diff --git a/movie/settings.py b/movie/settings.py new file mode 100644 index 000000000..9083d7877 --- /dev/null +++ b/movie/settings.py @@ -0,0 +1,125 @@ +""" +Django settings for movie project. + +Generated by 'django-admin startproject' using Django 5.1.4. + +For more information on this file, see +https://docs.djangoproject.com/en/5.1/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/5.1/ref/settings/ +""" + +from pathlib import Path + +# Build paths inside the project like this: BASE_DIR / 'subdir'. +BASE_DIR = Path(__file__).resolve().parent.parent + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/5.1/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = "django-insecure-&f-j$^3q#%i5&p)g2@l-6m@zvdsopz26!rm#!r($oyddvicp6!" + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + "django.contrib.admin", + "django.contrib.auth", + "django.contrib.contenttypes", + "django.contrib.sessions", + "django.contrib.messages", + "django.contrib.staticfiles", + "cinema", + "rest_framework", +] + +MIDDLEWARE = [ + "django.middleware.security.SecurityMiddleware", + "django.contrib.sessions.middleware.SessionMiddleware", + "django.middleware.common.CommonMiddleware", + "django.middleware.csrf.CsrfViewMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "django.contrib.messages.middleware.MessageMiddleware", + "django.middleware.clickjacking.XFrameOptionsMiddleware", +] + +ROOT_URLCONF = "movie.urls" + +TEMPLATES = [ + { + "BACKEND": "django.template.backends.django.DjangoTemplates", + "DIRS": [], + "APP_DIRS": True, + "OPTIONS": { + "context_processors": [ + "django.template.context_processors.debug", + "django.template.context_processors.request", + "django.contrib.auth.context_processors.auth", + "django.contrib.messages.context_processors.messages", + ], + }, + }, +] + +WSGI_APPLICATION = "movie.wsgi.application" + + +# Database +# https://docs.djangoproject.com/en/5.1/ref/settings/#databases + +DATABASES = { + "default": { + "ENGINE": "django.db.backends.sqlite3", + "NAME": BASE_DIR / "db.sqlite3", + } +} + + +# Password validation +# https://docs.djangoproject.com/en/5.1/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator", + }, + { + "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator", + }, + { + "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator", + }, + { + "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator", + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/5.1/topics/i18n/ + +LANGUAGE_CODE = "en-us" + +TIME_ZONE = "UTC" + +USE_I18N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/5.1/howto/static-files/ + +STATIC_URL = "static/" + +# Default primary key field type +# https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field + +DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" diff --git a/movie/urls.py b/movie/urls.py new file mode 100644 index 000000000..e5985ddbf --- /dev/null +++ b/movie/urls.py @@ -0,0 +1,23 @@ +""" +URL configuration for movie project. + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/5.1/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" +from django.contrib import admin +from django.urls import path, include # Правильний імпорт include + +urlpatterns = [ + path("admin/", admin.site.urls), + path("api/cinema/", include("cinema.urls", namespace="cinema")), +] diff --git a/movie/wsgi.py b/movie/wsgi.py new file mode 100644 index 000000000..e2673c0ac --- /dev/null +++ b/movie/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for movie project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/5.1/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "movie.settings") + +application = get_wsgi_application() diff --git a/requirement.txt b/requirement.txt new file mode 100644 index 000000000..041d24142 --- /dev/null +++ b/requirement.txt @@ -0,0 +1,6 @@ +asgiref==3.7.2 +Django==5.0.3 +django-rest-framework==0.1.0 +djangorestframework==3.14.0 +pytz==2024.1 +sqlparse==0.4.4 \ No newline at end of file From 9d28c8700a19cf188b286081670b6da9afb971ab Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Sun, 8 Dec 2024 20:12:48 +0200 Subject: [PATCH 3/3] fixed ai comments --- cinema/serializes.py | 24 ++++-------------------- cinema/urls.py | 14 +++++++++++--- cinema/views.py | 44 +++++++------------------------------------- movie/settings.py | 2 +- movie/urls.py | 9 +++++++-- 5 files changed, 30 insertions(+), 63 deletions(-) diff --git a/cinema/serializes.py b/cinema/serializes.py index a03580d1b..88baf9be7 100644 --- a/cinema/serializes.py +++ b/cinema/serializes.py @@ -1,24 +1,8 @@ from rest_framework import serializers - from cinema.models import Movie -class MovieSerializer(serializers.Serializer): - id = serializers.IntegerField(read_only=True) - title = serializers.CharField(required=True) - description = serializers.CharField(required=True) - duration = serializers.IntegerField(required=True) - def create(self, validated_data): - return Movie.objects.create(**validated_data) - def update(self, instance, validated_data): - instance.title = validated_data.get("title", instance.title) - instance.description = validated_data.get( - "description", - instance.description - ) - instance.duration = validated_data.get( - "duration", - instance.duration - ) - instance.save() - return instance \ No newline at end of file +class MovieSerializer(serializers.ModelSerializer): + class Meta: + model = Movie + fields = ["id", "title", "description", "duration"] \ No newline at end of file diff --git a/cinema/urls.py b/cinema/urls.py index 5e1dc3ef8..e24f8ec77 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,8 +1,16 @@ from django.urls import path -from cinema.views import movie_list, movie_detail +from cinema.views import MovieListCreateView, MovieRetrieveUpdateDestroyView urlpatterns = [ - path("movies/", movie_list, name="movie-list"), - path("movies//", movie_detail, name="movie-detail"), + path( + "movies/", + MovieListCreateView.as_view(), + name="movie-list" + ), + path( + "movies//", + MovieRetrieveUpdateDestroyView.as_view(), + name="movie-detail" + ), ] app_name = "cinema" diff --git a/cinema/views.py b/cinema/views.py index 1dcd983ee..5d60790da 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,43 +1,13 @@ -from django.shortcuts import get_object_or_404 -from rest_framework import status -from rest_framework.decorators import api_view -from rest_framework.response import Response +from rest_framework.generics import ListCreateAPIView, RetrieveUpdateDestroyAPIView from cinema.models import Movie from cinema.serializes import MovieSerializer -@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) - else: - serializer = MovieSerializer(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 - ) +class MovieListCreateView(ListCreateAPIView): + queryset = Movie.objects.all() + serializer_class = MovieSerializer -@api_view(["GET", "PUT", "DELETE"]) -def movie_detail(request, pk): - movie = get_object_or_404(Movie, pk=pk) - if request.method == "GET": - serializer = MovieSerializer(movie) - return Response(serializer.data, status=status.HTTP_200_OK) - elif 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 - ) - else: - movie.delete() - return Response(status=status.HTTP_204_NO_CONTENT) +class MovieRetrieveUpdateDestroyView(RetrieveUpdateDestroyAPIView): + queryset = Movie.objects.all() + serializer_class = MovieSerializer diff --git a/movie/settings.py b/movie/settings.py index 9083d7877..12f881d88 100644 --- a/movie/settings.py +++ b/movie/settings.py @@ -23,7 +23,7 @@ SECRET_KEY = "django-insecure-&f-j$^3q#%i5&p)g2@l-6m@zvdsopz26!rm#!r($oyddvicp6!" # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +DEBUG = False ALLOWED_HOSTS = [] diff --git a/movie/urls.py b/movie/urls.py index e5985ddbf..f693fc0b6 100644 --- a/movie/urls.py +++ b/movie/urls.py @@ -15,9 +15,14 @@ 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin -from django.urls import path, include # Правильний імпорт include +from django.urls import path, include urlpatterns = [ path("admin/", admin.site.urls), - path("api/cinema/", include("cinema.urls", namespace="cinema")), + path( + "api/cinema/", + include("cinema.urls", + namespace="cinema" + ) + ), ]