From b17b504d00791e07e5a7a16ec881a3b30e89bf9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BE=D0=BD=D1=8F=20C=D0=B0=D0=B2=D0=BA=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0?= Date: Mon, 9 Dec 2024 22:26:01 +0200 Subject: [PATCH 1/4] solution --- .gitignore | 4 + app/__init__.py | 0 app/asgi.py | 16 ++++ app/settings.py | 125 ++++++++++++++++++++++++++++++ app/urls.py | 23 ++++++ app/wsgi.py | 16 ++++ cinema/__init__.py | 0 cinema/admin.py | 5 ++ cinema/apps.py | 6 ++ cinema/migrations/0001_initial.py | 23 ++++++ cinema/migrations/__init__.py | 0 cinema/models.py | 15 ++++ cinema/serializers.py | 20 +++++ cinema/tests.py | 3 + cinema/urls.py | 7 ++ cinema/views.py | 39 ++++++++++ manage.py | 22 ++++++ requirements.txt | 8 ++ 18 files changed, 332 insertions(+) create mode 100644 .gitignore create mode 100644 app/__init__.py create mode 100644 app/asgi.py create mode 100644 app/settings.py create mode 100644 app/urls.py create mode 100644 app/wsgi.py 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/serializers.py create mode 100644 cinema/tests.py create mode 100644 cinema/urls.py create mode 100644 cinema/views.py create mode 100644 manage.py create mode 100644 requirements.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..63bccbbe7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.idea +.venv +db.sqlite3 +__pycache__ \ No newline at end of file diff --git a/app/__init__.py b/app/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/app/asgi.py b/app/asgi.py new file mode 100644 index 000000000..110511e16 --- /dev/null +++ b/app/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for app 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', 'app.settings') + +application = get_asgi_application() diff --git a/app/settings.py b/app/settings.py new file mode 100644 index 000000000..bb5d7fb43 --- /dev/null +++ b/app/settings.py @@ -0,0 +1,125 @@ +""" +Django settings for app project. + +Generated by 'django-admin startproject' using Django 5.1.3. + +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-$7ve8et22l#rxwtc2_-%^xj3__in%%umn_+rz21d+g@_2ixmk(' + +# 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 = 'app.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 = 'app.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/app/urls.py b/app/urls.py new file mode 100644 index 000000000..0cfa950cd --- /dev/null +++ b/app/urls.py @@ -0,0 +1,23 @@ +""" +URL configuration for app 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 + +urlpatterns = [ + path('admin/', admin.site.urls), + path('api/cinema/', include('cinema.urls')) +] diff --git a/app/wsgi.py b/app/wsgi.py new file mode 100644 index 000000000..75c1fd7cb --- /dev/null +++ b/app/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for app 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', 'app.settings') + +application = get_wsgi_application() 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..37790dbfe --- /dev/null +++ b/cinema/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin +from .models import Movie + +# Register your models here. +admin.site.register(Movie) diff --git a/cinema/apps.py b/cinema/apps.py new file mode 100644 index 000000000..e48e69086 --- /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..73c76a2b5 --- /dev/null +++ b/cinema/migrations/0001_initial.py @@ -0,0 +1,23 @@ +# Generated by Django 5.1.4 on 2024-12-09 19:03 + +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=100, unique=True)), + ('description', models.TextField(blank=True)), + ('duration', models.PositiveIntegerField(help_text='Duration in minutes')), + ], + ), + ] 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..677191082 --- /dev/null +++ b/cinema/models.py @@ -0,0 +1,15 @@ +from django.db import models + + +class Movie(models.Model): + title = models.CharField(max_length=100, unique=True) + description = models.TextField(blank=True) + duration = models.PositiveIntegerField(help_text="Duration in minutes") + + def __str__(self): + return self.title + + def formatted_duration(self): + hours = self.duration // 60 + minutes = self.duration % 60 + return f"{hours}h {minutes}m" diff --git a/cinema/serializers.py b/cinema/serializers.py new file mode 100644 index 000000000..94bf138ae --- /dev/null +++ b/cinema/serializers.py @@ -0,0 +1,20 @@ +from rest_framework import serializers +from .models import Movie + + +class MovieSerializer(serializers.ModelSerializer): + class Meta: + model = Movie + fields = ['id', 'title', 'description', 'duration'] + + 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 diff --git a/cinema/tests.py b/cinema/tests.py new file mode 100644 index 000000000..de8bdc00e --- /dev/null +++ b/cinema/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/cinema/urls.py b/cinema/urls.py new file mode 100644 index 000000000..fd617e968 --- /dev/null +++ b/cinema/urls.py @@ -0,0 +1,7 @@ +from django.urls import path +from .views import MovieListView, MovieDetailView + +urlpatterns = [ + path('movies/', MovieListView.as_view(), name='movie-list'), + path('movies//', MovieDetailView.as_view(), name='movie-detail'), +] diff --git a/cinema/views.py b/cinema/views.py new file mode 100644 index 000000000..e361dc592 --- /dev/null +++ b/cinema/views.py @@ -0,0 +1,39 @@ +from rest_framework.decorators import api_view +from rest_framework.response import Response +from rest_framework import status +from django.shortcuts import get_object_or_404 + +from cinema.models import Movie +from cinema.serializers 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) + + serializer = MovieSerializer(data=request.data) + serializer.is_valid(raise_exception=True) + serializer.save() + return Response(serializer.data, status=status.HTTP_201_CREATED) + + +@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) + + if request.method == "PUT": + serializer = MovieSerializer(movie, data=request.data) + serializer.is_valid(raise_exception=True) + serializer.save() + return Response(serializer.data, status=status.HTTP_200_OK) + + if request.method == "DELETE": + movie.delete() + return Response(status=status.HTTP_204_NO_CONTENT) diff --git a/manage.py b/manage.py new file mode 100644 index 000000000..4b548a91b --- /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', 'app.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/requirements.txt b/requirements.txt new file mode 100644 index 000000000..eaf963998 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,8 @@ +asgiref==3.8.1 +Django==5.1.4 +djangorestframework==3.15.2 +mccabe==0.7.0 +pycodestyle==2.12.1 +pyflakes==3.2.0 +sqlparse==0.5.2 +tzdata==2024.2 From e3e3e0195615abd3e716a0c8c08460960fec91ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BE=D0=BD=D1=8F=20C=D0=B0=D0=B2=D0=BA=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0?= Date: Mon, 9 Dec 2024 22:32:29 +0200 Subject: [PATCH 2/4] Load cinema fixture data --- cinema/urls.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cinema/urls.py b/cinema/urls.py index fd617e968..89cfba2b4 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,7 +1,7 @@ from django.urls import path -from .views import MovieListView, MovieDetailView +from .views import movie_list, movie_detail urlpatterns = [ - path('movies/', MovieListView.as_view(), name='movie-list'), - path('movies//', MovieDetailView.as_view(), name='movie-detail'), + path('movies/', movie_list, name='movie-list'), + path('movies//', movie_detail, name='movie-detail'), ] From 41552e5cafabeedd7dc9ae3bf9ee8124b332baa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BE=D0=BD=D1=8F=20C=D0=B0=D0=B2=D0=BA=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0?= Date: Tue, 10 Dec 2024 18:30:06 +0200 Subject: [PATCH 3/4] changes according to comments --- .gitignore | 3 ++- app/settings.py | 7 +++++-- requirements.txt | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 63bccbbe7..5085236bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea .venv db.sqlite3 -__pycache__ \ No newline at end of file +__pycache__ +.env \ No newline at end of file diff --git a/app/settings.py b/app/settings.py index bb5d7fb43..53d80f03a 100644 --- a/app/settings.py +++ b/app/settings.py @@ -9,7 +9,8 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/5.1/ref/settings/ """ - +import os +from dotenv import load_dotenv from pathlib import Path # Build paths inside the project like this: BASE_DIR / 'subdir'. @@ -20,7 +21,9 @@ # 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-$7ve8et22l#rxwtc2_-%^xj3__in%%umn_+rz21d+g@_2ixmk(' +load_dotenv(dotenv_path=BASE_DIR / '.env') + +SECRET_KEY = os.environ.get('SECRET_KEY') # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True diff --git a/requirements.txt b/requirements.txt index eaf963998..c42f82cf3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,3 +6,4 @@ pycodestyle==2.12.1 pyflakes==3.2.0 sqlparse==0.5.2 tzdata==2024.2 +python-dotenv==1.0.1 \ No newline at end of file From 616fc3dbd9e1af1579ecc58b023844549e23561e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BE=D0=BD=D1=8F=20C=D0=B0=D0=B2=D0=BA=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0?= Date: Tue, 10 Dec 2024 18:31:39 +0200 Subject: [PATCH 4/4] changes in settins.py allowed_hosts and debug --- app/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/settings.py b/app/settings.py index 53d80f03a..1934c448b 100644 --- a/app/settings.py +++ b/app/settings.py @@ -26,9 +26,9 @@ SECRET_KEY = os.environ.get('SECRET_KEY') # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +DEBUG = False -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ['localhost', '127.0.0.1'] # Application definition