From 0eb5c19405ed23f63f9fc075028000fe04a9dc51 Mon Sep 17 00:00:00 2001
From: Mike Pro <mvp@mallina.su>
Date: Wed, 22 Dec 2021 18:15:46 +0300
Subject: [PATCH 01/11] Django project created
---
.env | 5 ++
.gitignore | 4 +-
Dockerfile | 20 ++++++
README.md | 24 ++++++-
backend/backend/__init__.py | 0
backend/backend/asgi.py | 16 +++++
backend/backend/settings.py | 123 ++++++++++++++++++++++++++++++++++++
backend/backend/urls.py | 21 ++++++
backend/backend/wsgi.py | 16 +++++
backend/manage.py | 22 +++++++
docker-command.sh | 5 ++
docker-compose.override.yml | 13 ++++
docker-compose.yml | 15 +++++
requirements.txt | 8 +++
wait-for-pgdb.sh | 11 ++++
15 files changed, 301 insertions(+), 2 deletions(-)
create mode 100644 .env
create mode 100644 Dockerfile
create mode 100644 backend/backend/__init__.py
create mode 100644 backend/backend/asgi.py
create mode 100644 backend/backend/settings.py
create mode 100644 backend/backend/urls.py
create mode 100644 backend/backend/wsgi.py
create mode 100644 backend/manage.py
create mode 100644 docker-command.sh
create mode 100644 docker-compose.override.yml
create mode 100644 docker-compose.yml
create mode 100644 requirements.txt
create mode 100644 wait-for-pgdb.sh
diff --git a/.env b/.env
new file mode 100644
index 0000000..60dc32a
--- /dev/null
+++ b/.env
@@ -0,0 +1,5 @@
+POSTGRES_USER=dbuser
+POSTGRES_DB=task1
+POSTGRES_PASSWORD=dbpasswd
+POSTGRES_HOST=db
+POSTGRES_PORT=5432
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index b6e4761..ff57501 100644
--- a/.gitignore
+++ b/.gitignore
@@ -102,7 +102,6 @@ celerybeat.pid
*.sage.py
# Environments
-.env
.venv
env/
venv/
@@ -127,3 +126,6 @@ dmypy.json
# Pyre type checker
.pyre/
+
+/.idea
+/docker_dev_data
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..8e9e0be
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,20 @@
+FROM python:3-alpine
+ENV PYTHONUNBUFFERED 1
+RUN mkdir /code
+WORKDIR /code
+RUN apk add --no-cache make automake cmake gcc g++ subversion python3-dev libc-dev \
+ postgresql postgresql-dev
+RUN pip install --upgrade pip
+ADD requirements.txt /code/
+RUN pip install -r requirements.txt
+
+COPY docker-command.sh /code/
+RUN chmod +x /code/docker-command.sh
+COPY wait-for-pgdb.sh /code/
+RUN chmod +x /code/wait-for-pgdb.sh
+COPY backend /code/
+
+#RUN apk add --no-cache libc6-compat
+
+ENTRYPOINT ["/code/wait-for-pgdb.sh"]
+CMD ["/code/docker-command.sh"]
diff --git a/README.md b/README.md
index cd0951d..31b756c 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,24 @@
# CR_python1
-Task 1
+
+Реализовать простой сервис, который принимает и отвечает на HTTP-запросы
+
+###Описание
+####Функциональность
+* Получение всех городов из базы данных (использовать mock-данные)
+* Получение всех улиц города из базы данных (использовать mock-данные)
+* Создать магазин с данными о городе, улице, графике работы (по дням и по часам) и примечание
+* Получить магазин/(-ы) на основе фильтрации по одному или нескольким аттрибутов у сущности магазина (см. предыдущий пункт)
+
+####Инструменты
+* Python 3.6+
+* Django 2.2+
+* Django REST Framework
+* Реляционная база данных (желательно – PostgreSQL)
+
+
+####Условия
+* Наличие README.md для описания проекта и способа его установки/запуска локально
+* Работа с Docker будет большим плюсом
+* Обратить внимание на проектирование таблиц базы данных. Вероятно, здесь будет не одна таблица и будут применимы внешние ключи (Foreign Key).
+
+###
\ No newline at end of file
diff --git a/backend/backend/__init__.py b/backend/backend/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/backend/backend/asgi.py b/backend/backend/asgi.py
new file mode 100644
index 0000000..8fc85d9
--- /dev/null
+++ b/backend/backend/asgi.py
@@ -0,0 +1,16 @@
+"""
+ASGI config for backend 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.0/howto/deployment/asgi/
+"""
+
+import os
+
+from django.core.asgi import get_asgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'backend.settings')
+
+application = get_asgi_application()
diff --git a/backend/backend/settings.py b/backend/backend/settings.py
new file mode 100644
index 0000000..3bdcfe7
--- /dev/null
+++ b/backend/backend/settings.py
@@ -0,0 +1,123 @@
+"""
+Django settings for backend project.
+
+Generated by 'django-admin startproject' using Django 4.0.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/4.0/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/4.0/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/4.0/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = 'django-insecure-_101p89468^yfmb3wl7*k@wim8k0_mx$w6t@@tq1iaz11_-&e&'
+
+# 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 = 'backend.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 = 'backend.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/4.0/ref/settings/#databases
+
+DATABASES = {
+ 'default': {
+ 'ENGINE': 'django.db.backends.sqlite3',
+ 'NAME': BASE_DIR / 'db.sqlite3',
+ }
+}
+
+
+# Password validation
+# https://docs.djangoproject.com/en/4.0/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.0/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.0/howto/static-files/
+
+STATIC_URL = 'static/'
+
+# Default primary key field type
+# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
+
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
diff --git a/backend/backend/urls.py b/backend/backend/urls.py
new file mode 100644
index 0000000..0c16445
--- /dev/null
+++ b/backend/backend/urls.py
@@ -0,0 +1,21 @@
+"""backend URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+ https://docs.djangoproject.com/en/4.0/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/backend/backend/wsgi.py b/backend/backend/wsgi.py
new file mode 100644
index 0000000..ee71d55
--- /dev/null
+++ b/backend/backend/wsgi.py
@@ -0,0 +1,16 @@
+"""
+WSGI config for backend 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.0/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'backend.settings')
+
+application = get_wsgi_application()
diff --git a/backend/manage.py b/backend/manage.py
new file mode 100644
index 0000000..eb6431e
--- /dev/null
+++ b/backend/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', 'backend.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/docker-command.sh b/docker-command.sh
new file mode 100644
index 0000000..094788f
--- /dev/null
+++ b/docker-command.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+set -e
+
+sleep 10h
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
new file mode 100644
index 0000000..535baa4
--- /dev/null
+++ b/docker-compose.override.yml
@@ -0,0 +1,13 @@
+version: '3.5'
+
+services:
+ db:
+ volumes:
+ - ./docker_dev_data/pgdata:/var/lib/postgresql/data
+ web:
+ working_dir: /code/backend
+ command: python3 manage.py runserver 0.0.0.0:8000
+ volumes:
+ - .:/code
+ ports:
+ - "8000:8000"
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..b149147
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,15 @@
+version: '3'
+
+services:
+ db:
+ image: postgres
+ env_file: .env
+ web:
+ build:
+ context: .
+ dockerfile: Dockerfile
+ env_file: .env
+ ports:
+ - "8000:8000"
+ depends_on:
+ - db
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..34b5cf1
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,8 @@
+Django>=4.0,<5.0
+psycopg2-binary
+djangorestframework
+gunicorn
+numpy
+python-dateutil
+freezegun
+ipython
\ No newline at end of file
diff --git a/wait-for-pgdb.sh b/wait-for-pgdb.sh
new file mode 100644
index 0000000..02e2e7d
--- /dev/null
+++ b/wait-for-pgdb.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# wait-for-postgres.sh
+set -e
+cmd="$@"
+until PGPASSWORD=$POSTGRES_PASSWORD psql -h "$POSTGRES_HOST" -d "$POSTGRES_DB" -U "$POSTGRES_USER" -p "$POSTGRES_PORT" -c '\q'; do
+ >&2 echo "Postgres is unavailable - sleeping"
+ sleep 1
+done
+
+>&2 echo "Postgres is up - executing command"
+exec $cmd
\ No newline at end of file
From 2ce5db92e6645aebbf2133a292ff3a29ce98fc79 Mon Sep 17 00:00:00 2001
From: Mike Pro <mvp@mallina.su>
Date: Wed, 22 Dec 2021 18:37:59 +0300
Subject: [PATCH 02/11] Created store app and configured db
---
README.md | 8 ++++++++
backend/backend/settings.py | 9 +++++++--
backend/store/__init__.py | 0
backend/store/admin.py | 3 +++
backend/store/apps.py | 6 ++++++
backend/store/migrations/__init__.py | 0
backend/store/models.py | 3 +++
backend/store/tests.py | 3 +++
backend/store/views.py | 3 +++
9 files changed, 33 insertions(+), 2 deletions(-)
create mode 100644 backend/store/__init__.py
create mode 100644 backend/store/admin.py
create mode 100644 backend/store/apps.py
create mode 100644 backend/store/migrations/__init__.py
create mode 100644 backend/store/models.py
create mode 100644 backend/store/tests.py
create mode 100644 backend/store/views.py
diff --git a/README.md b/README.md
index 31b756c..c61e21e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,14 @@
# CR_python1
Реализовать простой сервис, который принимает и отвечает на HTTP-запросы
+###Запуск в dev-окружении
+Запуск develop-сервера
+
+`docker-compose up`
+
+Инициализация базы данных(применение миграций)
+
+`docker-compose exec web python3 manage.py migrate`
###Описание
####Функциональность
diff --git a/backend/backend/settings.py b/backend/backend/settings.py
index 3bdcfe7..0bae511 100644
--- a/backend/backend/settings.py
+++ b/backend/backend/settings.py
@@ -11,6 +11,7 @@
"""
from pathlib import Path
+import os
# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent
@@ -75,8 +76,12 @@
DATABASES = {
'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': BASE_DIR / 'db.sqlite3',
+ 'ENGINE': 'django.db.backends.postgresql',
+ 'NAME': os.environ.get('POSTGRES_DB', 'db'),
+ 'USER': os.environ.get('POSTGRES_USER', 'user'),
+ 'PASSWORD': os.environ.get('POSTGRES_PASSWORD', '123456'),
+ 'HOST': os.environ.get('POSTGRES_HOST', 'db'),
+ 'PORT': int(os.environ.get('POSTGRES_PORT', '5432')),
}
}
diff --git a/backend/store/__init__.py b/backend/store/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/backend/store/admin.py b/backend/store/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/backend/store/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/backend/store/apps.py b/backend/store/apps.py
new file mode 100644
index 0000000..41658c1
--- /dev/null
+++ b/backend/store/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class StoreConfig(AppConfig):
+ default_auto_field = 'django.db.models.BigAutoField'
+ name = 'store'
diff --git a/backend/store/migrations/__init__.py b/backend/store/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/backend/store/models.py b/backend/store/models.py
new file mode 100644
index 0000000..71a8362
--- /dev/null
+++ b/backend/store/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/backend/store/tests.py b/backend/store/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/backend/store/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/backend/store/views.py b/backend/store/views.py
new file mode 100644
index 0000000..91ea44a
--- /dev/null
+++ b/backend/store/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
From eeaedbccacf60b89ba1dd800ee6cbac0f7bc4f00 Mon Sep 17 00:00:00 2001
From: Mike Pro <mvp@mallina.su>
Date: Wed, 22 Dec 2021 19:03:14 +0300
Subject: [PATCH 03/11] Created models
---
backend/backend/settings.py | 1 +
backend/store/migrations/0001_initial.py | 49 ++++++++++++++++++++++++
backend/store/models.py | 31 +++++++++++++++
3 files changed, 81 insertions(+)
create mode 100644 backend/store/migrations/0001_initial.py
diff --git a/backend/backend/settings.py b/backend/backend/settings.py
index 0bae511..02542cd 100644
--- a/backend/backend/settings.py
+++ b/backend/backend/settings.py
@@ -38,6 +38,7 @@
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
+ 'store',
]
MIDDLEWARE = [
diff --git a/backend/store/migrations/0001_initial.py b/backend/store/migrations/0001_initial.py
new file mode 100644
index 0000000..6db3c01
--- /dev/null
+++ b/backend/store/migrations/0001_initial.py
@@ -0,0 +1,49 @@
+# Generated by Django 4.0 on 2021-12-22 16:02
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Town',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('Name', models.CharField(max_length=200)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Street',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('Name', models.CharField(max_length=200)),
+ ('Town', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='streets', to='store.town')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Store',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('Name', models.CharField(max_length=200)),
+ ('Number', models.CharField(max_length=10)),
+ ('Street', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='stores', to='store.town')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Schedule',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('Begin', models.TimeField()),
+ ('End', models.TimeField()),
+ ('DayOfWeek', models.IntegerField()),
+ ('Store', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='schedules', to='store.store')),
+ ],
+ ),
+ ]
diff --git a/backend/store/models.py b/backend/store/models.py
index 71a8362..8b98c38 100644
--- a/backend/store/models.py
+++ b/backend/store/models.py
@@ -1,3 +1,34 @@
from django.db import models
# Create your models here.
+
+
+class Town(models.Model):
+ """Town is a town"""
+ Name = models.CharField(max_length=200)
+
+
+class Street(models.Model):
+ """Street is a street of a town"""
+ Town = models.ForeignKey(Town, on_delete=models.CASCADE, related_name='streets')
+ Name = models.CharField(max_length=200)
+
+
+class Store(models.Model):
+ """Store is a store on a street in a town"""
+ Street = models.ForeignKey(Town, on_delete=models.CASCADE, related_name='stores')
+ Name = models.CharField(max_length=200)
+ Number = models.CharField(max_length=10)
+
+
+class Schedule(models.Model):
+ """Schedule of a store on a street in a town"""
+ # TODO: Add check Begin > End
+ Begin = models.TimeField()
+ End = models.TimeField()
+ # TODO: Add check of unique DayOfWeek for one Store
+ # TODO: Add check 0<=DayOfWeek<=7
+ DayOfWeek = models.IntegerField()
+ Store = models.ForeignKey(Store, on_delete=models.CASCADE, related_name='schedules')
+
+
From 76db2154beed44a3638ce90a0d9bb83262f03cbc Mon Sep 17 00:00:00 2001
From: Mike Pro <mvp@mallina.su>
Date: Wed, 22 Dec 2021 19:25:10 +0300
Subject: [PATCH 04/11] added drf
---
README.md | 5 +++++
backend/backend/api_router.py | 10 ++++++++++
backend/backend/settings.py | 24 ++++++++++++++++++++++--
backend/backend/urls.py | 3 ++-
4 files changed, 39 insertions(+), 3 deletions(-)
create mode 100644 backend/backend/api_router.py
diff --git a/README.md b/README.md
index c61e21e..3f70f20 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,11 @@
`docker-compose exec web python3 manage.py migrate`
+Создание суперпользователя:
+
+`docker-compose exec web python3 manage.py createsuperuser`
+
+
###Описание
####Функциональность
* Получение всех городов из базы данных (использовать mock-данные)
diff --git a/backend/backend/api_router.py b/backend/backend/api_router.py
new file mode 100644
index 0000000..a21e480
--- /dev/null
+++ b/backend/backend/api_router.py
@@ -0,0 +1,10 @@
+from django.conf import settings
+from rest_framework.routers import DefaultRouter, SimpleRouter
+
+if settings.DEBUG:
+ router = DefaultRouter()
+else:
+ router = SimpleRouter()
+
+app_name = "api"
+urlpatterns = router.urls
\ No newline at end of file
diff --git a/backend/backend/settings.py b/backend/backend/settings.py
index 02542cd..c53653f 100644
--- a/backend/backend/settings.py
+++ b/backend/backend/settings.py
@@ -39,6 +39,7 @@
'django.contrib.messages',
'django.contrib.staticfiles',
'store',
+ 'rest_framework',
]
MIDDLEWARE = [
@@ -109,12 +110,14 @@
# Internationalization
# https://docs.djangoproject.com/en/4.0/topics/i18n/
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'ru-ru'
-TIME_ZONE = 'UTC'
+TIME_ZONE = 'Europe/Moscow'
USE_I18N = True
+USE_L10N = True
+
USE_TZ = True
@@ -127,3 +130,20 @@
# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+REST_FRAMEWORK = {
+ # Use Django's standard `django.contrib.auth` permissions,
+ # or allow read-only access for unauthenticated users.
+ 'DEFAULT_AUTHENTICATION_CLASSES': [
+ 'rest_framework.authentication.TokenAuthentication',
+ 'rest_framework.authentication.SessionAuthentication',
+ ],
+
+ 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
+ 'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.AcceptHeaderVersioning',
+ 'DEFAULT_PERMISSION_CLASSES': [
+ 'rest_framework.permissions.IsAuthenticated'
+ ],
+ 'PAGE_SIZE': 20,
+ 'PAGE_SIZE_QUERY_PARAM':'page_size',
+}
diff --git a/backend/backend/urls.py b/backend/backend/urls.py
index 0c16445..61fec49 100644
--- a/backend/backend/urls.py
+++ b/backend/backend/urls.py
@@ -14,8 +14,9 @@
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 path, include
urlpatterns = [
+ path('api/', include('backend.api_router')),
path('admin/', admin.site.urls),
]
From d367e6d5cc1f45e3e9365653c961139e5146102f Mon Sep 17 00:00:00 2001
From: Mike Pro <mvp@mallina.su>
Date: Wed, 22 Dec 2021 20:22:44 +0300
Subject: [PATCH 05/11] Trivial serializers and viewsets created
---
backend/backend/api_router.py | 5 +++
backend/store/admin.py | 8 +++++
backend/store/api.py | 19 +++++++++++
..._rename_end_schedule_closetime_and_more.py | 23 +++++++++++++
.../migrations/0003_alter_store_street.py | 19 +++++++++++
.../migrations/0004_alter_schedule_store.py | 19 +++++++++++
backend/store/models.py | 19 ++++++++---
backend/store/serializers.py | 34 +++++++++++++++++++
8 files changed, 141 insertions(+), 5 deletions(-)
create mode 100644 backend/store/api.py
create mode 100644 backend/store/migrations/0002_rename_end_schedule_closetime_and_more.py
create mode 100644 backend/store/migrations/0003_alter_store_street.py
create mode 100644 backend/store/migrations/0004_alter_schedule_store.py
create mode 100644 backend/store/serializers.py
diff --git a/backend/backend/api_router.py b/backend/backend/api_router.py
index a21e480..a1d99f3 100644
--- a/backend/backend/api_router.py
+++ b/backend/backend/api_router.py
@@ -1,10 +1,15 @@
from django.conf import settings
from rest_framework.routers import DefaultRouter, SimpleRouter
+from store.api import TownViewSet, StreetViewSet, StoreViewSet
if settings.DEBUG:
router = DefaultRouter()
else:
router = SimpleRouter()
+router.register("town", TownViewSet)
+router.register("street", StreetViewSet)
+router.register("store", StoreViewSet)
+
app_name = "api"
urlpatterns = router.urls
\ No newline at end of file
diff --git a/backend/store/admin.py b/backend/store/admin.py
index 8c38f3f..39e02d6 100644
--- a/backend/store/admin.py
+++ b/backend/store/admin.py
@@ -1,3 +1,11 @@
from django.contrib import admin
# Register your models here.
+
+from .models import Store, Street, Schedule, Town
+
+
+admin.site.register(Town, admin.ModelAdmin)
+admin.site.register(Street, admin.ModelAdmin)
+admin.site.register(Schedule, admin.ModelAdmin)
+admin.site.register(Store, admin.ModelAdmin)
diff --git a/backend/store/api.py b/backend/store/api.py
new file mode 100644
index 0000000..8605163
--- /dev/null
+++ b/backend/store/api.py
@@ -0,0 +1,19 @@
+from rest_framework import viewsets
+
+from .models import Town, Street, Store
+from .serializers import TownSerializer, StreetSerializer, StoreSerializer
+
+
+class TownViewSet(viewsets.ModelViewSet):
+ queryset = Town.objects.all()
+ serializer_class = TownSerializer
+
+
+class StreetViewSet(viewsets.ModelViewSet):
+ queryset = Street.objects.all()
+ serializer_class = StreetSerializer
+
+
+class StoreViewSet(viewsets.ModelViewSet):
+ queryset = Store.objects.all()
+ serializer_class = StoreSerializer
diff --git a/backend/store/migrations/0002_rename_end_schedule_closetime_and_more.py b/backend/store/migrations/0002_rename_end_schedule_closetime_and_more.py
new file mode 100644
index 0000000..6f59082
--- /dev/null
+++ b/backend/store/migrations/0002_rename_end_schedule_closetime_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.0 on 2021-12-22 16:31
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('store', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='schedule',
+ old_name='End',
+ new_name='CloseTime',
+ ),
+ migrations.RenameField(
+ model_name='schedule',
+ old_name='Begin',
+ new_name='OpenTime',
+ ),
+ ]
diff --git a/backend/store/migrations/0003_alter_store_street.py b/backend/store/migrations/0003_alter_store_street.py
new file mode 100644
index 0000000..8346d9d
--- /dev/null
+++ b/backend/store/migrations/0003_alter_store_street.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.0 on 2021-12-22 16:53
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('store', '0002_rename_end_schedule_closetime_and_more'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='store',
+ name='Street',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='stores', to='store.street'),
+ ),
+ ]
diff --git a/backend/store/migrations/0004_alter_schedule_store.py b/backend/store/migrations/0004_alter_schedule_store.py
new file mode 100644
index 0000000..27aaf9b
--- /dev/null
+++ b/backend/store/migrations/0004_alter_schedule_store.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.0 on 2021-12-22 17:21
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('store', '0003_alter_store_street'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='schedule',
+ name='Store',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='schedule', to='store.store'),
+ ),
+ ]
diff --git a/backend/store/models.py b/backend/store/models.py
index 8b98c38..17edab9 100644
--- a/backend/store/models.py
+++ b/backend/store/models.py
@@ -7,28 +7,37 @@ class Town(models.Model):
"""Town is a town"""
Name = models.CharField(max_length=200)
+ def __str__(self):
+ return self.Name
+
class Street(models.Model):
"""Street is a street of a town"""
Town = models.ForeignKey(Town, on_delete=models.CASCADE, related_name='streets')
Name = models.CharField(max_length=200)
+ def __str__(self):
+ return f"{self.Town.Name}, {self.Name}"
+
class Store(models.Model):
"""Store is a store on a street in a town"""
- Street = models.ForeignKey(Town, on_delete=models.CASCADE, related_name='stores')
+ Street = models.ForeignKey(Street, on_delete=models.CASCADE, related_name='stores')
Name = models.CharField(max_length=200)
Number = models.CharField(max_length=10)
+ def __str__(self):
+ return f"{self.Street.Town.Name}, {self.Street.Name} {self.Number}, {self.Name}"
+
class Schedule(models.Model):
"""Schedule of a store on a street in a town"""
- # TODO: Add check Begin > End
- Begin = models.TimeField()
- End = models.TimeField()
+ # TODO: Add check CloseTime > OpenTime
+ OpenTime = models.TimeField()
+ CloseTime = models.TimeField()
# TODO: Add check of unique DayOfWeek for one Store
# TODO: Add check 0<=DayOfWeek<=7
DayOfWeek = models.IntegerField()
- Store = models.ForeignKey(Store, on_delete=models.CASCADE, related_name='schedules')
+ Store = models.ForeignKey(Store, on_delete=models.CASCADE, related_name='schedule')
diff --git a/backend/store/serializers.py b/backend/store/serializers.py
new file mode 100644
index 0000000..663c200
--- /dev/null
+++ b/backend/store/serializers.py
@@ -0,0 +1,34 @@
+from rest_framework import serializers
+from .models import Town, Street, Store, Schedule
+
+
+class TownSerializer(serializers.ModelSerializer):
+
+ class Meta:
+ model = Town
+ fields = ('id', 'Name',)
+
+
+class StreetSerializer(serializers.ModelSerializer):
+
+ class Meta:
+ model = Street
+ fields = ('id', 'Name', 'Town')
+
+
+class ScheduleSerializer(serializers.ModelSerializer):
+
+ class Meta:
+ model = Schedule
+ fields = ('DayOfWeek', 'OpenTime', 'CloseTime',)
+
+
+class StoreSerializer(serializers.ModelSerializer):
+ Schedule = ScheduleSerializer(many=True, read_only=True, source='schedule')
+
+ class Meta:
+ model = Store
+ fields = ('id', 'Name', 'Number', 'Street', 'Schedule')
+
+
+
From 13c3a25ea39f76389892e008d450098cbb84c668 Mon Sep 17 00:00:00 2001
From: Mike Pro <mvp@mallina.su>
Date: Wed, 22 Dec 2021 21:30:13 +0300
Subject: [PATCH 06/11] Mock data generator
---
README.md | 11 +++-
backend/store/management/__init__.py | 0
backend/store/management/commands/__init__.py | 0
.../management/commands/createmockdata.py | 51 +++++++++++++++++++
...001_squashed_0004_alter_schedule_store.py} | 12 +++--
..._rename_end_schedule_closetime_and_more.py | 23 ---------
.../migrations/0003_alter_store_street.py | 19 -------
.../migrations/0004_alter_schedule_store.py | 19 -------
backend/store/models.py | 1 -
requirements.txt | 7 +--
10 files changed, 70 insertions(+), 73 deletions(-)
create mode 100644 backend/store/management/__init__.py
create mode 100644 backend/store/management/commands/__init__.py
create mode 100644 backend/store/management/commands/createmockdata.py
rename backend/store/migrations/{0001_initial.py => 0001_squashed_0004_alter_schedule_store.py} (77%)
delete mode 100644 backend/store/migrations/0002_rename_end_schedule_closetime_and_more.py
delete mode 100644 backend/store/migrations/0003_alter_store_street.py
delete mode 100644 backend/store/migrations/0004_alter_schedule_store.py
diff --git a/README.md b/README.md
index 3f70f20..cdb6feb 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,13 @@
`docker-compose exec web python3 manage.py createsuperuser`
+Для того чтобы авторизоваться нужно зайти на http://localhost:8000/admin
+
+API находится на http://localhost:8000/api
+
+Создание фейковых данных:
+
+`docker-compose exec web python3 manage.py createmockdata`
###Описание
####Функциональность
@@ -34,4 +41,6 @@
* Работа с Docker будет большим плюсом
* Обратить внимание на проектирование таблиц базы данных. Вероятно, здесь будет не одна таблица и будут применимы внешние ключи (Foreign Key).
-###
\ No newline at end of file
+###
+
+[http://localhost:8000/admin]: http://localhost:8000/admin
\ No newline at end of file
diff --git a/backend/store/management/__init__.py b/backend/store/management/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/backend/store/management/commands/__init__.py b/backend/store/management/commands/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/backend/store/management/commands/createmockdata.py b/backend/store/management/commands/createmockdata.py
new file mode 100644
index 0000000..07e9880
--- /dev/null
+++ b/backend/store/management/commands/createmockdata.py
@@ -0,0 +1,51 @@
+from django.core.management.base import BaseCommand, CommandError
+from faker import Faker
+import random
+from store.models import Town, Street, Store, Schedule
+from datetime import time
+
+
+class Command(BaseCommand):
+ help = 'Create fake data'
+
+ def handle(self, *args, **options):
+ # TODO: add arguments to command
+ # TODO: replace magic constants
+ fake = Faker()
+
+ def random_bool():
+ return random.random() > 0.1
+
+ towns_created = 0
+ while towns_created < 10 or (towns_created < 300 and random_bool()):
+ Town.objects.create(Name=fake.city())
+ towns_created += 1
+ self.stdout.write(f'Created {towns_created} random towns')
+
+ towns = Town.objects.all()
+ streets_created = 0
+
+ while streets_created < 30 or (streets_created < 900 and random_bool()):
+ Street.objects.create(Name=fake.street_name(), Town=random.choice(towns))
+ streets_created += 1
+ self.stdout.write(f'Created {streets_created} random streets')
+
+ streets = Street.objects.all()
+ stores_created = 0
+
+ while stores_created < 90 or (stores_created < 2700 and random_bool()):
+ store = Store.objects.create(
+ Name=fake.bs(),
+ Street=random.choice(streets),
+ Number=fake.building_number(),
+ )
+ stores_created += 1
+ for DayOfWeek in range(0, 7):
+ if random_bool():
+ Schedule.objects.create(
+ Store=store,
+ DayOfWeek=DayOfWeek,
+ OpenTime=time(random.randint(0, 23), random.randint(0, 11) * 5),
+ CloseTime=time(random.randint(0, 23), random.randint(0, 11) * 5),
+ )
+ self.stdout.write(f'Created {stores_created} random stores')
diff --git a/backend/store/migrations/0001_initial.py b/backend/store/migrations/0001_squashed_0004_alter_schedule_store.py
similarity index 77%
rename from backend/store/migrations/0001_initial.py
rename to backend/store/migrations/0001_squashed_0004_alter_schedule_store.py
index 6db3c01..42a95de 100644
--- a/backend/store/migrations/0001_initial.py
+++ b/backend/store/migrations/0001_squashed_0004_alter_schedule_store.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.0 on 2021-12-22 16:02
+# Generated by Django 4.0 on 2021-12-22 17:42
from django.db import migrations, models
import django.db.models.deletion
@@ -6,6 +6,8 @@
class Migration(migrations.Migration):
+ replaces = [('store', '0001_initial'), ('store', '0002_rename_end_schedule_closetime_and_more'), ('store', '0003_alter_store_street'), ('store', '0004_alter_schedule_store')]
+
initial = True
dependencies = [
@@ -33,17 +35,17 @@ class Migration(migrations.Migration):
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('Name', models.CharField(max_length=200)),
('Number', models.CharField(max_length=10)),
- ('Street', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='stores', to='store.town')),
+ ('Street', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='stores', to='store.street')),
],
),
migrations.CreateModel(
name='Schedule',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('Begin', models.TimeField()),
- ('End', models.TimeField()),
+ ('OpenTime', models.TimeField()),
+ ('CloseTime', models.TimeField()),
('DayOfWeek', models.IntegerField()),
- ('Store', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='schedules', to='store.store')),
+ ('Store', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='schedule', to='store.store')),
],
),
]
diff --git a/backend/store/migrations/0002_rename_end_schedule_closetime_and_more.py b/backend/store/migrations/0002_rename_end_schedule_closetime_and_more.py
deleted file mode 100644
index 6f59082..0000000
--- a/backend/store/migrations/0002_rename_end_schedule_closetime_and_more.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 4.0 on 2021-12-22 16:31
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('store', '0001_initial'),
- ]
-
- operations = [
- migrations.RenameField(
- model_name='schedule',
- old_name='End',
- new_name='CloseTime',
- ),
- migrations.RenameField(
- model_name='schedule',
- old_name='Begin',
- new_name='OpenTime',
- ),
- ]
diff --git a/backend/store/migrations/0003_alter_store_street.py b/backend/store/migrations/0003_alter_store_street.py
deleted file mode 100644
index 8346d9d..0000000
--- a/backend/store/migrations/0003_alter_store_street.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 4.0 on 2021-12-22 16:53
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('store', '0002_rename_end_schedule_closetime_and_more'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='store',
- name='Street',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='stores', to='store.street'),
- ),
- ]
diff --git a/backend/store/migrations/0004_alter_schedule_store.py b/backend/store/migrations/0004_alter_schedule_store.py
deleted file mode 100644
index 27aaf9b..0000000
--- a/backend/store/migrations/0004_alter_schedule_store.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 4.0 on 2021-12-22 17:21
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('store', '0003_alter_store_street'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='schedule',
- name='Store',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='schedule', to='store.store'),
- ),
- ]
diff --git a/backend/store/models.py b/backend/store/models.py
index 17edab9..f5fedde 100644
--- a/backend/store/models.py
+++ b/backend/store/models.py
@@ -32,7 +32,6 @@ def __str__(self):
class Schedule(models.Model):
"""Schedule of a store on a street in a town"""
- # TODO: Add check CloseTime > OpenTime
OpenTime = models.TimeField()
CloseTime = models.TimeField()
# TODO: Add check of unique DayOfWeek for one Store
diff --git a/requirements.txt b/requirements.txt
index 34b5cf1..4873936 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,5 @@
Django>=4.0,<5.0
psycopg2-binary
djangorestframework
-gunicorn
-numpy
-python-dateutil
-freezegun
-ipython
\ No newline at end of file
+ipython
+Faker
\ No newline at end of file
From 371166c234990a80c40e1b4b6baee85a456ec8d7 Mon Sep 17 00:00:00 2001
From: Mike Pro <mvp@mallina.su>
Date: Wed, 22 Dec 2021 21:36:01 +0300
Subject: [PATCH 07/11] Add Comment field to Store
---
.../management/commands/createmockdata.py | 1 +
.../store/migrations/0002_store_comment.py | 19 +++++++++++++++++++
backend/store/models.py | 1 +
backend/store/serializers.py | 2 +-
4 files changed, 22 insertions(+), 1 deletion(-)
create mode 100644 backend/store/migrations/0002_store_comment.py
diff --git a/backend/store/management/commands/createmockdata.py b/backend/store/management/commands/createmockdata.py
index 07e9880..92d23c2 100644
--- a/backend/store/management/commands/createmockdata.py
+++ b/backend/store/management/commands/createmockdata.py
@@ -38,6 +38,7 @@ def random_bool():
Name=fake.bs(),
Street=random.choice(streets),
Number=fake.building_number(),
+ Comment=fake.catch_phrase(),
)
stores_created += 1
for DayOfWeek in range(0, 7):
diff --git a/backend/store/migrations/0002_store_comment.py b/backend/store/migrations/0002_store_comment.py
new file mode 100644
index 0000000..9e5fd5f
--- /dev/null
+++ b/backend/store/migrations/0002_store_comment.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.0 on 2021-12-22 18:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('store', '0001_squashed_0004_alter_schedule_store'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='store',
+ name='Comment',
+ field=models.TextField(default=''),
+ preserve_default=False,
+ ),
+ ]
diff --git a/backend/store/models.py b/backend/store/models.py
index f5fedde..2ea2b59 100644
--- a/backend/store/models.py
+++ b/backend/store/models.py
@@ -25,6 +25,7 @@ class Store(models.Model):
Street = models.ForeignKey(Street, on_delete=models.CASCADE, related_name='stores')
Name = models.CharField(max_length=200)
Number = models.CharField(max_length=10)
+ Comment = models.TextField(blank=True)
def __str__(self):
return f"{self.Street.Town.Name}, {self.Street.Name} {self.Number}, {self.Name}"
diff --git a/backend/store/serializers.py b/backend/store/serializers.py
index 663c200..0e0aba9 100644
--- a/backend/store/serializers.py
+++ b/backend/store/serializers.py
@@ -28,7 +28,7 @@ class StoreSerializer(serializers.ModelSerializer):
class Meta:
model = Store
- fields = ('id', 'Name', 'Number', 'Street', 'Schedule')
+ fields = ('id', 'Name', 'Comment' , 'Number', 'Street', 'Schedule')
From 722c4e175cfc03afe16f2d7b0d521b3b9a8b9b00 Mon Sep 17 00:00:00 2001
From: Mike Pro <mvp@mallina.su>
Date: Wed, 22 Dec 2021 21:43:00 +0300
Subject: [PATCH 08/11] Improved Store Serializer
---
backend/store/models.py | 2 ++
backend/store/serializers.py | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/backend/store/models.py b/backend/store/models.py
index 2ea2b59..0fcfd5f 100644
--- a/backend/store/models.py
+++ b/backend/store/models.py
@@ -5,6 +5,7 @@
class Town(models.Model):
"""Town is a town"""
+ # TODO: Make Name Unique
Name = models.CharField(max_length=200)
def __str__(self):
@@ -13,6 +14,7 @@ def __str__(self):
class Street(models.Model):
"""Street is a street of a town"""
+ # TODO: Make Unique Together
Town = models.ForeignKey(Town, on_delete=models.CASCADE, related_name='streets')
Name = models.CharField(max_length=200)
diff --git a/backend/store/serializers.py b/backend/store/serializers.py
index 0e0aba9..1eeca8f 100644
--- a/backend/store/serializers.py
+++ b/backend/store/serializers.py
@@ -25,10 +25,12 @@ class Meta:
class StoreSerializer(serializers.ModelSerializer):
Schedule = ScheduleSerializer(many=True, read_only=True, source='schedule')
+ Town = serializers.CharField(source='Street.Town.Name')
+ Street = serializers.CharField(source='Street.Name')
class Meta:
model = Store
- fields = ('id', 'Name', 'Comment' , 'Number', 'Street', 'Schedule')
+ fields = ('id', 'Name', 'Comment', 'Town', 'Street', 'Number', 'Street', 'Schedule')
From ba521e14a1be0336aed1b81ea513b8597ca46e3f Mon Sep 17 00:00:00 2001
From: Mike Pro <mvp@mallina.su>
Date: Wed, 22 Dec 2021 22:44:55 +0300
Subject: [PATCH 09/11] realize store serializer create method
---
README.md | 8 ++--
backend/backend/settings.py | 2 +-
...lter_schedule_store_alter_store_comment.py | 24 ++++++++++
backend/store/models.py | 2 +-
backend/store/serializers.py | 24 +++++++---
backend/store/tests.py | 45 ++++++++++++++++++-
6 files changed, 93 insertions(+), 12 deletions(-)
create mode 100644 backend/store/migrations/0003_alter_schedule_store_alter_store_comment.py
diff --git a/README.md b/README.md
index cdb6feb..8bd456e 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,11 @@ API находится на http://localhost:8000/api
`docker-compose exec web python3 manage.py createmockdata`
+
+Запуск тестов:
+
+`docker-compose exec web python3 manage.py test --keepdb`
+
###Описание
####Функциональность
* Получение всех городов из базы данных (использовать mock-данные)
@@ -41,6 +46,3 @@ API находится на http://localhost:8000/api
* Работа с Docker будет большим плюсом
* Обратить внимание на проектирование таблиц базы данных. Вероятно, здесь будет не одна таблица и будут применимы внешние ключи (Foreign Key).
-###
-
-[http://localhost:8000/admin]: http://localhost:8000/admin
\ No newline at end of file
diff --git a/backend/backend/settings.py b/backend/backend/settings.py
index c53653f..31f2e6b 100644
--- a/backend/backend/settings.py
+++ b/backend/backend/settings.py
@@ -110,7 +110,7 @@
# Internationalization
# https://docs.djangoproject.com/en/4.0/topics/i18n/
-LANGUAGE_CODE = 'ru-ru'
+LANGUAGE_CODE = 'en-us'
TIME_ZONE = 'Europe/Moscow'
diff --git a/backend/store/migrations/0003_alter_schedule_store_alter_store_comment.py b/backend/store/migrations/0003_alter_schedule_store_alter_store_comment.py
new file mode 100644
index 0000000..9cc7550
--- /dev/null
+++ b/backend/store/migrations/0003_alter_schedule_store_alter_store_comment.py
@@ -0,0 +1,24 @@
+# Generated by Django 4.0 on 2021-12-22 19:32
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('store', '0002_store_comment'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='schedule',
+ name='Store',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='Schedule', to='store.store'),
+ ),
+ migrations.AlterField(
+ model_name='store',
+ name='Comment',
+ field=models.TextField(blank=True),
+ ),
+ ]
diff --git a/backend/store/models.py b/backend/store/models.py
index 0fcfd5f..7eccf0e 100644
--- a/backend/store/models.py
+++ b/backend/store/models.py
@@ -40,6 +40,6 @@ class Schedule(models.Model):
# TODO: Add check of unique DayOfWeek for one Store
# TODO: Add check 0<=DayOfWeek<=7
DayOfWeek = models.IntegerField()
- Store = models.ForeignKey(Store, on_delete=models.CASCADE, related_name='schedule')
+ Store = models.ForeignKey(Store, on_delete=models.CASCADE, related_name='Schedule')
diff --git a/backend/store/serializers.py b/backend/store/serializers.py
index 1eeca8f..c8a692d 100644
--- a/backend/store/serializers.py
+++ b/backend/store/serializers.py
@@ -3,28 +3,25 @@
class TownSerializer(serializers.ModelSerializer):
-
class Meta:
model = Town
fields = ('id', 'Name',)
class StreetSerializer(serializers.ModelSerializer):
-
class Meta:
model = Street
fields = ('id', 'Name', 'Town')
class ScheduleSerializer(serializers.ModelSerializer):
-
class Meta:
model = Schedule
fields = ('DayOfWeek', 'OpenTime', 'CloseTime',)
class StoreSerializer(serializers.ModelSerializer):
- Schedule = ScheduleSerializer(many=True, read_only=True, source='schedule')
+ Schedule = ScheduleSerializer(many=True, read_only=False)
Town = serializers.CharField(source='Street.Town.Name')
Street = serializers.CharField(source='Street.Name')
@@ -32,5 +29,20 @@ class Meta:
model = Store
fields = ('id', 'Name', 'Comment', 'Town', 'Street', 'Number', 'Street', 'Schedule')
-
-
+ def create(self, validated_data):
+ if 'Schedule' in validated_data:
+ schedule = validated_data['Schedule']
+ del validated_data['Schedule']
+ if 'Street' in validated_data:
+ street_name = validated_data['Street'].get('Name', '')
+ if 'Town' in validated_data['Street']:
+ town_name = validated_data['Street']['Town'].get('Name', '')
+ if not street_name or not town_name:
+ raise serializers.ValidationError
+
+ town, created = Town.objects.get_or_create(Name=town_name)
+ validated_data['Street'], created = Street.objects.get_or_create(Town=town, Name=street_name)
+ instance = Store.objects.create(**validated_data)
+ for schedule_validated_data in schedule:
+ Schedule.objects.create(Store=instance, **schedule_validated_data)
+ return instance
diff --git a/backend/store/tests.py b/backend/store/tests.py
index 7ce503c..f032741 100644
--- a/backend/store/tests.py
+++ b/backend/store/tests.py
@@ -1,3 +1,46 @@
from django.test import TestCase
+from rest_framework.test import APIClient
+from rest_framework.test import force_authenticate, APIRequestFactory
+from rest_framework import status
+from .models import Store, Schedule
+from django.db.models import Max
+from django.contrib.auth.models import User
-# Create your tests here.
+class CRUD_Tests(TestCase):
+ """
+ """
+
+ def setUp(self):
+ self.client = APIClient()
+ user, created = User.objects.get_or_create(username='root')
+ self.client.force_authenticate(user=user)
+
+ def test_creation(self):
+ """
+ случай корректного запроса POST /api/store
+ """
+
+ request_json = \
+ {
+ "Name": "extend interactive networks",
+ "Comment": "Re-contextualized system-worthy structure",
+ "Town": "Sanchezberg",
+ "Street": "Ruth Neck",
+ "Number": "14817",
+ "Schedule": [
+ {
+ "DayOfWeek": 1,
+ "OpenTime": "10:15:00",
+ "CloseTime": "18:00:00"
+ },
+ {
+ "DayOfWeek": 2,
+ "OpenTime": "09:30:00",
+ "CloseTime": "12:20:00"
+ },
+ ]}
+ response = self.client.post('/api/store/', request_json, format='json')
+ self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+ self.assertIn("id", response.data, "Некорректный ответ сервера")
+ store = Store.objects.get(pk=response.data["id"])
+ self.assertEqual(2, store.Schedule.count(), 'No correct Schedule')
From 291a8eccd94725b296a837809401fdfe9f8b7aa2 Mon Sep 17 00:00:00 2001
From: Mike Pro <mvp@mallina.su>
Date: Wed, 22 Dec 2021 23:03:31 +0300
Subject: [PATCH 10/11] unique town names and unique street names
---
.../management/commands/createmockdata.py | 18 ++++++++++----
...squashed_0005_alter_schedule_dayofweek.py} | 15 ++++++++----
.../store/migrations/0002_store_comment.py | 19 ---------------
...lter_schedule_store_alter_store_comment.py | 24 -------------------
backend/store/models.py | 16 ++++++-------
backend/store/tests.py | 1 +
6 files changed, 31 insertions(+), 62 deletions(-)
rename backend/store/migrations/{0001_squashed_0004_alter_schedule_store.py => 0001_squashed_0005_alter_schedule_dayofweek.py} (68%)
delete mode 100644 backend/store/migrations/0002_store_comment.py
delete mode 100644 backend/store/migrations/0003_alter_schedule_store_alter_store_comment.py
diff --git a/backend/store/management/commands/createmockdata.py b/backend/store/management/commands/createmockdata.py
index 92d23c2..7e003f1 100644
--- a/backend/store/management/commands/createmockdata.py
+++ b/backend/store/management/commands/createmockdata.py
@@ -3,6 +3,7 @@
import random
from store.models import Town, Street, Store, Schedule
from datetime import time
+from django.db import IntegrityError
class Command(BaseCommand):
@@ -18,16 +19,22 @@ def random_bool():
towns_created = 0
while towns_created < 10 or (towns_created < 300 and random_bool()):
- Town.objects.create(Name=fake.city())
- towns_created += 1
+ try:
+ Town.objects.create(Name=fake.city())
+ towns_created += 1
+ except IntegrityError:
+ continue
self.stdout.write(f'Created {towns_created} random towns')
towns = Town.objects.all()
streets_created = 0
while streets_created < 30 or (streets_created < 900 and random_bool()):
- Street.objects.create(Name=fake.street_name(), Town=random.choice(towns))
- streets_created += 1
+ try:
+ Street.objects.create(Name=fake.street_name(), Town=random.choice(towns))
+ streets_created += 1
+ except IntegrityError:
+ continue
self.stdout.write(f'Created {streets_created} random streets')
streets = Street.objects.all()
@@ -40,7 +47,8 @@ def random_bool():
Number=fake.building_number(),
Comment=fake.catch_phrase(),
)
- stores_created += 1
+ if store:
+ stores_created += 1
for DayOfWeek in range(0, 7):
if random_bool():
Schedule.objects.create(
diff --git a/backend/store/migrations/0001_squashed_0004_alter_schedule_store.py b/backend/store/migrations/0001_squashed_0005_alter_schedule_dayofweek.py
similarity index 68%
rename from backend/store/migrations/0001_squashed_0004_alter_schedule_store.py
rename to backend/store/migrations/0001_squashed_0005_alter_schedule_dayofweek.py
index 42a95de..9f4b8b5 100644
--- a/backend/store/migrations/0001_squashed_0004_alter_schedule_store.py
+++ b/backend/store/migrations/0001_squashed_0005_alter_schedule_dayofweek.py
@@ -1,12 +1,13 @@
-# Generated by Django 4.0 on 2021-12-22 17:42
+# Generated by Django 4.0 on 2021-12-22 20:01
+import django.core.validators
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
- replaces = [('store', '0001_initial'), ('store', '0002_rename_end_schedule_closetime_and_more'), ('store', '0003_alter_store_street'), ('store', '0004_alter_schedule_store')]
+ replaces = [('store', '0001_squashed_0004_alter_schedule_store'), ('store', '0002_store_comment'), ('store', '0003_alter_schedule_store_alter_store_comment'), ('store', '0004_alter_town_name_alter_street_unique_together'), ('store', '0005_alter_schedule_dayofweek')]
initial = True
@@ -18,7 +19,7 @@ class Migration(migrations.Migration):
name='Town',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('Name', models.CharField(max_length=200)),
+ ('Name', models.CharField(max_length=200, unique=True)),
],
),
migrations.CreateModel(
@@ -28,6 +29,9 @@ class Migration(migrations.Migration):
('Name', models.CharField(max_length=200)),
('Town', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='streets', to='store.town')),
],
+ options={
+ 'unique_together': {('Town', 'Name')},
+ },
),
migrations.CreateModel(
name='Store',
@@ -36,6 +40,7 @@ class Migration(migrations.Migration):
('Name', models.CharField(max_length=200)),
('Number', models.CharField(max_length=10)),
('Street', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='stores', to='store.street')),
+ ('Comment', models.TextField(blank=True)),
],
),
migrations.CreateModel(
@@ -44,8 +49,8 @@ class Migration(migrations.Migration):
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('OpenTime', models.TimeField()),
('CloseTime', models.TimeField()),
- ('DayOfWeek', models.IntegerField()),
- ('Store', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='schedule', to='store.store')),
+ ('DayOfWeek', models.IntegerField(validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(7)])),
+ ('Store', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='Schedule', to='store.store')),
],
),
]
diff --git a/backend/store/migrations/0002_store_comment.py b/backend/store/migrations/0002_store_comment.py
deleted file mode 100644
index 9e5fd5f..0000000
--- a/backend/store/migrations/0002_store_comment.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 4.0 on 2021-12-22 18:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('store', '0001_squashed_0004_alter_schedule_store'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='store',
- name='Comment',
- field=models.TextField(default=''),
- preserve_default=False,
- ),
- ]
diff --git a/backend/store/migrations/0003_alter_schedule_store_alter_store_comment.py b/backend/store/migrations/0003_alter_schedule_store_alter_store_comment.py
deleted file mode 100644
index 9cc7550..0000000
--- a/backend/store/migrations/0003_alter_schedule_store_alter_store_comment.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated by Django 4.0 on 2021-12-22 19:32
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('store', '0002_store_comment'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='schedule',
- name='Store',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='Schedule', to='store.store'),
- ),
- migrations.AlterField(
- model_name='store',
- name='Comment',
- field=models.TextField(blank=True),
- ),
- ]
diff --git a/backend/store/models.py b/backend/store/models.py
index 7eccf0e..159f3f7 100644
--- a/backend/store/models.py
+++ b/backend/store/models.py
@@ -1,12 +1,10 @@
from django.db import models
-
-# Create your models here.
+from django.core.validators import MaxValueValidator, MinValueValidator
class Town(models.Model):
"""Town is a town"""
- # TODO: Make Name Unique
- Name = models.CharField(max_length=200)
+ Name = models.CharField(max_length=200, unique=True)
def __str__(self):
return self.Name
@@ -14,7 +12,10 @@ def __str__(self):
class Street(models.Model):
"""Street is a street of a town"""
- # TODO: Make Unique Together
+
+ class Meta:
+ unique_together = [['Town', 'Name']]
+
Town = models.ForeignKey(Town, on_delete=models.CASCADE, related_name='streets')
Name = models.CharField(max_length=200)
@@ -38,8 +39,5 @@ class Schedule(models.Model):
OpenTime = models.TimeField()
CloseTime = models.TimeField()
# TODO: Add check of unique DayOfWeek for one Store
- # TODO: Add check 0<=DayOfWeek<=7
- DayOfWeek = models.IntegerField()
+ DayOfWeek = models.IntegerField(validators=[MinValueValidator(0), MaxValueValidator(7)])
Store = models.ForeignKey(Store, on_delete=models.CASCADE, related_name='Schedule')
-
-
diff --git a/backend/store/tests.py b/backend/store/tests.py
index f032741..81e333f 100644
--- a/backend/store/tests.py
+++ b/backend/store/tests.py
@@ -6,6 +6,7 @@
from django.db.models import Max
from django.contrib.auth.models import User
+
class CRUD_Tests(TestCase):
"""
"""
From bcb30a5696747753d1ecb9b0f4ea96afbee066d9 Mon Sep 17 00:00:00 2001
From: Mike Pro <mvp@mallina.su>
Date: Wed, 22 Dec 2021 23:31:56 +0300
Subject: [PATCH 11/11] added filters
---
backend/backend/settings.py | 3 ++-
backend/store/api.py | 17 ++++++++++++++++-
requirements.txt | 1 +
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/backend/backend/settings.py b/backend/backend/settings.py
index 31f2e6b..5a23d6f 100644
--- a/backend/backend/settings.py
+++ b/backend/backend/settings.py
@@ -40,6 +40,7 @@
'django.contrib.staticfiles',
'store',
'rest_framework',
+ 'django_filters',
]
MIDDLEWARE = [
@@ -138,7 +139,7 @@
'rest_framework.authentication.TokenAuthentication',
'rest_framework.authentication.SessionAuthentication',
],
-
+ 'DEFAULT_FILTER_BACKENDS': ['django_filters.rest_framework.DjangoFilterBackend'],
'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.AcceptHeaderVersioning',
'DEFAULT_PERMISSION_CLASSES': [
diff --git a/backend/store/api.py b/backend/store/api.py
index 8605163..225ce65 100644
--- a/backend/store/api.py
+++ b/backend/store/api.py
@@ -1,5 +1,6 @@
from rest_framework import viewsets
-
+import django_filters
+from django_filters.rest_framework import DjangoFilterBackend, FilterSet
from .models import Town, Street, Store
from .serializers import TownSerializer, StreetSerializer, StoreSerializer
@@ -14,6 +15,20 @@ class StreetViewSet(viewsets.ModelViewSet):
serializer_class = StreetSerializer
+class StoreFilter(FilterSet):
+ Name = django_filters.CharFilter(field_name='Name', lookup_expr='icontains')
+ Comment = django_filters.CharFilter(field_name='Comment', lookup_expr='icontains')
+ Town = django_filters.CharFilter(field_name='Street__Town__Name', lookup_expr='icontains')
+ Street = django_filters.CharFilter(field_name='Street__Name', lookup_expr='icontains')
+ Number = django_filters.CharFilter(field_name='Number', lookup_expr='icontains')
+
+ class Meta:
+ model = Store
+ fields = ['Name', 'Comment', 'Town', 'Street', 'Number']
+
+
class StoreViewSet(viewsets.ModelViewSet):
queryset = Store.objects.all()
serializer_class = StoreSerializer
+ filter_backends = [DjangoFilterBackend]
+ filter_class = StoreFilter
diff --git a/requirements.txt b/requirements.txt
index 4873936..1862741 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
Django>=4.0,<5.0
psycopg2-binary
djangorestframework
+django-filter
ipython
Faker
\ No newline at end of file