feat: MVP-скелет площадки (Django + MySQL/SQLite, модели по ТЗ §4, базовые страницы)
This commit is contained in:
1 parent
e5f312a00f
commit
8218a568ce
67 files changed
+1929
No files matched your search
Whitespace-only changes.
Whitespace-only changes.
@@ -0,0 +1,14 @@
|
||||
from django.contrib import admin
|
||||
from django.contrib.auth.admin import UserAdmin
|
||||
|
||||
from .models import User
|
||||
|
||||
|
||||
@admin.register(User)
|
||||
class CustomUserAdmin(UserAdmin):
|
||||
list_display = ('username', 'full_name', 'role', 'phone', 'region', 'is_staff')
|
||||
list_filter = ('role', 'is_staff', 'is_active')
|
||||
search_fields = ('username', 'full_name', 'phone', 'email')
|
||||
fieldsets = UserAdmin.fieldsets + (
|
||||
('Профиль', {'fields': ('role', 'full_name', 'phone', 'birth_date', 'region')}),
|
||||
)
|
||||
@@ -0,0 +1,7 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class AccountsConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'apps.accounts'
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
# Generated by Django 5.1.15 on 2026-09-23 13:44
|
||||
|
||||
import django.contrib.auth.models
|
||||
import django.contrib.auth.validators
|
||||
import django.utils.timezone
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
('auth', '0012_alter_user_first_name_max_length'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='User',
|
||||
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')),
|
||||
('role', models.CharField(choices=[('buyer', 'Покупатель'), ('seller', 'Продавец'), ('moderator', 'Модератор'), ('admin', 'Администратор'), ('partner', 'Партнёр (Росмолодёжь)')], default='buyer', max_length=20, verbose_name='Роль')),
|
||||
('full_name', models.CharField(blank=True, max_length=255, verbose_name='ФИО')),
|
||||
('phone', models.CharField(blank=True, max_length=32, verbose_name='Телефон')),
|
||||
('birth_date', models.DateField(blank=True, null=True, verbose_name='Дата рождения')),
|
||||
('region', models.CharField(blank=True, max_length=120, verbose_name='Регион')),
|
||||
('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': 'Пользователь',
|
||||
'verbose_name_plural': 'Пользователи',
|
||||
},
|
||||
managers=[
|
||||
('objects', django.contrib.auth.models.UserManager()),
|
||||
],
|
||||
),
|
||||
]
|
||||
Whitespace-only changes.
@@ -0,0 +1,49 @@
|
||||
from django.contrib.auth.models import AbstractUser
|
||||
from django.db import models
|
||||
|
||||
|
||||
class Role(models.TextChoices):
|
||||
"""Роли пользователей (ТЗ §2)."""
|
||||
|
||||
BUYER = 'buyer', 'Покупатель'
|
||||
SELLER = 'seller', 'Продавец'
|
||||
MODERATOR = 'moderator', 'Модератор'
|
||||
ADMIN = 'admin', 'Администратор'
|
||||
PARTNER = 'partner', 'Партнёр (Росмолодёжь)'
|
||||
|
||||
|
||||
class User(AbstractUser):
|
||||
"""Пользователь площадки (ТЗ §4: User)."""
|
||||
|
||||
role = models.CharField(
|
||||
'Роль', max_length=20, choices=Role.choices, default=Role.BUYER,
|
||||
)
|
||||
full_name = models.CharField('ФИО', max_length=255, blank=True)
|
||||
phone = models.CharField('Телефон', max_length=32, blank=True)
|
||||
birth_date = models.DateField('Дата рождения', null=True, blank=True)
|
||||
region = models.CharField('Регион', max_length=120, blank=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Пользователь'
|
||||
verbose_name_plural = 'Пользователи'
|
||||
|
||||
def __str__(self):
|
||||
return self.full_name or self.username
|
||||
|
||||
@property
|
||||
def is_seller(self):
|
||||
return self.role == Role.SELLER
|
||||
|
||||
@property
|
||||
def age(self):
|
||||
"""Возвращает возраст в годах или None, если дата не указана."""
|
||||
from datetime import date
|
||||
|
||||
if not self.birth_date:
|
||||
return None
|
||||
today = date.today()
|
||||
return (
|
||||
today.year
|
||||
- self.birth_date.year
|
||||
- ((today.month, today.day) < (self.birth_date.month, self.birth_date.day))
|
||||
)
|
||||
@@ -0,0 +1,3 @@
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@@ -0,0 +1,3 @@
|
||||
from django.shortcuts import render
|
||||
|
||||
# Create your views here.
|
||||
Whitespace-only changes.
@@ -0,0 +1,52 @@
|
||||
from django.contrib import admin
|
||||
|
||||
from .models import Brand, Category, Product, ProductImage, Service, TimeSlot
|
||||
|
||||
|
||||
class ProductImageInline(admin.TabularInline):
|
||||
model = ProductImage
|
||||
extra = 1
|
||||
|
||||
|
||||
@admin.register(Category)
|
||||
class CategoryAdmin(admin.ModelAdmin):
|
||||
list_display = ('name', 'type', 'parent', 'sort_order')
|
||||
list_filter = ('type',)
|
||||
prepopulated_fields = {'slug': ('name',)}
|
||||
search_fields = ('name',)
|
||||
|
||||
|
||||
@admin.register(Brand)
|
||||
class BrandAdmin(admin.ModelAdmin):
|
||||
list_display = ('name', 'user', 'legal_status', 'verification_status', 'rating')
|
||||
list_filter = ('verification_status', 'legal_status')
|
||||
search_fields = ('name', 'inn', 'city')
|
||||
prepopulated_fields = {'slug': ('name',)}
|
||||
|
||||
|
||||
@admin.register(Product)
|
||||
class ProductAdmin(admin.ModelAdmin):
|
||||
list_display = ('name', 'brand', 'category', 'price', 'stock', 'moderation_status', 'is_active')
|
||||
list_filter = ('moderation_status', 'is_active', 'category')
|
||||
search_fields = ('name', 'brand__name')
|
||||
prepopulated_fields = {'slug': ('name',)}
|
||||
inlines = [ProductImageInline]
|
||||
|
||||
|
||||
@admin.register(ProductImage)
|
||||
class ProductImageAdmin(admin.ModelAdmin):
|
||||
list_display = ('product', 'sort_order')
|
||||
|
||||
|
||||
@admin.register(Service)
|
||||
class ServiceAdmin(admin.ModelAdmin):
|
||||
list_display = ('name', 'brand', 'format', 'duration_minutes', 'price', 'moderation_status')
|
||||
list_filter = ('format', 'moderation_status')
|
||||
search_fields = ('name', 'brand__name')
|
||||
prepopulated_fields = {'slug': ('name',)}
|
||||
|
||||
|
||||
@admin.register(TimeSlot)
|
||||
class TimeSlotAdmin(admin.ModelAdmin):
|
||||
list_display = ('service', 'start', 'end', 'is_booked')
|
||||
list_filter = ('is_booked',)
|
||||
@@ -0,0 +1,7 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class CatalogConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'apps.catalog'
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
# Generated by Django 5.1.15 on 2026-09-23 13:44
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Brand',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=200, verbose_name='Название бренда')),
|
||||
('slug', models.SlugField(blank=True, max_length=220, unique=True, verbose_name='Slug')),
|
||||
('logo', models.ImageField(blank=True, null=True, upload_to='brands/logos/', verbose_name='Логотип')),
|
||||
('cover', models.ImageField(blank=True, null=True, upload_to='brands/covers/', verbose_name='Обложка')),
|
||||
('story', models.TextField(blank=True, max_length=3000, verbose_name='История бренда')),
|
||||
('legal_status', models.CharField(choices=[('self_employed', 'Самозанятый'), ('ip', 'ИП'), ('legal', 'Юрлицо')], default='self_employed', max_length=20, verbose_name='Правовой статус')),
|
||||
('inn', models.CharField(blank=True, max_length=12, verbose_name='ИНН')),
|
||||
('region', models.CharField(blank=True, max_length=120, verbose_name='Регион')),
|
||||
('city', models.CharField(blank=True, max_length=120, verbose_name='Город')),
|
||||
('socials', models.JSONField(blank=True, default=dict, verbose_name='Соцсети')),
|
||||
('verification_status', models.CharField(choices=[('pending', 'На проверке'), ('approved', 'Одобрен'), ('revision', 'На доработке'), ('rejected', 'Отклонён')], default='pending', max_length=20, verbose_name='Статус верификации')),
|
||||
('badges', models.JSONField(blank=True, default=list, verbose_name='Знаки')),
|
||||
('rating', models.DecimalField(decimal_places=2, default=0, max_digits=3, verbose_name='Рейтинг')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
|
||||
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='brand', to=settings.AUTH_USER_MODEL, verbose_name='Владелец')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Бренд',
|
||||
'verbose_name_plural': 'Бренды',
|
||||
'ordering': ('name',),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Category',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=200, verbose_name='Название')),
|
||||
('slug', models.SlugField(blank=True, max_length=220, unique=True, verbose_name='Slug')),
|
||||
('type', models.CharField(choices=[('product', 'Товар'), ('service', 'Услуга')], default='product', max_length=10, verbose_name='Тип')),
|
||||
('sort_order', models.PositiveIntegerField(default=0, verbose_name='Порядок сортировки')),
|
||||
('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='catalog.category', verbose_name='Родитель')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Категория',
|
||||
'verbose_name_plural': 'Категории',
|
||||
'ordering': ('sort_order', 'name'),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Product',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=255, verbose_name='Название')),
|
||||
('slug', models.SlugField(blank=True, max_length=280, unique=True, verbose_name='Slug')),
|
||||
('description', models.TextField(blank=True, verbose_name='Описание')),
|
||||
('price', models.DecimalField(decimal_places=2, max_digits=12, verbose_name='Цена')),
|
||||
('attributes', models.JSONField(blank=True, default=dict, verbose_name='Характеристики')),
|
||||
('stock', models.PositiveIntegerField(default=0, verbose_name='Остаток')),
|
||||
('lead_time_days', models.PositiveIntegerField(default=0, verbose_name='Срок изготовления, дней')),
|
||||
('moderation_status', models.CharField(choices=[('draft', 'Черновик'), ('pending', 'На модерации'), ('published', 'Опубликовано'), ('rejected', 'Отклонено')], default='draft', max_length=20, verbose_name='Статус модерации')),
|
||||
('is_active', models.BooleanField(default=True, verbose_name='Активен')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
|
||||
('brand', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='products', to='catalog.brand', verbose_name='Бренд')),
|
||||
('category', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='products', to='catalog.category', verbose_name='Категория')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Товар',
|
||||
'verbose_name_plural': 'Товары',
|
||||
'ordering': ('-created_at',),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='ProductImage',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('image', models.ImageField(upload_to='products/', verbose_name='Изображение')),
|
||||
('sort_order', models.PositiveIntegerField(default=0, verbose_name='Порядок')),
|
||||
('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='catalog.product', verbose_name='Товар')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Изображение товара',
|
||||
'verbose_name_plural': 'Изображения товаров',
|
||||
'ordering': ('sort_order', 'id'),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Service',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=255, verbose_name='Название')),
|
||||
('slug', models.SlugField(blank=True, max_length=280, unique=True, verbose_name='Slug')),
|
||||
('description', models.TextField(blank=True, verbose_name='Описание')),
|
||||
('format', models.CharField(choices=[('online', 'Онлайн'), ('offline', 'Офлайн')], default='offline', max_length=10, verbose_name='Формат')),
|
||||
('duration_minutes', models.PositiveIntegerField(default=60, verbose_name='Длительность, мин')),
|
||||
('price', models.DecimalField(decimal_places=2, max_digits=12, verbose_name='Цена')),
|
||||
('moderation_status', models.CharField(choices=[('draft', 'Черновик'), ('pending', 'На модерации'), ('published', 'Опубликовано'), ('rejected', 'Отклонено')], default='draft', max_length=20, verbose_name='Статус модерации')),
|
||||
('is_active', models.BooleanField(default=True, verbose_name='Активна')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
|
||||
('brand', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='services', to='catalog.brand', verbose_name='Бренд')),
|
||||
('category', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='services', to='catalog.category', verbose_name='Категория')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Услуга',
|
||||
'verbose_name_plural': 'Услуги',
|
||||
'ordering': ('-created_at',),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='TimeSlot',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('start', models.DateTimeField(verbose_name='Начало')),
|
||||
('end', models.DateTimeField(verbose_name='Окончание')),
|
||||
('is_booked', models.BooleanField(default=False, verbose_name='Занят')),
|
||||
('service', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='slots', to='catalog.service', verbose_name='Услуга')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Слот записи',
|
||||
'verbose_name_plural': 'Слоты записи',
|
||||
'ordering': ('start',),
|
||||
},
|
||||
),
|
||||
]
|
||||
Whitespace-only changes.
@@ -0,0 +1,232 @@
|
||||
from django.conf import settings
|
||||
from django.db import models
|
||||
from django.utils.text import slugify
|
||||
|
||||
|
||||
class CategoryType(models.TextChoices):
|
||||
PRODUCT = 'product', 'Товар'
|
||||
SERVICE = 'service', 'Услуга'
|
||||
|
||||
|
||||
class ModerationStatus(models.TextChoices):
|
||||
DRAFT = 'draft', 'Черновик'
|
||||
PENDING = 'pending', 'На модерации'
|
||||
PUBLISHED = 'published', 'Опубликовано'
|
||||
REJECTED = 'rejected', 'Отклонено'
|
||||
|
||||
|
||||
class VerificationStatus(models.TextChoices):
|
||||
PENDING = 'pending', 'На проверке'
|
||||
APPROVED = 'approved', 'Одобрен'
|
||||
REVISION = 'revision', 'На доработке'
|
||||
REJECTED = 'rejected', 'Отклонён'
|
||||
|
||||
|
||||
class LegalStatus(models.TextChoices):
|
||||
SELF_EMPLOYED = 'self_employed', 'Самозанятый'
|
||||
IP = 'ip', 'ИП'
|
||||
LEGAL_ENTITY = 'legal', 'Юрлицо'
|
||||
|
||||
|
||||
class Category(models.Model):
|
||||
"""Двухуровневый справочник категорий (ТЗ §3.2)."""
|
||||
|
||||
parent = models.ForeignKey(
|
||||
'self', null=True, blank=True, on_delete=models.CASCADE,
|
||||
related_name='children', verbose_name='Родитель',
|
||||
)
|
||||
name = models.CharField('Название', max_length=200)
|
||||
slug = models.SlugField('Slug', max_length=220, unique=True, blank=True)
|
||||
type = models.CharField(
|
||||
'Тип', max_length=10, choices=CategoryType.choices,
|
||||
default=CategoryType.PRODUCT,
|
||||
)
|
||||
sort_order = models.PositiveIntegerField('Порядок сортировки', default=0)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Категория'
|
||||
verbose_name_plural = 'Категории'
|
||||
ordering = ('sort_order', 'name')
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.parent.name} / {self.name}' if self.parent else self.name
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
if not self.slug:
|
||||
self.slug = slugify(self.name, allow_unicode=True)
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
|
||||
class Brand(models.Model):
|
||||
"""Профиль продавца — «Бренд» (ТЗ §4: Brand / SellerProfile)."""
|
||||
|
||||
user = models.OneToOneField(
|
||||
settings.AUTH_USER_MODEL, on_delete=models.CASCADE,
|
||||
related_name='brand', verbose_name='Владелец',
|
||||
)
|
||||
name = models.CharField('Название бренда', max_length=200)
|
||||
slug = models.SlugField('Slug', max_length=220, unique=True, blank=True)
|
||||
logo = models.ImageField('Логотип', upload_to='brands/logos/', blank=True, null=True)
|
||||
cover = models.ImageField('Обложка', upload_to='brands/covers/', blank=True, null=True)
|
||||
story = models.TextField('История бренда', max_length=3000, blank=True)
|
||||
|
||||
legal_status = models.CharField(
|
||||
'Правовой статус', max_length=20,
|
||||
choices=LegalStatus.choices, default=LegalStatus.SELF_EMPLOYED,
|
||||
)
|
||||
inn = models.CharField('ИНН', max_length=12, blank=True)
|
||||
region = models.CharField('Регион', max_length=120, blank=True)
|
||||
city = models.CharField('Город', max_length=120, blank=True)
|
||||
socials = models.JSONField('Соцсети', default=dict, blank=True)
|
||||
|
||||
verification_status = models.CharField(
|
||||
'Статус верификации', max_length=20,
|
||||
choices=VerificationStatus.choices, default=VerificationStatus.PENDING,
|
||||
)
|
||||
badges = models.JSONField('Знаки', default=list, blank=True)
|
||||
rating = models.DecimalField('Рейтинг', max_digits=3, decimal_places=2, default=0)
|
||||
|
||||
created_at = models.DateTimeField('Дата создания', auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Бренд'
|
||||
verbose_name_plural = 'Бренды'
|
||||
ordering = ('name',)
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
if not self.slug:
|
||||
self.slug = slugify(self.name, allow_unicode=True)
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
|
||||
class Product(models.Model):
|
||||
"""Карточка товара (ТЗ §4: Product)."""
|
||||
|
||||
brand = models.ForeignKey(
|
||||
Brand, on_delete=models.CASCADE, related_name='products',
|
||||
verbose_name='Бренд',
|
||||
)
|
||||
category = models.ForeignKey(
|
||||
Category, on_delete=models.PROTECT, related_name='products',
|
||||
verbose_name='Категория',
|
||||
)
|
||||
name = models.CharField('Название', max_length=255)
|
||||
slug = models.SlugField('Slug', max_length=280, unique=True, blank=True)
|
||||
description = models.TextField('Описание', blank=True)
|
||||
price = models.DecimalField('Цена', max_digits=12, decimal_places=2)
|
||||
attributes = models.JSONField('Характеристики', default=dict, blank=True)
|
||||
stock = models.PositiveIntegerField('Остаток', default=0)
|
||||
lead_time_days = models.PositiveIntegerField('Срок изготовления, дней', default=0)
|
||||
|
||||
moderation_status = models.CharField(
|
||||
'Статус модерации', max_length=20,
|
||||
choices=ModerationStatus.choices, default=ModerationStatus.DRAFT,
|
||||
)
|
||||
is_active = models.BooleanField('Активен', default=True)
|
||||
created_at = models.DateTimeField('Дата создания', auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Товар'
|
||||
verbose_name_plural = 'Товары'
|
||||
ordering = ('-created_at',)
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
if not self.slug:
|
||||
self.slug = slugify(self.name, allow_unicode=True)
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
@property
|
||||
def is_available(self):
|
||||
return self.is_active and self.stock > 0
|
||||
|
||||
|
||||
class ProductImage(models.Model):
|
||||
"""Изображение товара (галерея до 10 фото, ТЗ §3.2)."""
|
||||
|
||||
product = models.ForeignKey(
|
||||
Product, on_delete=models.CASCADE, related_name='images',
|
||||
verbose_name='Товар',
|
||||
)
|
||||
image = models.ImageField('Изображение', upload_to='products/')
|
||||
sort_order = models.PositiveIntegerField('Порядок', default=0)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Изображение товара'
|
||||
verbose_name_plural = 'Изображения товаров'
|
||||
ordering = ('sort_order', 'id')
|
||||
|
||||
def __str__(self):
|
||||
return f'Фото #{self.pk} для {self.product}'
|
||||
|
||||
|
||||
class ServiceFormat(models.TextChoices):
|
||||
ONLINE = 'online', 'Онлайн'
|
||||
OFFLINE = 'offline', 'Офлайн'
|
||||
|
||||
|
||||
class Service(models.Model):
|
||||
"""Карточка услуги (ТЗ §4: Service)."""
|
||||
|
||||
brand = models.ForeignKey(
|
||||
Brand, on_delete=models.CASCADE, related_name='services',
|
||||
verbose_name='Бренд',
|
||||
)
|
||||
category = models.ForeignKey(
|
||||
Category, on_delete=models.PROTECT, related_name='services',
|
||||
verbose_name='Категория',
|
||||
)
|
||||
name = models.CharField('Название', max_length=255)
|
||||
slug = models.SlugField('Slug', max_length=280, unique=True, blank=True)
|
||||
description = models.TextField('Описание', blank=True)
|
||||
format = models.CharField(
|
||||
'Формат', max_length=10, choices=ServiceFormat.choices,
|
||||
default=ServiceFormat.OFFLINE,
|
||||
)
|
||||
duration_minutes = models.PositiveIntegerField('Длительность, мин', default=60)
|
||||
price = models.DecimalField('Цена', max_digits=12, decimal_places=2)
|
||||
|
||||
moderation_status = models.CharField(
|
||||
'Статус модерации', max_length=20,
|
||||
choices=ModerationStatus.choices, default=ModerationStatus.DRAFT,
|
||||
)
|
||||
is_active = models.BooleanField('Активна', default=True)
|
||||
created_at = models.DateTimeField('Дата создания', auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Услуга'
|
||||
verbose_name_plural = 'Услуги'
|
||||
ordering = ('-created_at',)
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
if not self.slug:
|
||||
self.slug = slugify(self.name, allow_unicode=True)
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
|
||||
class TimeSlot(models.Model):
|
||||
"""Слот записи на услугу (ТЗ §3.4)."""
|
||||
|
||||
service = models.ForeignKey(
|
||||
Service, on_delete=models.CASCADE, related_name='slots',
|
||||
verbose_name='Услуга',
|
||||
)
|
||||
start = models.DateTimeField('Начало')
|
||||
end = models.DateTimeField('Окончание')
|
||||
is_booked = models.BooleanField('Занят', default=False)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Слот записи'
|
||||
verbose_name_plural = 'Слоты записи'
|
||||
ordering = ('start',)
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.service} — {self.start:%d.%m.%Y %H:%M}'
|
||||
@@ -0,0 +1,3 @@
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@@ -0,0 +1,12 @@
|
||||
from django.urls import path
|
||||
|
||||
from . import views
|
||||
|
||||
app_name = 'catalog'
|
||||
|
||||
urlpatterns = [
|
||||
path('', views.home, name='home'),
|
||||
path('catalog/', views.catalog, name='catalog'),
|
||||
path('product/<slug:slug>/', views.product_detail, name='product_detail'),
|
||||
path('brand/<slug:slug>/', views.brand_detail, name='brand_detail'),
|
||||
]
|
||||
@@ -0,0 +1,58 @@
|
||||
from django.shortcuts import get_object_or_404, render
|
||||
|
||||
from apps.catalog.models import Brand, Category, ModerationStatus, Product
|
||||
from apps.content.models import Banner, Collection
|
||||
|
||||
PUBLISHED = ModerationStatus.PUBLISHED
|
||||
|
||||
|
||||
def home(request):
|
||||
banners = Banner.objects.filter(is_active=True)
|
||||
collections = Collection.objects.filter(is_published=True)
|
||||
products = Product.objects.filter(
|
||||
moderation_status=PUBLISHED, is_active=True,
|
||||
)[:8]
|
||||
return render(request, 'catalog/home.html', {
|
||||
'banners': banners,
|
||||
'collections': collections,
|
||||
'products': products,
|
||||
})
|
||||
|
||||
|
||||
def catalog(request):
|
||||
qs = Product.objects.filter(moderation_status=PUBLISHED, is_active=True)
|
||||
|
||||
current_category = None
|
||||
cat_slug = request.GET.get('category')
|
||||
if cat_slug:
|
||||
current_category = get_object_or_404(Category, slug=cat_slug)
|
||||
qs = qs.filter(category=current_category)
|
||||
|
||||
q = request.GET.get('q', '').strip()
|
||||
if q:
|
||||
qs = qs.filter(name__icontains=q)
|
||||
|
||||
categories = Category.objects.filter(parent__isnull=True)
|
||||
|
||||
return render(request, 'catalog/catalog.html', {
|
||||
'products': qs,
|
||||
'categories': categories,
|
||||
'current_category': current_category,
|
||||
'q': q,
|
||||
})
|
||||
|
||||
|
||||
def product_detail(request, slug):
|
||||
product = get_object_or_404(
|
||||
Product, slug=slug, moderation_status=PUBLISHED, is_active=True,
|
||||
)
|
||||
return render(request, 'catalog/product_detail.html', {'product': product})
|
||||
|
||||
|
||||
def brand_detail(request, slug):
|
||||
brand = get_object_or_404(Brand, slug=slug, verification_status='approved')
|
||||
products = brand.products.filter(moderation_status=PUBLISHED, is_active=True)
|
||||
return render(request, 'catalog/brand_detail.html', {
|
||||
'brand': brand,
|
||||
'products': products,
|
||||
})
|
||||
Whitespace-only changes.
@@ -0,0 +1,31 @@
|
||||
from django.contrib import admin
|
||||
|
||||
from .models import Article, Banner, Collection, NewsEvent
|
||||
|
||||
|
||||
@admin.register(Collection)
|
||||
class CollectionAdmin(admin.ModelAdmin):
|
||||
list_display = ('name', 'is_published', 'published_at')
|
||||
list_filter = ('is_published',)
|
||||
filter_horizontal = ('products',)
|
||||
prepopulated_fields = {'slug': ('name',)}
|
||||
|
||||
|
||||
@admin.register(Article)
|
||||
class ArticleAdmin(admin.ModelAdmin):
|
||||
list_display = ('title', 'brand', 'published_at')
|
||||
search_fields = ('title',)
|
||||
prepopulated_fields = {'slug': ('title',)}
|
||||
|
||||
|
||||
@admin.register(NewsEvent)
|
||||
class NewsEventAdmin(admin.ModelAdmin):
|
||||
list_display = ('title', 'event_date', 'is_published', 'published_at')
|
||||
list_filter = ('is_published',)
|
||||
prepopulated_fields = {'slug': ('title',)}
|
||||
|
||||
|
||||
@admin.register(Banner)
|
||||
class BannerAdmin(admin.ModelAdmin):
|
||||
list_display = ('title', 'url', 'sort_order', 'is_active')
|
||||
list_filter = ('is_active',)
|
||||
@@ -0,0 +1,7 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class ContentConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'apps.content'
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
# Generated by Django 5.1.15 on 2026-09-23 13:44
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
('catalog', '0001_initial'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Banner',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('title', models.CharField(blank=True, max_length=200, verbose_name='Заголовок')),
|
||||
('image', models.ImageField(upload_to='banners/', verbose_name='Изображение')),
|
||||
('url', models.URLField(blank=True, verbose_name='Ссылка')),
|
||||
('sort_order', models.PositiveIntegerField(default=0, verbose_name='Порядок')),
|
||||
('is_active', models.BooleanField(default=True, verbose_name='Активен')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Баннер',
|
||||
'verbose_name_plural': 'Баннеры',
|
||||
'ordering': ('sort_order',),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='NewsEvent',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('title', models.CharField(max_length=255, verbose_name='Заголовок')),
|
||||
('slug', models.SlugField(blank=True, max_length=280, unique=True, verbose_name='Slug')),
|
||||
('body', models.TextField(verbose_name='Текст')),
|
||||
('image', models.ImageField(blank=True, null=True, upload_to='news/', verbose_name='Изображение')),
|
||||
('event_date', models.DateTimeField(blank=True, null=True, verbose_name='Дата события')),
|
||||
('is_published', models.BooleanField(default=False, verbose_name='Опубликовано')),
|
||||
('published_at', models.DateTimeField(blank=True, null=True, verbose_name='Опубликовано')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Новость / событие',
|
||||
'verbose_name_plural': 'Новости и события',
|
||||
'ordering': ('-published_at',),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Article',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('title', models.CharField(max_length=255, verbose_name='Заголовок')),
|
||||
('slug', models.SlugField(blank=True, max_length=280, unique=True, verbose_name='Slug')),
|
||||
('cover', models.ImageField(blank=True, null=True, upload_to='articles/', verbose_name='Обложка')),
|
||||
('body', models.TextField(verbose_name='Текст')),
|
||||
('published_at', models.DateTimeField(blank=True, null=True, verbose_name='Опубликована')),
|
||||
('brand', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='articles', to='catalog.brand', verbose_name='Бренд')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'История бренда',
|
||||
'verbose_name_plural': 'Истории брендов',
|
||||
'ordering': ('-published_at',),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Collection',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=200, verbose_name='Название')),
|
||||
('slug', models.SlugField(blank=True, max_length=220, unique=True, verbose_name='Slug')),
|
||||
('banner', models.ImageField(blank=True, null=True, upload_to='collections/', verbose_name='Баннер')),
|
||||
('description', models.TextField(blank=True, verbose_name='Описание')),
|
||||
('is_published', models.BooleanField(default=False, verbose_name='Опубликована')),
|
||||
('published_at', models.DateTimeField(blank=True, null=True, verbose_name='Дата публикации')),
|
||||
('products', models.ManyToManyField(blank=True, related_name='collections', to='catalog.product', verbose_name='Позиции')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Подборка',
|
||||
'verbose_name_plural': 'Подборки',
|
||||
'ordering': ('name',),
|
||||
},
|
||||
),
|
||||
]
|
||||
Whitespace-only changes.
@@ -0,0 +1,101 @@
|
||||
from django.db import models
|
||||
from django.utils.text import slugify
|
||||
|
||||
from apps.catalog.models import Brand, Product
|
||||
|
||||
|
||||
class Collection(models.Model):
|
||||
"""Подборка позиций (ТЗ §3.7, §4: Collection)."""
|
||||
|
||||
name = models.CharField('Название', max_length=200)
|
||||
slug = models.SlugField('Slug', max_length=220, unique=True, blank=True)
|
||||
banner = models.ImageField('Баннер', upload_to='collections/', blank=True, null=True)
|
||||
description = models.TextField('Описание', blank=True)
|
||||
products = models.ManyToManyField(
|
||||
Product, related_name='collections', blank=True, verbose_name='Позиции',
|
||||
)
|
||||
is_published = models.BooleanField('Опубликована', default=False)
|
||||
published_at = models.DateTimeField('Дата публикации', null=True, blank=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Подборка'
|
||||
verbose_name_plural = 'Подборки'
|
||||
ordering = ('name',)
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
if not self.slug:
|
||||
self.slug = slugify(self.name, allow_unicode=True)
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
|
||||
class Article(models.Model):
|
||||
"""Раздел «Истории брендов» (ТЗ §3.7)."""
|
||||
|
||||
brand = models.ForeignKey(
|
||||
Brand, null=True, blank=True, on_delete=models.SET_NULL,
|
||||
related_name='articles', verbose_name='Бренд',
|
||||
)
|
||||
title = models.CharField('Заголовок', max_length=255)
|
||||
slug = models.SlugField('Slug', max_length=280, unique=True, blank=True)
|
||||
cover = models.ImageField('Обложка', upload_to='articles/', blank=True, null=True)
|
||||
body = models.TextField('Текст')
|
||||
published_at = models.DateTimeField('Опубликована', null=True, blank=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'История бренда'
|
||||
verbose_name_plural = 'Истории брендов'
|
||||
ordering = ('-published_at',)
|
||||
|
||||
def __str__(self):
|
||||
return self.title
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
if not self.slug:
|
||||
self.slug = slugify(self.title, allow_unicode=True)
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
|
||||
class NewsEvent(models.Model):
|
||||
"""Новости проекта и анонсы офлайн-ярмарок (ТЗ §3.7)."""
|
||||
|
||||
title = models.CharField('Заголовок', max_length=255)
|
||||
slug = models.SlugField('Slug', max_length=280, unique=True, blank=True)
|
||||
body = models.TextField('Текст')
|
||||
image = models.ImageField('Изображение', upload_to='news/', blank=True, null=True)
|
||||
event_date = models.DateTimeField('Дата события', null=True, blank=True)
|
||||
is_published = models.BooleanField('Опубликовано', default=False)
|
||||
published_at = models.DateTimeField('Опубликовано', null=True, blank=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Новость / событие'
|
||||
verbose_name_plural = 'Новости и события'
|
||||
ordering = ('-published_at',)
|
||||
|
||||
def __str__(self):
|
||||
return self.title
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
if not self.slug:
|
||||
self.slug = slugify(self.title, allow_unicode=True)
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
|
||||
class Banner(models.Model):
|
||||
"""Баннерная зона на главной (ТЗ §3.7)."""
|
||||
|
||||
title = models.CharField('Заголовок', max_length=200, blank=True)
|
||||
image = models.ImageField('Изображение', upload_to='banners/')
|
||||
url = models.URLField('Ссылка', blank=True)
|
||||
sort_order = models.PositiveIntegerField('Порядок', default=0)
|
||||
is_active = models.BooleanField('Активен', default=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Баннер'
|
||||
verbose_name_plural = 'Баннеры'
|
||||
ordering = ('sort_order',)
|
||||
|
||||
def __str__(self):
|
||||
return self.title or f'Баннер #{self.pk}'
|
||||
@@ -0,0 +1,3 @@
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@@ -0,0 +1,3 @@
|
||||
from django.shortcuts import render
|
||||
|
||||
# Create your views here.
|
||||
Whitespace-only changes.
@@ -0,0 +1,18 @@
|
||||
from django.contrib import admin
|
||||
|
||||
from .models import AuditLog, ModerationRequest
|
||||
|
||||
|
||||
@admin.register(ModerationRequest)
|
||||
class ModerationRequestAdmin(admin.ModelAdmin):
|
||||
list_display = ('content_type', 'object_id', 'decision', 'moderator', 'created_at', 'decided_at')
|
||||
list_filter = ('decision', 'content_type')
|
||||
search_fields = ('comment',)
|
||||
|
||||
|
||||
@admin.register(AuditLog)
|
||||
class AuditLogAdmin(admin.ModelAdmin):
|
||||
list_display = ('created_at', 'user', 'action', 'object_repr')
|
||||
list_filter = ('action',)
|
||||
search_fields = ('action', 'object_repr')
|
||||
readonly_fields = ('created_at',)
|
||||
@@ -0,0 +1,7 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class ModerationConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'apps.moderation'
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
# Generated by Django 5.1.15 on 2026-09-23 13:44
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
('contenttypes', '0002_remove_content_type_name'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='AuditLog',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('action', models.CharField(max_length=255, verbose_name='Действие')),
|
||||
('object_repr', models.CharField(blank=True, max_length=255, verbose_name='Объект')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Время')),
|
||||
('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='audit_logs', to=settings.AUTH_USER_MODEL, verbose_name='Пользователь')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Запись журнала',
|
||||
'verbose_name_plural': 'Журнал действий',
|
||||
'ordering': ('-created_at',),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='ModerationRequest',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('object_id', models.PositiveIntegerField(verbose_name='ID сущности')),
|
||||
('decision', models.CharField(choices=[('pending', 'На рассмотрении'), ('approved', 'Одобрено'), ('revision', 'На доработке'), ('rejected', 'Отклонено')], default='pending', max_length=20, verbose_name='Решение')),
|
||||
('comment', models.TextField(blank=True, verbose_name='Комментарий модератора')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Создана')),
|
||||
('decided_at', models.DateTimeField(blank=True, null=True, verbose_name='Решена')),
|
||||
('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype', verbose_name='Тип сущности')),
|
||||
('moderator', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='moderated_requests', to=settings.AUTH_USER_MODEL, verbose_name='Модератор')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Заявка на модерацию',
|
||||
'verbose_name_plural': 'Заявки на модерацию',
|
||||
'ordering': ('-created_at',),
|
||||
},
|
||||
),
|
||||
]
|
||||
Whitespace-only changes.
@@ -0,0 +1,63 @@
|
||||
from django.conf import settings
|
||||
from django.contrib.contenttypes.fields import GenericForeignKey
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
from django.db import models
|
||||
|
||||
|
||||
class Decision(models.TextChoices):
|
||||
PENDING = 'pending', 'На рассмотрении'
|
||||
APPROVED = 'approved', 'Одобрено'
|
||||
REVISION = 'revision', 'На доработке'
|
||||
REJECTED = 'rejected', 'Отклонено'
|
||||
|
||||
|
||||
class ModerationRequest(models.Model):
|
||||
"""Заявка на модерацию сущности (бренд/карточка/отзыв) (ТЗ §3.8)."""
|
||||
|
||||
content_type = models.ForeignKey(
|
||||
ContentType, on_delete=models.CASCADE, verbose_name='Тип сущности',
|
||||
)
|
||||
object_id = models.PositiveIntegerField('ID сущности')
|
||||
entity = GenericForeignKey('content_type', 'object_id')
|
||||
|
||||
decision = models.CharField(
|
||||
'Решение', max_length=20, choices=Decision.choices,
|
||||
default=Decision.PENDING,
|
||||
)
|
||||
comment = models.TextField('Комментарий модератора', blank=True)
|
||||
moderator = models.ForeignKey(
|
||||
settings.AUTH_USER_MODEL, null=True, blank=True,
|
||||
on_delete=models.SET_NULL, related_name='moderated_requests',
|
||||
verbose_name='Модератор',
|
||||
)
|
||||
created_at = models.DateTimeField('Создана', auto_now_add=True)
|
||||
decided_at = models.DateTimeField('Решена', null=True, blank=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Заявка на модерацию'
|
||||
verbose_name_plural = 'Заявки на модерацию'
|
||||
ordering = ('-created_at',)
|
||||
|
||||
def __str__(self):
|
||||
return f'Модерация {self.content_type} #{self.object_id} — {self.decision}'
|
||||
|
||||
|
||||
class AuditLog(models.Model):
|
||||
"""Журнал действий (ТЗ §3.8, §6)."""
|
||||
|
||||
user = models.ForeignKey(
|
||||
settings.AUTH_USER_MODEL, null=True, blank=True,
|
||||
on_delete=models.SET_NULL, related_name='audit_logs',
|
||||
verbose_name='Пользователь',
|
||||
)
|
||||
action = models.CharField('Действие', max_length=255)
|
||||
object_repr = models.CharField('Объект', max_length=255, blank=True)
|
||||
created_at = models.DateTimeField('Время', auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Запись журнала'
|
||||
verbose_name_plural = 'Журнал действий'
|
||||
ordering = ('-created_at',)
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.created_at:%Y-%m-%d %H:%M} {self.user} — {self.action}'
|
||||
@@ -0,0 +1,3 @@
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@@ -0,0 +1,3 @@
|
||||
from django.shortcuts import render
|
||||
|
||||
# Create your views here.
|
||||
Whitespace-only changes.
@@ -0,0 +1,32 @@
|
||||
from django.contrib import admin
|
||||
|
||||
from .models import Favorite, Order, OrderItem, PickupPoint
|
||||
|
||||
|
||||
class OrderItemInline(admin.TabularInline):
|
||||
model = OrderItem
|
||||
extra = 0
|
||||
|
||||
|
||||
@admin.register(PickupPoint)
|
||||
class PickupPointAdmin(admin.ModelAdmin):
|
||||
list_display = ('name', 'address', 'partner', 'is_active')
|
||||
list_filter = ('is_active',)
|
||||
|
||||
|
||||
@admin.register(Order)
|
||||
class OrderAdmin(admin.ModelAdmin):
|
||||
list_display = ('id', 'buyer', 'status', 'delivery_method', 'payment_method', 'total', 'created_at')
|
||||
list_filter = ('status', 'delivery_method', 'payment_method')
|
||||
search_fields = ('buyer__username', 'buyer__full_name')
|
||||
inlines = [OrderItemInline]
|
||||
|
||||
|
||||
@admin.register(OrderItem)
|
||||
class OrderItemAdmin(admin.ModelAdmin):
|
||||
list_display = ('order', 'name', 'brand', 'price', 'quantity')
|
||||
|
||||
|
||||
@admin.register(Favorite)
|
||||
class FavoriteAdmin(admin.ModelAdmin):
|
||||
list_display = ('user', 'product', 'service', 'created_at')
|
||||
@@ -0,0 +1,7 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class OrdersConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'apps.orders'
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
# Generated by Django 5.1.15 on 2026-09-23 13:44
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
('catalog', '0001_initial'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='PickupPoint',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=200, verbose_name='Название')),
|
||||
('address', models.CharField(max_length=300, verbose_name='Адрес')),
|
||||
('working_hours', models.CharField(blank=True, max_length=200, verbose_name='Часы работы')),
|
||||
('partner', models.CharField(blank=True, max_length=200, verbose_name='Партнёр')),
|
||||
('is_active', models.BooleanField(default=True, verbose_name='Активен')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Пункт выдачи',
|
||||
'verbose_name_plural': 'Пункты выдачи',
|
||||
'ordering': ('name',),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Order',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('status', models.CharField(choices=[('new', 'Новый'), ('confirmed', 'Подтверждён'), ('paid', 'Оплачен'), ('assembled', 'Собран'), ('shipped', 'Передан в доставку'), ('done', 'Выполнен'), ('cancelled', 'Отменён'), ('refunded', 'Возврат')], default='new', max_length=20, verbose_name='Статус')),
|
||||
('delivery_method', models.CharField(choices=[('pickup', 'Самовывоз'), ('courier', 'Доставка по договорённости'), ('cdek', 'СДЭК')], default='pickup', max_length=20, verbose_name='Способ получения')),
|
||||
('address', models.CharField(blank=True, max_length=300, verbose_name='Адрес доставки')),
|
||||
('payment_method', models.CharField(choices=[('by_agreement', 'По договорённости (напрямую продавцу)'), ('online', 'Онлайн через агрегатор')], default='by_agreement', max_length=20, verbose_name='Способ оплаты')),
|
||||
('customer_comment', models.TextField(blank=True, verbose_name='Комментарий покупателя')),
|
||||
('total', models.DecimalField(decimal_places=2, default=0, max_digits=12, verbose_name='Сумма')),
|
||||
('commission', models.DecimalField(decimal_places=2, default=0, max_digits=12, verbose_name='Комиссия площадки')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Создан')),
|
||||
('updated_at', models.DateTimeField(auto_now=True, verbose_name='Обновлён')),
|
||||
('buyer', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='orders', to=settings.AUTH_USER_MODEL, verbose_name='Покупатель')),
|
||||
('pickup_point', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='orders', to='orders.pickuppoint', verbose_name='Пункт выдачи')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Заказ',
|
||||
'verbose_name_plural': 'Заказы',
|
||||
'ordering': ('-created_at',),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='OrderItem',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=255, verbose_name='Название позиции')),
|
||||
('price', models.DecimalField(decimal_places=2, max_digits=12, verbose_name='Цена за единицу')),
|
||||
('quantity', models.PositiveIntegerField(default=1, verbose_name='Количество')),
|
||||
('brand', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='order_items', to='catalog.brand', verbose_name='Бренд')),
|
||||
('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='orders.order', verbose_name='Заказ')),
|
||||
('product', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='order_items', to='catalog.product', verbose_name='Товар')),
|
||||
('service', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='order_items', to='catalog.service', verbose_name='Услуга')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Позиция заказа',
|
||||
'verbose_name_plural': 'Позиции заказа',
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Favorite',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Добавлено')),
|
||||
('product', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='favorited_by', to='catalog.product', verbose_name='Товар')),
|
||||
('service', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='favorited_by', to='catalog.service', verbose_name='Услуга')),
|
||||
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='favorites', to=settings.AUTH_USER_MODEL, verbose_name='Пользователь')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Избранное',
|
||||
'verbose_name_plural': 'Избранное',
|
||||
'constraints': [models.UniqueConstraint(condition=models.Q(('product__isnull', False)), fields=('user', 'product'), name='uniq_favorite_user_product'), models.UniqueConstraint(condition=models.Q(('service__isnull', False)), fields=('user', 'service'), name='uniq_favorite_user_service')],
|
||||
},
|
||||
),
|
||||
]
|
||||
Whitespace-only changes.
@@ -0,0 +1,163 @@
|
||||
from django.conf import settings
|
||||
from django.db import models
|
||||
|
||||
from apps.catalog.models import Brand, Product, Service
|
||||
|
||||
|
||||
class OrderStatus(models.TextChoices):
|
||||
NEW = 'new', 'Новый'
|
||||
CONFIRMED = 'confirmed', 'Подтверждён'
|
||||
PAID = 'paid', 'Оплачен' # этап 2
|
||||
ASSEMBLED = 'assembled', 'Собран'
|
||||
SHIPPED = 'shipped', 'Передан в доставку' # этап 2
|
||||
DONE = 'done', 'Выполнен'
|
||||
CANCELLED = 'cancelled', 'Отменён'
|
||||
REFUNDED = 'refunded', 'Возврат' # этап 2
|
||||
|
||||
|
||||
class DeliveryMethod(models.TextChoices):
|
||||
PICKUP = 'pickup', 'Самовывоз'
|
||||
COURIER = 'courier', 'Доставка по договорённости' # этап 1
|
||||
CDEK = 'cdek', 'СДЭК' # этап 2
|
||||
|
||||
|
||||
class PaymentMethod(models.TextChoices):
|
||||
BY_AGREEMENT = 'by_agreement', 'По договорённости (напрямую продавцу)'
|
||||
ONLINE = 'online', 'Онлайн через агрегатор' # этап 2
|
||||
|
||||
|
||||
class PickupPoint(models.Model):
|
||||
"""Пункт выдачи (ТЗ §4: PickupPoint)."""
|
||||
|
||||
name = models.CharField('Название', max_length=200)
|
||||
address = models.CharField('Адрес', max_length=300)
|
||||
working_hours = models.CharField('Часы работы', max_length=200, blank=True)
|
||||
partner = models.CharField('Партнёр', max_length=200, blank=True)
|
||||
is_active = models.BooleanField('Активен', default=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Пункт выдачи'
|
||||
verbose_name_plural = 'Пункты выдачи'
|
||||
ordering = ('name',)
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.name} ({self.address})'
|
||||
|
||||
|
||||
class Order(models.Model):
|
||||
"""Заказ / заявка (ТЗ §4: Order)."""
|
||||
|
||||
buyer = models.ForeignKey(
|
||||
settings.AUTH_USER_MODEL, on_delete=models.PROTECT,
|
||||
related_name='orders', verbose_name='Покупатель',
|
||||
)
|
||||
status = models.CharField(
|
||||
'Статус', max_length=20, choices=OrderStatus.choices,
|
||||
default=OrderStatus.NEW,
|
||||
)
|
||||
delivery_method = models.CharField(
|
||||
'Способ получения', max_length=20,
|
||||
choices=DeliveryMethod.choices, default=DeliveryMethod.PICKUP,
|
||||
)
|
||||
address = models.CharField('Адрес доставки', max_length=300, blank=True)
|
||||
pickup_point = models.ForeignKey(
|
||||
PickupPoint, null=True, blank=True, on_delete=models.SET_NULL,
|
||||
related_name='orders', verbose_name='Пункт выдачи',
|
||||
)
|
||||
payment_method = models.CharField(
|
||||
'Способ оплаты', max_length=20,
|
||||
choices=PaymentMethod.choices, default=PaymentMethod.BY_AGREEMENT,
|
||||
)
|
||||
customer_comment = models.TextField('Комментарий покупателя', blank=True)
|
||||
|
||||
total = models.DecimalField('Сумма', max_digits=12, decimal_places=2, default=0)
|
||||
commission = models.DecimalField(
|
||||
'Комиссия площадки', max_digits=12, decimal_places=2, default=0,
|
||||
)
|
||||
|
||||
created_at = models.DateTimeField('Создан', auto_now_add=True)
|
||||
updated_at = models.DateTimeField('Обновлён', auto_now=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Заказ'
|
||||
verbose_name_plural = 'Заказы'
|
||||
ordering = ('-created_at',)
|
||||
|
||||
def __str__(self):
|
||||
return f'Заказ №{self.pk}'
|
||||
|
||||
def recalculate_total(self):
|
||||
self.total = sum((item.line_total for item in self.items.all()), start=0)
|
||||
self.save(update_fields=['total'])
|
||||
|
||||
|
||||
class OrderItem(models.Model):
|
||||
"""Позиция заказа. Может относиться к товару или к услуге (ТЗ §4)."""
|
||||
|
||||
order = models.ForeignKey(
|
||||
Order, on_delete=models.CASCADE, related_name='items',
|
||||
verbose_name='Заказ',
|
||||
)
|
||||
brand = models.ForeignKey(
|
||||
Brand, on_delete=models.PROTECT, related_name='order_items',
|
||||
verbose_name='Бренд',
|
||||
)
|
||||
product = models.ForeignKey(
|
||||
Product, null=True, blank=True, on_delete=models.SET_NULL,
|
||||
related_name='order_items', verbose_name='Товар',
|
||||
)
|
||||
service = models.ForeignKey(
|
||||
Service, null=True, blank=True, on_delete=models.SET_NULL,
|
||||
related_name='order_items', verbose_name='Услуга',
|
||||
)
|
||||
name = models.CharField('Название позиции', max_length=255)
|
||||
price = models.DecimalField('Цена за единицу', max_digits=12, decimal_places=2)
|
||||
quantity = models.PositiveIntegerField('Количество', default=1)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Позиция заказа'
|
||||
verbose_name_plural = 'Позиции заказа'
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.name} × {self.quantity}'
|
||||
|
||||
@property
|
||||
def line_total(self):
|
||||
return self.price * self.quantity
|
||||
|
||||
|
||||
class Favorite(models.Model):
|
||||
"""Избранное покупателя (ТЗ §3.2, §3.3)."""
|
||||
|
||||
user = models.ForeignKey(
|
||||
settings.AUTH_USER_MODEL, on_delete=models.CASCADE,
|
||||
related_name='favorites', verbose_name='Пользователь',
|
||||
)
|
||||
product = models.ForeignKey(
|
||||
Product, null=True, blank=True, on_delete=models.CASCADE,
|
||||
related_name='favorited_by', verbose_name='Товар',
|
||||
)
|
||||
service = models.ForeignKey(
|
||||
Service, null=True, blank=True, on_delete=models.CASCADE,
|
||||
related_name='favorited_by', verbose_name='Услуга',
|
||||
)
|
||||
created_at = models.DateTimeField('Добавлено', auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Избранное'
|
||||
verbose_name_plural = 'Избранное'
|
||||
constraints = [
|
||||
models.UniqueConstraint(
|
||||
fields=('user', 'product'),
|
||||
condition=models.Q(product__isnull=False),
|
||||
name='uniq_favorite_user_product',
|
||||
),
|
||||
models.UniqueConstraint(
|
||||
fields=('user', 'service'),
|
||||
condition=models.Q(service__isnull=False),
|
||||
name='uniq_favorite_user_service',
|
||||
),
|
||||
]
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.user} → {self.product or self.service}'
|
||||
@@ -0,0 +1,3 @@
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@@ -0,0 +1,3 @@
|
||||
from django.shortcuts import render
|
||||
|
||||
# Create your views here.
|
||||
Whitespace-only changes.
@@ -0,0 +1,10 @@
|
||||
from django.contrib import admin
|
||||
|
||||
from .models import Review
|
||||
|
||||
|
||||
@admin.register(Review)
|
||||
class ReviewAdmin(admin.ModelAdmin):
|
||||
list_display = ('id', 'author', 'product', 'service', 'rating', 'status', 'created_at')
|
||||
list_filter = ('status', 'rating')
|
||||
search_fields = ('author__username', 'text')
|
||||
@@ -0,0 +1,7 @@
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class ReviewsConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'apps.reviews'
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
# Generated by Django 5.1.15 on 2026-09-23 13:44
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
('catalog', '0001_initial'),
|
||||
('orders', '0001_initial'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Review',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('rating', models.PositiveSmallIntegerField(default=5, verbose_name='Оценка')),
|
||||
('text', models.TextField(blank=True, verbose_name='Текст отзыва')),
|
||||
('images', models.JSONField(blank=True, default=list, verbose_name='Фото')),
|
||||
('brand_reply', models.TextField(blank=True, verbose_name='Ответ бренда')),
|
||||
('status', models.CharField(choices=[('pending', 'На модерации'), ('published', 'Опубликован'), ('rejected', 'Отклонён')], default='pending', max_length=20, verbose_name='Статус')),
|
||||
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Создан')),
|
||||
('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reviews', to=settings.AUTH_USER_MODEL, verbose_name='Автор')),
|
||||
('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reviews', to='orders.order', verbose_name='Заказ')),
|
||||
('product', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reviews', to='catalog.product', verbose_name='Товар')),
|
||||
('service', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reviews', to='catalog.service', verbose_name='Услуга')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Отзыв',
|
||||
'verbose_name_plural': 'Отзывы',
|
||||
'ordering': ('-created_at',),
|
||||
},
|
||||
),
|
||||
]
|
||||
Whitespace-only changes.
@@ -0,0 +1,50 @@
|
||||
from django.conf import settings
|
||||
from django.db import models
|
||||
|
||||
from apps.catalog.models import Product, Service
|
||||
from apps.orders.models import Order
|
||||
|
||||
|
||||
class ReviewStatus(models.TextChoices):
|
||||
PENDING = 'pending', 'На модерации'
|
||||
PUBLISHED = 'published', 'Опубликован'
|
||||
REJECTED = 'rejected', 'Отклонён'
|
||||
|
||||
|
||||
class Review(models.Model):
|
||||
"""Отзыв на товар/услугу после подтверждённого заказа (ТЗ §3.5)."""
|
||||
|
||||
order = models.ForeignKey(
|
||||
Order, on_delete=models.CASCADE, related_name='reviews',
|
||||
verbose_name='Заказ',
|
||||
)
|
||||
author = models.ForeignKey(
|
||||
settings.AUTH_USER_MODEL, on_delete=models.CASCADE,
|
||||
related_name='reviews', verbose_name='Автор',
|
||||
)
|
||||
product = models.ForeignKey(
|
||||
Product, null=True, blank=True, on_delete=models.CASCADE,
|
||||
related_name='reviews', verbose_name='Товар',
|
||||
)
|
||||
service = models.ForeignKey(
|
||||
Service, null=True, blank=True, on_delete=models.CASCADE,
|
||||
related_name='reviews', verbose_name='Услуга',
|
||||
)
|
||||
rating = models.PositiveSmallIntegerField('Оценка', default=5)
|
||||
text = models.TextField('Текст отзыва', blank=True)
|
||||
images = models.JSONField('Фото', default=list, blank=True)
|
||||
brand_reply = models.TextField('Ответ бренда', blank=True)
|
||||
|
||||
status = models.CharField(
|
||||
'Статус', max_length=20, choices=ReviewStatus.choices,
|
||||
default=ReviewStatus.PENDING,
|
||||
)
|
||||
created_at = models.DateTimeField('Создан', auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = 'Отзыв'
|
||||
verbose_name_plural = 'Отзывы'
|
||||
ordering = ('-created_at',)
|
||||
|
||||
def __str__(self):
|
||||
return f'Отзыв #{self.pk} ({self.rating}/5)'
|
||||
@@ -0,0 +1,3 @@
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
@@ -0,0 +1,3 @@
|
||||
from django.shortcuts import render
|
||||
|
||||
# Create your views here.
|
||||
Reference in new issue
Block a user