feat: MVP-скелет площадки (Django + MySQL/SQLite, модели по ТЗ §4, базовые страницы)

This commit is contained in:
apuc committed 2026-09-23 16:47:57 +03:00
1 parent e5f312a00f
commit 8218a568ce
67 files changed
+1929

No files matched your search

View File
Whitespace-only changes.
+32
View File
@@ -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')
+7
View File
@@ -0,0 +1,7 @@
from django.apps import AppConfig
class OrdersConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'apps.orders'
+88
View File
@@ -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')],
},
),
]
View File
Whitespace-only changes.
+163
View File
@@ -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}'
+3
View File
@@ -0,0 +1,3 @@
from django.test import TestCase
# Create your tests here.
+3
View File
@@ -0,0 +1,3 @@
from django.shortcuts import render
# Create your views here.