From 9b98d87cf72ccb9bba2a42d7aac1f70925f6ff36 Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 18:44:53 +0000 Subject: [PATCH 1/5] Setting up GitHub Classroom Feedback From 645e89afe1cf764baf5dfa622cbe1e41d7194d27 Mon Sep 17 00:00:00 2001 From: heathersmith Date: Wed, 14 Sep 2022 14:29:28 -0400 Subject: [PATCH 2/5] created skeleton and customuser model --- Pipfile | 15 ++++ Pipfile.lock | 130 ++++++++++++++++++++++++++++ config/.env | 3 + config/__init__.py | 0 config/asgi.py | 16 ++++ config/settings.py | 134 +++++++++++++++++++++++++++++ config/urls.py | 21 +++++ config/wsgi.py | 16 ++++ library/__init__.py | 0 library/admin.py | 11 +++ library/apps.py | 6 ++ library/migrations/0001_initial.py | 44 ++++++++++ library/migrations/__init__.py | 0 library/models.py | 10 +++ library/tests.py | 3 + library/views.py | 3 + manage.py | 22 +++++ 17 files changed, 434 insertions(+) create mode 100644 Pipfile create mode 100644 Pipfile.lock create mode 100644 config/.env create mode 100644 config/__init__.py create mode 100644 config/asgi.py create mode 100644 config/settings.py create mode 100644 config/urls.py create mode 100644 config/wsgi.py create mode 100644 library/__init__.py create mode 100644 library/admin.py create mode 100644 library/apps.py create mode 100644 library/migrations/0001_initial.py create mode 100644 library/migrations/__init__.py create mode 100644 library/models.py create mode 100644 library/tests.py create mode 100644 library/views.py create mode 100755 manage.py diff --git a/Pipfile b/Pipfile new file mode 100644 index 0000000..4ed2128 --- /dev/null +++ b/Pipfile @@ -0,0 +1,15 @@ +[[source]] +url = "https://pypi.org/simple" +verify_ssl = true +name = "pypi" + +[packages] +django = "*" +djangorestframework = "*" +psycopg2-binary = "*" +django-environ = "*" + +[dev-packages] + +[requires] +python_version = "3.10" diff --git a/Pipfile.lock b/Pipfile.lock new file mode 100644 index 0000000..8c1e4e5 --- /dev/null +++ b/Pipfile.lock @@ -0,0 +1,130 @@ +{ + "_meta": { + "hash": { + "sha256": "5b58c0531f99b96a9bccc6d098ece50cbd3bc035c406b00edbf9de40eab42150" + }, + "pipfile-spec": 6, + "requires": { + "python_version": "3.10" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": { + "asgiref": { + "hashes": [ + "sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4", + "sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424" + ], + "markers": "python_version >= '3.7'", + "version": "==3.5.2" + }, + "django": { + "hashes": [ + "sha256:a153ffd5143bf26a877bfae2f4ec736ebd8924a46600ca089ad96b54a1d4e28e", + "sha256:acb21fac9275f9972d81c7caf5761a89ec3ea25fe74545dd26b8a48cb3a0203e" + ], + "index": "pypi", + "version": "==4.1.1" + }, + "django-environ": { + "hashes": [ + "sha256:bff5381533056328c9ac02f71790bd5bf1cea81b1beeb648f28b81c9e83e0a21", + "sha256:f21a5ef8cc603da1870bbf9a09b7e5577ab5f6da451b843dbcc721a7bca6b3d9" + ], + "index": "pypi", + "version": "==0.9.0" + }, + "djangorestframework": { + "hashes": [ + "sha256:0c33407ce23acc68eca2a6e46424b008c9c02eceb8cf18581921d0092bc1f2ee", + "sha256:24c4bf58ed7e85d1fe4ba250ab2da926d263cd57d64b03e8dcef0ac683f8b1aa" + ], + "index": "pypi", + "version": "==3.13.1" + }, + "psycopg2-binary": { + "hashes": [ + "sha256:01310cf4cf26db9aea5158c217caa92d291f0500051a6469ac52166e1a16f5b7", + "sha256:083a55275f09a62b8ca4902dd11f4b33075b743cf0d360419e2051a8a5d5ff76", + "sha256:090f3348c0ab2cceb6dfbe6bf721ef61262ddf518cd6cc6ecc7d334996d64efa", + "sha256:0a29729145aaaf1ad8bafe663131890e2111f13416b60e460dae0a96af5905c9", + "sha256:0c9d5450c566c80c396b7402895c4369a410cab5a82707b11aee1e624da7d004", + "sha256:10bb90fb4d523a2aa67773d4ff2b833ec00857f5912bafcfd5f5414e45280fb1", + "sha256:12b11322ea00ad8db8c46f18b7dfc47ae215e4df55b46c67a94b4effbaec7094", + "sha256:152f09f57417b831418304c7f30d727dc83a12761627bb826951692cc6491e57", + "sha256:15803fa813ea05bef089fa78835118b5434204f3a17cb9f1e5dbfd0b9deea5af", + "sha256:15c4e4cfa45f5a60599d9cec5f46cd7b1b29d86a6390ec23e8eebaae84e64554", + "sha256:183a517a3a63503f70f808b58bfbf962f23d73b6dccddae5aa56152ef2bcb232", + "sha256:1f14c8b0942714eb3c74e1e71700cbbcb415acbc311c730370e70c578a44a25c", + "sha256:1f6b813106a3abdf7b03640d36e24669234120c72e91d5cbaeb87c5f7c36c65b", + "sha256:280b0bb5cbfe8039205c7981cceb006156a675362a00fe29b16fbc264e242834", + "sha256:2d872e3c9d5d075a2e104540965a1cf898b52274a5923936e5bfddb58c59c7c2", + "sha256:2f9ffd643bc7349eeb664eba8864d9e01f057880f510e4681ba40a6532f93c71", + "sha256:3303f8807f342641851578ee7ed1f3efc9802d00a6f83c101d21c608cb864460", + "sha256:35168209c9d51b145e459e05c31a9eaeffa9a6b0fd61689b48e07464ffd1a83e", + "sha256:3a79d622f5206d695d7824cbf609a4f5b88ea6d6dab5f7c147fc6d333a8787e4", + "sha256:404224e5fef3b193f892abdbf8961ce20e0b6642886cfe1fe1923f41aaa75c9d", + "sha256:46f0e0a6b5fa5851bbd9ab1bc805eef362d3a230fbdfbc209f4a236d0a7a990d", + "sha256:47133f3f872faf28c1e87d4357220e809dfd3fa7c64295a4a148bcd1e6e34ec9", + "sha256:526ea0378246d9b080148f2d6681229f4b5964543c170dd10bf4faaab6e0d27f", + "sha256:53293533fcbb94c202b7c800a12c873cfe24599656b341f56e71dd2b557be063", + "sha256:539b28661b71da7c0e428692438efbcd048ca21ea81af618d845e06ebfd29478", + "sha256:57804fc02ca3ce0dbfbef35c4b3a4a774da66d66ea20f4bda601294ad2ea6092", + "sha256:63638d875be8c2784cfc952c9ac34e2b50e43f9f0a0660b65e2a87d656b3116c", + "sha256:6472a178e291b59e7f16ab49ec8b4f3bdada0a879c68d3817ff0963e722a82ce", + "sha256:68641a34023d306be959101b345732360fc2ea4938982309b786f7be1b43a4a1", + "sha256:6e82d38390a03da28c7985b394ec3f56873174e2c88130e6966cb1c946508e65", + "sha256:761df5313dc15da1502b21453642d7599d26be88bff659382f8f9747c7ebea4e", + "sha256:7af0dd86ddb2f8af5da57a976d27cd2cd15510518d582b478fbb2292428710b4", + "sha256:7b1e9b80afca7b7a386ef087db614faebbf8839b7f4db5eb107d0f1a53225029", + "sha256:874a52ecab70af13e899f7847b3e074eeb16ebac5615665db33bce8a1009cf33", + "sha256:887dd9aac71765ac0d0bac1d0d4b4f2c99d5f5c1382d8b770404f0f3d0ce8a39", + "sha256:8b344adbb9a862de0c635f4f0425b7958bf5a4b927c8594e6e8d261775796d53", + "sha256:8fc53f9af09426a61db9ba357865c77f26076d48669f2e1bb24d85a22fb52307", + "sha256:91920527dea30175cc02a1099f331aa8c1ba39bf8b7762b7b56cbf54bc5cce42", + "sha256:93cd1967a18aa0edd4b95b1dfd554cf15af657cb606280996d393dadc88c3c35", + "sha256:99485cab9ba0fa9b84f1f9e1fef106f44a46ef6afdeec8885e0b88d0772b49e8", + "sha256:9d29409b625a143649d03d0fd7b57e4b92e0ecad9726ba682244b73be91d2fdb", + "sha256:a29b3ca4ec9defec6d42bf5feb36bb5817ba3c0230dd83b4edf4bf02684cd0ae", + "sha256:a9e1f75f96ea388fbcef36c70640c4efbe4650658f3d6a2967b4cc70e907352e", + "sha256:accfe7e982411da3178ec690baaceaad3c278652998b2c45828aaac66cd8285f", + "sha256:adf20d9a67e0b6393eac162eb81fb10bc9130a80540f4df7e7355c2dd4af9fba", + "sha256:af9813db73395fb1fc211bac696faea4ca9ef53f32dc0cfa27e4e7cf766dcf24", + "sha256:b1c8068513f5b158cf7e29c43a77eb34b407db29aca749d3eb9293ee0d3103ca", + "sha256:bda845b664bb6c91446ca9609fc69f7db6c334ec5e4adc87571c34e4f47b7ddb", + "sha256:c381bda330ddf2fccbafab789d83ebc6c53db126e4383e73794c74eedce855ef", + "sha256:c3ae8e75eb7160851e59adc77b3a19a976e50622e44fd4fd47b8b18208189d42", + "sha256:d1c1b569ecafe3a69380a94e6ae09a4789bbb23666f3d3a08d06bbd2451f5ef1", + "sha256:def68d7c21984b0f8218e8a15d514f714d96904265164f75f8d3a70f9c295667", + "sha256:dffc08ca91c9ac09008870c9eb77b00a46b3378719584059c034b8945e26b272", + "sha256:e3699852e22aa68c10de06524a3721ade969abf382da95884e6a10ff798f9281", + "sha256:e847774f8ffd5b398a75bc1c18fbb56564cda3d629fe68fd81971fece2d3c67e", + "sha256:ffb7a888a047696e7f8240d649b43fb3644f14f0ee229077e7f6b9f9081635bd" + ], + "index": "pypi", + "version": "==2.9.3" + }, + "pytz": { + "hashes": [ + "sha256:220f481bdafa09c3955dfbdddb7b57780e9a94f5127e35456a48589b9e0c0197", + "sha256:cea221417204f2d1a2aa03ddae3e867921971d0d76f14d87abb4414415bbdcf5" + ], + "version": "==2022.2.1" + }, + "sqlparse": { + "hashes": [ + "sha256:0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae", + "sha256:48719e356bb8b42991bdbb1e8b83223757b93789c00910a616a071910ca4a64d" + ], + "markers": "python_version >= '3.5'", + "version": "==0.4.2" + } + }, + "develop": {} +} diff --git a/config/.env b/config/.env new file mode 100644 index 0000000..5cb52e8 --- /dev/null +++ b/config/.env @@ -0,0 +1,3 @@ +DATABASE_URL=postgres://drf-library-api:@127.0.0.1:5432/drf-library-api +DEBUG=on +SECRET_KEY=your-secret-key \ No newline at end of file diff --git a/config/__init__.py b/config/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/config/asgi.py b/config/asgi.py new file mode 100644 index 0000000..9502b7f --- /dev/null +++ b/config/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for config 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/4.1/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings') + +application = get_asgi_application() diff --git a/config/settings.py b/config/settings.py new file mode 100644 index 0000000..0f4d32b --- /dev/null +++ b/config/settings.py @@ -0,0 +1,134 @@ +""" +Django settings for config project. + +Generated by 'django-admin startproject' using Django 4.1.1. + +For more information on this file, see +https://docs.djangoproject.com/en/4.1/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/4.1/ref/settings/ +""" + +from pathlib import Path +import environ + +env = environ.Env( + # set casting, default value + DEBUG=(bool, False) +) + +# Build paths inside the project like this: BASE_DIR / 'subdir'. +BASE_DIR = Path(__file__).resolve().parent.parent + +environ.Env.read_env() + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = env('SECRET_KEY') + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = env('DEBUG') + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'library' +] + +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 = 'config.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 = 'config.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/4.1/ref/settings/#databases + +DATABASES = { + # read os.environ['DATABASE_URL'] and raises + # ImproperlyConfigured exception if not found + # + # The db() method is an alias for db_url(). + 'default': env.db(), + } + + +# Password validation +# https://docs.djangoproject.com/en/4.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/4.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/4.1/howto/static-files/ + +STATIC_URL = 'static/' + +# Default primary key field type +# https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' + +AUTH_USER_MODEL = "library.CustomUser" \ No newline at end of file diff --git a/config/urls.py b/config/urls.py new file mode 100644 index 0000000..b6601c1 --- /dev/null +++ b/config/urls.py @@ -0,0 +1,21 @@ +"""config URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/4.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/config/wsgi.py b/config/wsgi.py new file mode 100644 index 0000000..3d2dc45 --- /dev/null +++ b/config/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for config 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/4.1/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings') + +application = get_wsgi_application() diff --git a/library/__init__.py b/library/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/library/admin.py b/library/admin.py new file mode 100644 index 0000000..0df8868 --- /dev/null +++ b/library/admin.py @@ -0,0 +1,11 @@ +from django.contrib import admin +from django.contrib.auth.admin import UserAdmin + +from .models import CustomUser + +# Register your models here. +class CustomUserAdmin(UserAdmin): + model = CustomUser + list_display = ['email', 'username',] + +admin.site.register(CustomUser, CustomUserAdmin) \ No newline at end of file diff --git a/library/apps.py b/library/apps.py new file mode 100644 index 0000000..c33ac9c --- /dev/null +++ b/library/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class LibraryConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'library' diff --git a/library/migrations/0001_initial.py b/library/migrations/0001_initial.py new file mode 100644 index 0000000..cf61147 --- /dev/null +++ b/library/migrations/0001_initial.py @@ -0,0 +1,44 @@ +# Generated by Django 4.1.1 on 2022-09-14 18:28 + +import django.contrib.auth.models +import django.contrib.auth.validators +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ] + + operations = [ + migrations.CreateModel( + name='CustomUser', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), + ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), + ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), + ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')), + ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), + ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), + ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')), + ], + options={ + 'verbose_name': 'user', + 'verbose_name_plural': 'users', + 'abstract': False, + }, + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + ] diff --git a/library/migrations/__init__.py b/library/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/library/models.py b/library/models.py new file mode 100644 index 0000000..9924be1 --- /dev/null +++ b/library/models.py @@ -0,0 +1,10 @@ +from django.db import models +from django.contrib.auth.models import AbstractUser + + +# Create your models here. +class CustomUser(AbstractUser): + pass + + def __str__(self): + return self.username diff --git a/library/tests.py b/library/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/library/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/library/views.py b/library/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/library/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 100755 index 0000000..8e7ac79 --- /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', 'config.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() From c79ff74a41d399d18a3dd8db5f8fcb53ba05dc7a Mon Sep 17 00:00:00 2001 From: heathersmith Date: Thu, 15 Sep 2022 09:47:36 -0400 Subject: [PATCH 3/5] adds view and url for book model --- Pipfile | 2 + Pipfile.lock | 41 +++++++++++- Procfile | 2 + config/settings.py | 14 +++- config/urls.py | 5 +- library/admin.py | 8 ++- library/migrations/0002_genre_book.py | 30 +++++++++ ...list_markup_alter_book_options_and_more.py | 65 +++++++++++++++++++ ...er_list_user_alter_markup_book_and_more.py | 35 ++++++++++ library/migrations/0005_genre_name.py | 18 +++++ library/models.py | 50 ++++++++++++++ library/serializers.py | 15 +++++ library/urls.py | 10 +++ library/views.py | 13 +++- 14 files changed, 300 insertions(+), 8 deletions(-) create mode 100644 Procfile create mode 100644 library/migrations/0002_genre_book.py create mode 100644 library/migrations/0003_list_markup_alter_book_options_and_more.py create mode 100644 library/migrations/0004_alter_list_book_alter_list_user_alter_markup_book_and_more.py create mode 100644 library/migrations/0005_genre_name.py create mode 100644 library/serializers.py create mode 100644 library/urls.py diff --git a/Pipfile b/Pipfile index 4ed2128..1a41db1 100644 --- a/Pipfile +++ b/Pipfile @@ -8,6 +8,8 @@ django = "*" djangorestframework = "*" psycopg2-binary = "*" django-environ = "*" +django-on-heroku = "*" +gunicorn = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 8c1e4e5..c419eee 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "5b58c0531f99b96a9bccc6d098ece50cbd3bc035c406b00edbf9de40eab42150" + "sha256": "03eaee049a72bd705f942ecc793d6e1359689ac0b68e1a21c59c8013800eaab4" }, "pipfile-spec": 6, "requires": { @@ -24,6 +24,13 @@ "markers": "python_version >= '3.7'", "version": "==3.5.2" }, + "dj-database-url": { + "hashes": [ + "sha256:ccf3e8718f75ddd147a1e212fca88eecdaa721759ee48e38b485481c77bca3dc", + "sha256:cd354a3b7a9136d78d64c17b2aec369e2ae5616fbca6bfbe435ef15bb372ce39" + ], + "version": "==1.0.0" + }, "django": { "hashes": [ "sha256:a153ffd5143bf26a877bfae2f4ec736ebd8924a46600ca089ad96b54a1d4e28e", @@ -40,6 +47,14 @@ "index": "pypi", "version": "==0.9.0" }, + "django-on-heroku": { + "hashes": [ + "sha256:4a72ade056335112cba22eea332552d840b718dd8140d43c2d70bb739875955b", + "sha256:a41fe83ef7ecb022ca92b2950a61f79fef156e58f4f35fc7fc4ecacdc5225fb8" + ], + "index": "pypi", + "version": "==1.1.2" + }, "djangorestframework": { "hashes": [ "sha256:0c33407ce23acc68eca2a6e46424b008c9c02eceb8cf18581921d0092bc1f2ee", @@ -48,6 +63,14 @@ "index": "pypi", "version": "==3.13.1" }, + "gunicorn": { + "hashes": [ + "sha256:9dcc4547dbb1cb284accfb15ab5667a0e5d1881cc443e0677b4882a4067a807e", + "sha256:e0a968b5ba15f8a328fdfd7ab1fcb5af4470c28aaf7e55df02a99bc13138e6e8" + ], + "index": "pypi", + "version": "==20.1.0" + }, "psycopg2-binary": { "hashes": [ "sha256:01310cf4cf26db9aea5158c217caa92d291f0500051a6469ac52166e1a16f5b7", @@ -117,6 +140,14 @@ ], "version": "==2022.2.1" }, + "setuptools": { + "hashes": [ + "sha256:2e24e0bec025f035a2e72cdd1961119f557d78ad331bb00ff82efb2ab8da8e82", + "sha256:7732871f4f7fa58fb6bdcaeadb0161b2bd046c85905dbaa066bdcbcc81953b57" + ], + "markers": "python_version >= '3.7'", + "version": "==65.3.0" + }, "sqlparse": { "hashes": [ "sha256:0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae", @@ -124,6 +155,14 @@ ], "markers": "python_version >= '3.5'", "version": "==0.4.2" + }, + "whitenoise": { + "hashes": [ + "sha256:8e9c600a5c18bd17655ef668ad55b5edf6c24ce9bdca5bf607649ca4b1e8e2c2", + "sha256:8fa943c6d4cd9e27673b70c21a07b0aa120873901e099cd46cab40f7cc96d567" + ], + "markers": "python_version >= '3.7'", + "version": "==6.2.0" } }, "develop": {} diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..d0ae9bc --- /dev/null +++ b/Procfile @@ -0,0 +1,2 @@ +web: gunicorn config.wsgi +release: python manage.py migrate \ No newline at end of file diff --git a/config/settings.py b/config/settings.py index 0f4d32b..f760058 100644 --- a/config/settings.py +++ b/config/settings.py @@ -12,6 +12,7 @@ from pathlib import Path import environ +import django_on_heroku env = environ.Env( # set casting, default value @@ -44,7 +45,8 @@ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'library' + 'rest_framework', + 'library', ] MIDDLEWARE = [ @@ -62,7 +64,7 @@ TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], + 'DIRS': ['templates'], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -125,10 +127,16 @@ # https://docs.djangoproject.com/en/4.1/howto/static-files/ STATIC_URL = 'static/' +STATICFILES_DIRS = [ + BASE_DIR / 'static/' +] # Default primary key field type # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' -AUTH_USER_MODEL = "library.CustomUser" \ No newline at end of file +AUTH_USER_MODEL = "library.CustomUser" + +django_on_heroku.settings(locals()) +del DATABASES['default']['OPTIONS']['sslmode'] \ No newline at end of file diff --git a/config/urls.py b/config/urls.py index b6601c1..5156914 100644 --- a/config/urls.py +++ b/config/urls.py @@ -14,8 +14,11 @@ 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin -from django.urls import path +from django.urls import include, path urlpatterns = [ path('admin/', admin.site.urls), + path('api-auth/', include('rest_framework.urls')), + path('', include('library.urls')), ] + diff --git a/library/admin.py b/library/admin.py index 0df8868..2a33d1f 100644 --- a/library/admin.py +++ b/library/admin.py @@ -1,11 +1,15 @@ from django.contrib import admin from django.contrib.auth.admin import UserAdmin -from .models import CustomUser +from .models import CustomUser, Book, List, MarkUp, Genre # Register your models here. class CustomUserAdmin(UserAdmin): model = CustomUser list_display = ['email', 'username',] -admin.site.register(CustomUser, CustomUserAdmin) \ No newline at end of file +admin.site.register(CustomUser, CustomUserAdmin) +admin.site.register(Book) +admin.site.register(List) +admin.site.register(MarkUp) +admin.site.register(Genre) diff --git a/library/migrations/0002_genre_book.py b/library/migrations/0002_genre_book.py new file mode 100644 index 0000000..2f17917 --- /dev/null +++ b/library/migrations/0002_genre_book.py @@ -0,0 +1,30 @@ +# Generated by Django 4.1.1 on 2022-09-14 19:44 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('library', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Genre', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ], + ), + migrations.CreateModel( + name='Book', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('author', models.CharField(max_length=100)), + ('title', models.CharField(max_length=100)), + ('publication_date', models.DateField(blank=True, null=True)), + ('featured', models.BooleanField(default=False)), + ('genres', models.ManyToManyField(related_name='books', to='library.genre')), + ], + ), + ] diff --git a/library/migrations/0003_list_markup_alter_book_options_and_more.py b/library/migrations/0003_list_markup_alter_book_options_and_more.py new file mode 100644 index 0000000..8ff0702 --- /dev/null +++ b/library/migrations/0003_list_markup_alter_book_options_and_more.py @@ -0,0 +1,65 @@ +# Generated by Django 4.1.1 on 2022-09-15 02:57 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('library', '0002_genre_book'), + ] + + operations = [ + migrations.CreateModel( + name='List', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('status', models.CharField(choices=[('NRD', 'Not read'), ('RDG', 'Reading'), ('YRD', 'Read')], default='NRD', max_length=3)), + ], + ), + migrations.CreateModel( + name='MarkUp', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('note', models.TextField(max_length=1000)), + ('page_number', models.PositiveIntegerField(blank=True, null=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('public', models.BooleanField(default=False)), + ], + ), + migrations.AlterModelOptions( + name='book', + options={'ordering': ['title', 'author']}, + ), + migrations.RenameField( + model_name='book', + old_name='genres', + new_name='genre', + ), + migrations.AddConstraint( + model_name='book', + constraint=models.UniqueConstraint(fields=('title', 'author'), name='unique_title_author'), + ), + migrations.AddField( + model_name='markup', + name='book', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notes', to='library.book'), + ), + migrations.AddField( + model_name='markup', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notes', to=settings.AUTH_USER_MODEL), + ), + migrations.AddField( + model_name='list', + name='book', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='track_books', to='library.book'), + ), + migrations.AddField( + model_name='list', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='track_books', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/library/migrations/0004_alter_list_book_alter_list_user_alter_markup_book_and_more.py b/library/migrations/0004_alter_list_book_alter_list_user_alter_markup_book_and_more.py new file mode 100644 index 0000000..da29220 --- /dev/null +++ b/library/migrations/0004_alter_list_book_alter_list_user_alter_markup_book_and_more.py @@ -0,0 +1,35 @@ +# Generated by Django 4.1.1 on 2022-09-15 02:58 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('library', '0003_list_markup_alter_book_options_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='list', + name='book', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='list', to='library.book'), + ), + migrations.AlterField( + model_name='list', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='list', to=settings.AUTH_USER_MODEL), + ), + migrations.AlterField( + model_name='markup', + name='book', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='markup', to='library.book'), + ), + migrations.AlterField( + model_name='markup', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='markup', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/library/migrations/0005_genre_name.py b/library/migrations/0005_genre_name.py new file mode 100644 index 0000000..1cf63c1 --- /dev/null +++ b/library/migrations/0005_genre_name.py @@ -0,0 +1,18 @@ +# Generated by Django 4.1.1 on 2022-09-15 13:04 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('library', '0004_alter_list_book_alter_list_user_alter_markup_book_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='genre', + name='name', + field=models.CharField(blank=True, max_length=75, null=True), + ), + ] diff --git a/library/models.py b/library/models.py index 9924be1..96e1884 100644 --- a/library/models.py +++ b/library/models.py @@ -1,5 +1,6 @@ from django.db import models from django.contrib.auth.models import AbstractUser +from django.db.models.constraints import UniqueConstraint # Create your models here. @@ -8,3 +9,52 @@ class CustomUser(AbstractUser): def __str__(self): return self.username + + +class Book(models.Model): + title = models.CharField(max_length=100) + author = models.CharField(max_length=100) + publication_date = models.DateField(blank=True, null=True) + genre = models.ManyToManyField("Genre", related_name="books") + featured = models.BooleanField(default=False) + + class Meta: + ordering = ['title', 'author'] + constraints = [ + UniqueConstraint(fields=["title", "author"], name="unique_title_author") + ] + + def __str__(self): + return f'{self.title} by {self.author}' + +class List(models.Model): + NOT_READ = 'NRD' + READING = 'RDG' + READ = 'YRD' + STATUS = [ + (NOT_READ, 'Not read'), + (READING, "Reading"), + (READ, 'Read'), + ] + user = models.ForeignKey(CustomUser, on_delete=models.CASCADE, related_name='list') + book = models.ForeignKey(Book, on_delete=models.CASCADE, related_name='list') + status = models.CharField(max_length=3, choices=STATUS, default=NOT_READ) + + +class MarkUp(models.Model): + user = models.ForeignKey(CustomUser, on_delete=models.CASCADE, related_name='markup') + book = models.ForeignKey(Book, on_delete=models.CASCADE, related_name='markup') + note = models.TextField(max_length=1000) + page_number = models.PositiveIntegerField(blank=True, null=True) + created_at = models.DateTimeField(auto_now_add=True) + public = models.BooleanField(default=False) + +class Genre(models.Model): + name = models.CharField(max_length=75, blank=True, null=True) + + def __str__(self): + return self.name + + def __repr__(self): + return f"" + diff --git a/library/serializers.py b/library/serializers.py new file mode 100644 index 0000000..59905a7 --- /dev/null +++ b/library/serializers.py @@ -0,0 +1,15 @@ +from rest_framework import serializers +from .models import Book + +class BookSerializer(serializers.ModelSerializer): + + class Meta: + model = Book + fields = ('id', 'author', 'publication_date', 'genre', 'featured') + +# class UserSerializer(serializers.Serializer): +# book = serializers.PrimaryKeyRelatedField(many=True, queryset=Book.objects.all()) + +# class Meta: +# model = User +# fields - ('id', 'username', 'book') diff --git a/library/urls.py b/library/urls.py new file mode 100644 index 0000000..b7d91e6 --- /dev/null +++ b/library/urls.py @@ -0,0 +1,10 @@ +from django.urls import path +from rest_framework.urlpatterns import format_suffix_patterns +from library import views + +urlpatterns = [ + path('books/', views.BookList.as_view(), name="book-list"), + path('books//', views.BookDetail.as_view(), name='book-detail'), +] + +urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/library/views.py b/library/views.py index 91ea44a..6220c10 100644 --- a/library/views.py +++ b/library/views.py @@ -1,3 +1,14 @@ -from django.shortcuts import render +from rest_framework import generics +from .models import Book +from .serializers import BookSerializer + # Create your views here. +class BookList(generics.ListCreateAPIView): + queryset = Book.objects.all() + serializer_class = BookSerializer + + +class BookDetail(generics.RetrieveUpdateDestroyAPIView): + queryset = Book.objects.all() + serializer_class = BookSerializer From 35e70efeb61e9784697c9870e080e559da236cef Mon Sep 17 00:00:00 2001 From: heathersmith Date: Fri, 16 Sep 2022 19:39:41 -0400 Subject: [PATCH 4/5] adds notes serializer and url along with the api_view --- library/admin.py | 5 +- .../migrations/0006_rename_list_savedlist.py | 17 +++++++ .../migrations/0007_rename_savedlist_saved.py | 17 +++++++ .../0008_alter_saved_book_alter_saved_user.py | 25 +++++++++ .../migrations/0009_rename_saved_savedbook.py | 17 +++++++ ...move_book_genre_delete_genre_book_genre.py | 26 ++++++++++ library/models.py | 18 +++---- library/serializers.py | 27 +++++++--- library/urls.py | 5 ++ library/views.py | 51 ++++++++++++++++++- 10 files changed, 185 insertions(+), 23 deletions(-) create mode 100644 library/migrations/0006_rename_list_savedlist.py create mode 100644 library/migrations/0007_rename_savedlist_saved.py create mode 100644 library/migrations/0008_alter_saved_book_alter_saved_user.py create mode 100644 library/migrations/0009_rename_saved_savedbook.py create mode 100644 library/migrations/0010_remove_book_genre_delete_genre_book_genre.py diff --git a/library/admin.py b/library/admin.py index 2a33d1f..b3e41fc 100644 --- a/library/admin.py +++ b/library/admin.py @@ -1,7 +1,7 @@ from django.contrib import admin from django.contrib.auth.admin import UserAdmin -from .models import CustomUser, Book, List, MarkUp, Genre +from .models import CustomUser, Book, SavedBook, MarkUp # Register your models here. class CustomUserAdmin(UserAdmin): @@ -10,6 +10,5 @@ class CustomUserAdmin(UserAdmin): admin.site.register(CustomUser, CustomUserAdmin) admin.site.register(Book) -admin.site.register(List) +admin.site.register(SavedBook) admin.site.register(MarkUp) -admin.site.register(Genre) diff --git a/library/migrations/0006_rename_list_savedlist.py b/library/migrations/0006_rename_list_savedlist.py new file mode 100644 index 0000000..0e05627 --- /dev/null +++ b/library/migrations/0006_rename_list_savedlist.py @@ -0,0 +1,17 @@ +# Generated by Django 4.1.1 on 2022-09-15 18:55 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('library', '0005_genre_name'), + ] + + operations = [ + migrations.RenameModel( + old_name='List', + new_name='SavedList', + ), + ] diff --git a/library/migrations/0007_rename_savedlist_saved.py b/library/migrations/0007_rename_savedlist_saved.py new file mode 100644 index 0000000..777f18e --- /dev/null +++ b/library/migrations/0007_rename_savedlist_saved.py @@ -0,0 +1,17 @@ +# Generated by Django 4.1.1 on 2022-09-15 19:55 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('library', '0006_rename_list_savedlist'), + ] + + operations = [ + migrations.RenameModel( + old_name='SavedList', + new_name='Saved', + ), + ] diff --git a/library/migrations/0008_alter_saved_book_alter_saved_user.py b/library/migrations/0008_alter_saved_book_alter_saved_user.py new file mode 100644 index 0000000..ae4967c --- /dev/null +++ b/library/migrations/0008_alter_saved_book_alter_saved_user.py @@ -0,0 +1,25 @@ +# Generated by Django 4.1.1 on 2022-09-15 19:56 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('library', '0007_rename_savedlist_saved'), + ] + + operations = [ + migrations.AlterField( + model_name='saved', + name='book', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='saved', to='library.book'), + ), + migrations.AlterField( + model_name='saved', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='saved', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/library/migrations/0009_rename_saved_savedbook.py b/library/migrations/0009_rename_saved_savedbook.py new file mode 100644 index 0000000..f8e499b --- /dev/null +++ b/library/migrations/0009_rename_saved_savedbook.py @@ -0,0 +1,17 @@ +# Generated by Django 4.1.1 on 2022-09-16 15:39 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('library', '0008_alter_saved_book_alter_saved_user'), + ] + + operations = [ + migrations.RenameModel( + old_name='Saved', + new_name='SavedBook', + ), + ] diff --git a/library/migrations/0010_remove_book_genre_delete_genre_book_genre.py b/library/migrations/0010_remove_book_genre_delete_genre_book_genre.py new file mode 100644 index 0000000..51da88d --- /dev/null +++ b/library/migrations/0010_remove_book_genre_delete_genre_book_genre.py @@ -0,0 +1,26 @@ +# Generated by Django 4.1.1 on 2022-09-16 20:37 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('library', '0009_rename_saved_savedbook'), + ] + + operations = [ + migrations.RemoveField( + model_name='book', + name='genre', + ), + migrations.DeleteModel( + name='Genre', + ), + migrations.AddField( + model_name='book', + name='genre', + field=models.CharField(default='fiction', max_length=100), + preserve_default=False, + ), + ] diff --git a/library/models.py b/library/models.py index 96e1884..793da00 100644 --- a/library/models.py +++ b/library/models.py @@ -15,7 +15,7 @@ class Book(models.Model): title = models.CharField(max_length=100) author = models.CharField(max_length=100) publication_date = models.DateField(blank=True, null=True) - genre = models.ManyToManyField("Genre", related_name="books") + genre = models.CharField(max_length=100) featured = models.BooleanField(default=False) class Meta: @@ -27,7 +27,7 @@ class Meta: def __str__(self): return f'{self.title} by {self.author}' -class List(models.Model): +class SavedBook(models.Model): NOT_READ = 'NRD' READING = 'RDG' READ = 'YRD' @@ -36,10 +36,13 @@ class List(models.Model): (READING, "Reading"), (READ, 'Read'), ] - user = models.ForeignKey(CustomUser, on_delete=models.CASCADE, related_name='list') - book = models.ForeignKey(Book, on_delete=models.CASCADE, related_name='list') + user = models.ForeignKey(CustomUser, on_delete=models.CASCADE, related_name='saved') + book = models.ForeignKey(Book, on_delete=models.CASCADE, related_name='saved') status = models.CharField(max_length=3, choices=STATUS, default=NOT_READ) + def __str__(self): + return f'{self.status} {self.book}' + class MarkUp(models.Model): user = models.ForeignKey(CustomUser, on_delete=models.CASCADE, related_name='markup') @@ -49,12 +52,7 @@ class MarkUp(models.Model): created_at = models.DateTimeField(auto_now_add=True) public = models.BooleanField(default=False) -class Genre(models.Model): - name = models.CharField(max_length=75, blank=True, null=True) - def __str__(self): - return self.name + return f'{self.book}, page {self.page_number} note: {self.note}' - def __repr__(self): - return f"" diff --git a/library/serializers.py b/library/serializers.py index 59905a7..2d60094 100644 --- a/library/serializers.py +++ b/library/serializers.py @@ -1,15 +1,26 @@ +from django.contrib.auth.models import User from rest_framework import serializers -from .models import Book +from .models import Book, SavedBook, MarkUp -class BookSerializer(serializers.ModelSerializer): +class BookSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = Book - fields = ('id', 'author', 'publication_date', 'genre', 'featured') + fields = ('url', 'id', 'title', 'author', 'publication_date', 'featured') -# class UserSerializer(serializers.Serializer): -# book = serializers.PrimaryKeyRelatedField(many=True, queryset=Book.objects.all()) -# class Meta: -# model = User -# fields - ('id', 'username', 'book') +class SavedBookSerializer(serializers.HyperlinkedModelSerializer): + user = serializers.SlugRelatedField(slug_field="username", read_only=True) #show name instead of pk + book = serializers.SlugRelatedField(slug_field="title", read_only=True) + + class Meta: + model = SavedBook + fields = ('url', 'id', 'user', 'book', 'status') + +class MarkUpSerializer(serializers.HyperlinkedModelSerializer): + user = serializers.SlugRelatedField(slug_field="username", read_only=True) + book = serializers.SlugRelatedField(slug_field="title", read_only=True) + + class Meta: + model = MarkUp + fields = ('url', 'id', 'user', 'book', 'page_number', 'note', 'created_at,', 'public') \ No newline at end of file diff --git a/library/urls.py b/library/urls.py index b7d91e6..7733392 100644 --- a/library/urls.py +++ b/library/urls.py @@ -5,6 +5,11 @@ urlpatterns = [ path('books/', views.BookList.as_view(), name="book-list"), path('books//', views.BookDetail.as_view(), name='book-detail'), + path('saved-books/', views.SavedBookList.as_view(), name='saved-books'), + path('saved/', views.SavedBookDetail.as_view(), name='savedbook-detail'), + path('markups/', views.MarkUpList.as_view(), name='markup-list'), + path('markup-detail/', views.MarkUpDetail.as_view(), name='markup-detail'), + path('', views.api_root), ] urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/library/views.py b/library/views.py index 6220c10..11a0045 100644 --- a/library/views.py +++ b/library/views.py @@ -1,6 +1,10 @@ from rest_framework import generics -from .models import Book -from .serializers import BookSerializer +from .models import Book, SavedBook, MarkUp +from .serializers import BookSerializer, SavedBookSerializer, MarkUpSerializer +from rest_framework.decorators import action +from rest_framework.decorators import api_view +from rest_framework.response import Response +from rest_framework.reverse import reverse # Create your views here. @@ -8,7 +12,50 @@ class BookList(generics.ListCreateAPIView): queryset = Book.objects.all() serializer_class = BookSerializer + # def get_serializer_class(self): + # if self.action in ['list', 'favorite']: + # return + # return super().get_serializer_class() class BookDetail(generics.RetrieveUpdateDestroyAPIView): queryset = Book.objects.all() serializer_class = BookSerializer + +class SavedBookList(generics.ListCreateAPIView): + queryset = SavedBook.objects.all() + serializer_class = SavedBookSerializer + + # def get_queryset(self): + # queryset = super().get_queryset() + # return queryset.filter(user=self.request.user.id).order_by('book') + +class SavedBookDetail(generics.RetrieveUpdateDestroyAPIView): + queryset = SavedBook.objects.all() + serializer_class = SavedBookSerializer + +class MarkUpList(generics.ListCreateAPIView): + queryset = MarkUp.objects.all() + serializer_class = MarkUpSerializer + + +class MarkUpDetail(generics.RetrieveUpdateDestroyAPIView): + queryset = MarkUp.objects.all() + serializer_class = MarkUpSerializer + +@api_view(['GET']) # new +def api_root(request, format=None): + return Response({ + 'books': reverse('book-list', request=request, format=format), + 'saved-books': reverse('saved-books', request=request, format=format), + 'markups': reverse('markup-list', request=request, format=format), + }) + + + + + + + + + + From b3a4e252e2db999bc2be24d925eb3b8f8510e8ec Mon Sep 17 00:00:00 2001 From: heathersmith Date: Sun, 18 Sep 2022 20:53:05 -0400 Subject: [PATCH 5/5] adds search and filter. not much else works :-/ --- Pipfile | 2 ++ Pipfile.lock | 37 +++++++++++++++++++-- config/settings.py | 10 ++++-- library/models.py | 28 +++++++++------- library/serializers.py | 11 +++++-- library/urls.py | 14 ++++---- library/views.py | 75 +++++++++++++++++++++++++++++------------- 7 files changed, 129 insertions(+), 48 deletions(-) diff --git a/Pipfile b/Pipfile index 1a41db1..dc957cf 100644 --- a/Pipfile +++ b/Pipfile @@ -10,8 +10,10 @@ psycopg2-binary = "*" django-environ = "*" django-on-heroku = "*" gunicorn = "*" +django-filter = "*" [dev-packages] +autopep8 = "*" [requires] python_version = "3.10" diff --git a/Pipfile.lock b/Pipfile.lock index c419eee..3e0c495 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "03eaee049a72bd705f942ecc793d6e1359689ac0b68e1a21c59c8013800eaab4" + "sha256": "406e746757213269843ce54a6ed405dd178c7e55ff2682002621d2ab5819b988" }, "pipfile-spec": 6, "requires": { @@ -47,6 +47,14 @@ "index": "pypi", "version": "==0.9.0" }, + "django-filter": { + "hashes": [ + "sha256:ed429e34760127e3520a67f415bec4c905d4649fbe45d0d6da37e6ff5e0287eb", + "sha256:ed473b76e84f7e83b2511bb2050c3efb36d135207d0128dfe3ae4b36e3594ba5" + ], + "index": "pypi", + "version": "==22.1" + }, "django-on-heroku": { "hashes": [ "sha256:4a72ade056335112cba22eea332552d840b718dd8140d43c2d70bb739875955b", @@ -165,5 +173,30 @@ "version": "==6.2.0" } }, - "develop": {} + "develop": { + "autopep8": { + "hashes": [ + "sha256:6f09e90a2be784317e84dc1add17ebfc7abe3924239957a37e5040e27d812087", + "sha256:ca9b1a83e53a7fad65d731dc7a2a2d50aa48f43850407c59f6a1a306c4201142" + ], + "index": "pypi", + "version": "==1.7.0" + }, + "pycodestyle": { + "hashes": [ + "sha256:2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785", + "sha256:d1735fc58b418fd7c5f658d28d943854f8a849b01a5d0a1e6f3f3fdd0166804b" + ], + "markers": "python_version >= '3.6'", + "version": "==2.9.1" + }, + "toml": { + "hashes": [ + "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b", + "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" + ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==0.10.2" + } + } } diff --git a/config/settings.py b/config/settings.py index f760058..7984951 100644 --- a/config/settings.py +++ b/config/settings.py @@ -89,7 +89,7 @@ # # The db() method is an alias for db_url(). 'default': env.db(), - } +} # Password validation @@ -139,4 +139,10 @@ AUTH_USER_MODEL = "library.CustomUser" django_on_heroku.settings(locals()) -del DATABASES['default']['OPTIONS']['sslmode'] \ No newline at end of file +del DATABASES['default']['OPTIONS']['sslmode'] + +REST_FRAMEWORK = { + "DEFAULT_PERMISSION_CLASSES": [ + "rest_framework.permissions.IsAuthenticatedOrReadOnly" + ] +} diff --git a/library/models.py b/library/models.py index 793da00..bf41f1b 100644 --- a/library/models.py +++ b/library/models.py @@ -9,7 +9,7 @@ class CustomUser(AbstractUser): def __str__(self): return self.username - + class Book(models.Model): title = models.CharField(max_length=100) @@ -19,14 +19,16 @@ class Book(models.Model): featured = models.BooleanField(default=False) class Meta: - ordering = ['title', 'author'] + ordering = ['title', 'author'] constraints = [ - UniqueConstraint(fields=["title", "author"], name="unique_title_author") - ] + UniqueConstraint(fields=["title", "author"], + name="unique_title_author") + ] def __str__(self): return f'{self.title} by {self.author}' - + + class SavedBook(models.Model): NOT_READ = 'NRD' READING = 'RDG' @@ -36,8 +38,10 @@ class SavedBook(models.Model): (READING, "Reading"), (READ, 'Read'), ] - user = models.ForeignKey(CustomUser, on_delete=models.CASCADE, related_name='saved') - book = models.ForeignKey(Book, on_delete=models.CASCADE, related_name='saved') + user = models.ForeignKey( + CustomUser, on_delete=models.CASCADE, related_name='saved') + book = models.ForeignKey( + Book, on_delete=models.CASCADE, related_name='saved') status = models.CharField(max_length=3, choices=STATUS, default=NOT_READ) def __str__(self): @@ -45,14 +49,14 @@ def __str__(self): class MarkUp(models.Model): - user = models.ForeignKey(CustomUser, on_delete=models.CASCADE, related_name='markup') - book = models.ForeignKey(Book, on_delete=models.CASCADE, related_name='markup') + user = models.ForeignKey( + CustomUser, on_delete=models.CASCADE, related_name='markup') + book = models.ForeignKey( + Book, on_delete=models.CASCADE, related_name='markup') note = models.TextField(max_length=1000) page_number = models.PositiveIntegerField(blank=True, null=True) created_at = models.DateTimeField(auto_now_add=True) public = models.BooleanField(default=False) def __str__(self): - return f'{self.book}, page {self.page_number} note: {self.note}' - - + return f'{self.book}, page {self.page_number} note: {self.note}' diff --git a/library/serializers.py b/library/serializers.py index 2d60094..61dac07 100644 --- a/library/serializers.py +++ b/library/serializers.py @@ -1,26 +1,31 @@ from django.contrib.auth.models import User from rest_framework import serializers from .models import Book, SavedBook, MarkUp +from rest_framework.serializers import ListSerializer + class BookSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = Book - fields = ('url', 'id', 'title', 'author', 'publication_date', 'featured') + fields = ('url', 'id', 'title', 'author', + 'publication_date', 'genre', 'featured') class SavedBookSerializer(serializers.HyperlinkedModelSerializer): - user = serializers.SlugRelatedField(slug_field="username", read_only=True) #show name instead of pk + user = serializers.SlugRelatedField(slug_field="username", read_only=True) book = serializers.SlugRelatedField(slug_field="title", read_only=True) class Meta: model = SavedBook fields = ('url', 'id', 'user', 'book', 'status') + class MarkUpSerializer(serializers.HyperlinkedModelSerializer): user = serializers.SlugRelatedField(slug_field="username", read_only=True) book = serializers.SlugRelatedField(slug_field="title", read_only=True) class Meta: model = MarkUp - fields = ('url', 'id', 'user', 'book', 'page_number', 'note', 'created_at,', 'public') \ No newline at end of file + fields = ('url', 'id', 'user', 'book', 'page_number', + 'note', 'created_at', 'public') diff --git a/library/urls.py b/library/urls.py index 7733392..f85c920 100644 --- a/library/urls.py +++ b/library/urls.py @@ -3,13 +3,13 @@ from library import views urlpatterns = [ - path('books/', views.BookList.as_view(), name="book-list"), - path('books//', views.BookDetail.as_view(), name='book-detail'), + path('books/', views.BookList.as_view(), name="all-books"), + path('book//', views.BookDetail.as_view(), name='book-detail'), + path('book//saved', + views.SaveBookView.as_view(), name='savedbook-detail'), path('saved-books/', views.SavedBookList.as_view(), name='saved-books'), - path('saved/', views.SavedBookDetail.as_view(), name='savedbook-detail'), - path('markups/', views.MarkUpList.as_view(), name='markup-list'), - path('markup-detail/', views.MarkUpDetail.as_view(), name='markup-detail'), + path('book//markup', + views.MarkUpBookView.as_view(), name='markup'), + path('markup-list/', views.MarkUpList.as_view(), name='markup-list'), path('', views.api_root), ] - -urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/library/views.py b/library/views.py index 11a0045..730ea6c 100644 --- a/library/views.py +++ b/library/views.py @@ -1,61 +1,92 @@ -from rest_framework import generics +from rest_framework import generics, status from .models import Book, SavedBook, MarkUp from .serializers import BookSerializer, SavedBookSerializer, MarkUpSerializer from rest_framework.decorators import action -from rest_framework.decorators import api_view +from rest_framework.decorators import api_view, action +from rest_framework.generics import ListCreateAPIView, CreateAPIView from rest_framework.response import Response from rest_framework.reverse import reverse - +from rest_framework.permissions import IsAuthenticated, AllowAny +from rest_framework import filters +from django.shortcuts import get_object_or_404 # Create your views here. + + class BookList(generics.ListCreateAPIView): queryset = Book.objects.all() serializer_class = BookSerializer + permission_classes = [AllowAny] + filter_backends = [filters.SearchFilter] + search_fields = ['title', 'author'] + ordering_fields = ['title', 'author'] + + # def duplicate_book_entry(self): + # return super().create(request, *args, **kwargs) + # except IntegrityError: + # error_data = { + # "error": "Unique constraint violation: a title with this author already exists."} + # return Response(error_data, status=status.HTTP_400_BAD_REQUEST) - # def get_serializer_class(self): - # if self.action in ['list', 'favorite']: - # return - # return super().get_serializer_class() class BookDetail(generics.RetrieveUpdateDestroyAPIView): queryset = Book.objects.all() serializer_class = BookSerializer + # def perform_create(self, serializer): + # book = get_object_or_404( + # Book, pk=self.kwargs.get("pk")) + # serializer.save(book=book) + + class SavedBookList(generics.ListCreateAPIView): queryset = SavedBook.objects.all() serializer_class = SavedBookSerializer + def get_queryset(self): + queryset = self.request.user.saved.all() + return queryset + + # lookup book to save/add notes to + # save status with book + # def get_queryset(self): # queryset = super().get_queryset() # return queryset.filter(user=self.request.user.id).order_by('book') -class SavedBookDetail(generics.RetrieveUpdateDestroyAPIView): + +class SaveBookView(CreateAPIView): queryset = SavedBook.objects.all() serializer_class = SavedBookSerializer + permission_classes = [IsAuthenticated] + + def perform_create(self, serializer): + breakpoint + pass + # book = get_object_or_404( + # Book, pk=self.kwargs.get("pk")) + # serializer.save(book=book) + class MarkUpList(generics.ListCreateAPIView): queryset = MarkUp.objects.all() serializer_class = MarkUpSerializer -class MarkUpDetail(generics.RetrieveUpdateDestroyAPIView): +class MarkUpBookView(generics.RetrieveUpdateDestroyAPIView): queryset = MarkUp.objects.all() serializer_class = MarkUpSerializer -@api_view(['GET']) # new + # def perform_create(self, serializer): + # book = get_object_or_404( + # Book, pk=self.kwargs.get("pk")) + # serializer.save(book=book) + + +@api_view(['GET']) # new def api_root(request, format=None): return Response({ - 'books': reverse('book-list', request=request, format=format), + 'all-books': reverse('all-books', request=request, format=format), 'saved-books': reverse('saved-books', request=request, format=format), - 'markups': reverse('markup-list', request=request, format=format), + 'markup-list': reverse('markup-list', request=request, format=format), }) - - - - - - - - - -