From 1b9a17c4c9cb8a436e00cd20b43b3a6c771e5bf1 Mon Sep 17 00:00:00 2001 From: Frezworx Date: Wed, 18 Dec 2024 17:10:13 +0200 Subject: [PATCH 1/5] Add .gitignore file with standard exclusions Include common patterns to ignore Python, Django, virtual environment, and IDE-specific files. This prevents committing unnecessary or sensitive files to the repository. --- .gitignore | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..4d7c3dfb4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# Python +*.pyc +__pycache__/ + +# Django +db.sqlite3 +/media/ +/staticfiles/ + +# Virtual Environment +.venv/ +venv/ +*.env + +# PyCharm +.idea/ From 68a25c543b6d3e07fe8fff07e01faeb20e091072 Mon Sep 17 00:00:00 2001 From: Frezworx Date: Wed, 18 Dec 2024 17:18:40 +0200 Subject: [PATCH 2/5] Initialize Django project with core setup and cinema app Set up a new Django project named "movie" with necessary configurations, including settings, URLs, and WSGI/ASGI entry points. Add a "cinema" app with basic models, serializers, and placeholder files for views, tests, and admin. Include a requirements.txt file specifying project dependencies. --- cinema/__init__.py | 0 cinema/admin.py | 3 + cinema/apps.py | 6 ++ cinema/migrations/__init__.py | 0 cinema/models.py | 7 ++ cinema/serializers.py | 1 + cinema/tests.py | 3 + cinema/views.py | 3 + manage.py | 22 ++++++ movie/__init__.py | 0 movie/asgi.py | 16 +++++ movie/settings.py | 123 ++++++++++++++++++++++++++++++++++ movie/urls.py | 23 +++++++ movie/wsgi.py | 16 +++++ requirements.txt | 6 ++ 15 files changed, 229 insertions(+) create mode 100644 cinema/__init__.py create mode 100644 cinema/admin.py create mode 100644 cinema/apps.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/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 requirements.txt 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..8c38f3f3d --- /dev/null +++ b/cinema/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. 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/__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..523dcbfd5 --- /dev/null +++ b/cinema/models.py @@ -0,0 +1,7 @@ +from django.db import models + + +class Movie(models.Model): + title = models.CharField(max_length=100) + description = models.TextField() + duration = models.IntegerField() diff --git a/cinema/serializers.py b/cinema/serializers.py new file mode 100644 index 000000000..8eed08968 --- /dev/null +++ b/cinema/serializers.py @@ -0,0 +1 @@ +from rest \ No newline at end of file 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..91ea44a21 --- /dev/null +++ b/cinema/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. 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..d0da3dbcd --- /dev/null +++ b/movie/settings.py @@ -0,0 +1,123 @@ +""" +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-akq-5q35i!mz-^69j@6ulp2-v_#$*y0a4cb5=*$4crr7si17ca" + +# 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", +] + +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..49b178e46 --- /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 + +urlpatterns = [ + path("admin/", admin.site.urls), +] 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/requirements.txt b/requirements.txt new file mode 100644 index 000000000..06bf6626d --- /dev/null +++ b/requirements.txt @@ -0,0 +1,6 @@ +asgiref==3.8.1 +Django==5.1.4 +django-rest-framework==0.1.0 +djangorestframework==3.15.2 +sqlparse==0.5.3 +tzdata==2024.2 From d386af4140ea94c931167eb127a212eeeace997e Mon Sep 17 00:00:00 2001 From: Frezworx Date: Wed, 18 Dec 2024 17:49:45 +0200 Subject: [PATCH 3/5] Add basic API structure for movies in the cinema app Introduced `MovieSerializer` and updated the `Movie` model to allow optional descriptions. Added `movies_list` and placeholder view functions, along with initial URL configurations for the cinema app. These changes set up the foundational API for handling movie data. --- cinema/models.py | 2 +- cinema/serializers.py | 24 +++++++++++++++++++++++- cinema/urls.py | 9 +++++++++ cinema/views.py | 10 +++++++++- movie/urls.py | 3 ++- 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 cinema/urls.py diff --git a/cinema/models.py b/cinema/models.py index 523dcbfd5..6e2921c8b 100644 --- a/cinema/models.py +++ b/cinema/models.py @@ -3,5 +3,5 @@ class Movie(models.Model): title = models.CharField(max_length=100) - description = models.TextField() + description = models.TextField(null=True, blank=True) duration = models.IntegerField() diff --git a/cinema/serializers.py b/cinema/serializers.py index 8eed08968..685e4d2b8 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -1 +1,23 @@ -from rest \ No newline at end of file +from rest_framework import serializers + +from cinema.models import Movie + + +class MovieSerializer(serializers.Serializer): + id = serializers.IntegerField(read_only=True) + title = serializers.CharField(max_length=100) + description = serializers.CharField(max_length=255) + 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 diff --git a/cinema/urls.py b/cinema/urls.py new file mode 100644 index 000000000..087bc99d1 --- /dev/null +++ b/cinema/urls.py @@ -0,0 +1,9 @@ +from django.urls import path + +from cinema.views import movies_list + +app_name = "cinema" + +urlpatterns = [ + path("movie/", ) + ] diff --git a/cinema/views.py b/cinema/views.py index 91ea44a21..999f7c83c 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,3 +1,11 @@ from django.shortcuts import render -# Create your views here. + +def movies_list(request): + pass + + +def movies_detail(request): + pass + + diff --git a/movie/urls.py b/movie/urls.py index 49b178e46..8ad3769b2 100644 --- a/movie/urls.py +++ b/movie/urls.py @@ -16,8 +16,9 @@ """ from django.contrib import admin -from django.urls import path +from django.urls import path, include urlpatterns = [ path("admin/", admin.site.urls), + path("api/", include("cinema.urls", namespace="cinema")), ] From b09015b6eaeb89c2bd53c1a77ec530e64d77c0e1 Mon Sep 17 00:00:00 2001 From: Frezworx Date: Wed, 18 Dec 2024 19:04:31 +0200 Subject: [PATCH 4/5] Add initial Movie model, DRF integration, and CRUD endpoints This commit creates the initial database migration for the `Movie` model. It integrates Django REST Framework and adds API endpoints for listing, retrieving, creating, updating, and deleting movies. Additionally, it updates project settings and URLs to support these changes. --- cinema/migrations/0001_initial.py | 30 ++++++++++++++++++++++++ cinema/urls.py | 5 ++-- cinema/views.py | 39 ++++++++++++++++++++++++++----- movie/settings.py | 2 ++ movie/urls.py | 2 +- 5 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 cinema/migrations/0001_initial.py diff --git a/cinema/migrations/0001_initial.py b/cinema/migrations/0001_initial.py new file mode 100644 index 000000000..14daf3824 --- /dev/null +++ b/cinema/migrations/0001_initial.py @@ -0,0 +1,30 @@ +# Generated by Django 5.1.4 on 2024-12-18 16:37 + +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)), + ("description", models.TextField(blank=True, null=True)), + ("duration", models.IntegerField()), + ], + ), + ] diff --git a/cinema/urls.py b/cinema/urls.py index 087bc99d1..c9763ae46 100644 --- a/cinema/urls.py +++ b/cinema/urls.py @@ -1,9 +1,10 @@ from django.urls import path -from cinema.views import movies_list +from cinema.views import movies_list, movies_detail app_name = "cinema" urlpatterns = [ - path("movie/", ) + path("movies/", movies_list, name="movies-list"), + path("movies//", movies_detail, name="movies-detail"), ] diff --git a/cinema/views.py b/cinema/views.py index 999f7c83c..6ccae212a 100644 --- a/cinema/views.py +++ b/cinema/views.py @@ -1,11 +1,38 @@ -from django.shortcuts import render +from django.shortcuts import get_object_or_404 +from rest_framework.decorators import api_view +from rest_framework.response import Response +from rest_framework import status - -def movies_list(request): - pass +from cinema.models import Movie +from cinema.serializers import MovieSerializer -def movies_detail(request): - pass +@api_view(["GET", "POST"]) +def movies_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 movies_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/movie/settings.py b/movie/settings.py index d0da3dbcd..fd3f9979d 100644 --- a/movie/settings.py +++ b/movie/settings.py @@ -37,6 +37,8 @@ "django.contrib.sessions", "django.contrib.messages", "django.contrib.staticfiles", + "rest_framework", + "cinema", ] MIDDLEWARE = [ diff --git a/movie/urls.py b/movie/urls.py index 8ad3769b2..d88e8a624 100644 --- a/movie/urls.py +++ b/movie/urls.py @@ -20,5 +20,5 @@ urlpatterns = [ path("admin/", admin.site.urls), - path("api/", include("cinema.urls", namespace="cinema")), + path("api/cinema/", include("cinema.urls", namespace="cinema")), ] From a25f64b06a66cb7b46afdae9442286d1444028bc Mon Sep 17 00:00:00 2001 From: Frezworx Date: Wed, 18 Dec 2024 19:27:11 +0200 Subject: [PATCH 5/5] Use environment variables for settings and update serializer. Replaced hardcoded secret key in settings.py with an environment variable using dotenv for enhanced security. Updated the MovieSerializer to remove the 'max_length' constraint on the description field, allowing for greater flexibility. --- cinema/serializers.py | 2 +- movie/settings.py | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/cinema/serializers.py b/cinema/serializers.py index 685e4d2b8..032c1f1a8 100644 --- a/cinema/serializers.py +++ b/cinema/serializers.py @@ -6,7 +6,7 @@ class MovieSerializer(serializers.Serializer): id = serializers.IntegerField(read_only=True) title = serializers.CharField(max_length=100) - description = serializers.CharField(max_length=255) + description = serializers.CharField() duration = serializers.IntegerField(required=True) def create(self, validated_data): diff --git a/movie/settings.py b/movie/settings.py index fd3f9979d..78a41fc0d 100644 --- a/movie/settings.py +++ b/movie/settings.py @@ -9,25 +9,26 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/5.1/ref/settings/ """ - +import os from pathlib import Path +from dotenv import load_dotenv + # 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-akq-5q35i!mz-^69j@6ulp2-v_#$*y0a4cb5=*$4crr7si17ca" +load_dotenv() +SECRET_KEY = os.getenv("SECRET_KEY") # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True ALLOWED_HOSTS = [] - # Application definition INSTALLED_APPS = [ @@ -71,7 +72,6 @@ WSGI_APPLICATION = "movie.wsgi.application" - # Database # https://docs.djangoproject.com/en/5.1/ref/settings/#databases @@ -82,7 +82,6 @@ } } - # Password validation # https://docs.djangoproject.com/en/5.1/ref/settings/#auth-password-validators @@ -101,7 +100,6 @@ }, ] - # Internationalization # https://docs.djangoproject.com/en/5.1/topics/i18n/ @@ -113,7 +111,6 @@ USE_TZ = True - # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/5.1/howto/static-files/