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

2026-09-23 16:47:57 +03:00
1 parent e5f312a00f
commit 8218a568ce
@@ -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',),
+            },
+        ),
+    ]
@@ -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,
+    })