From 890cbfac1b6969876acd1a9354109f234f991edc Mon Sep 17 00:00:00 2001 From: Husanjonazamov Date: Wed, 18 Mar 2026 17:57:52 +0500 Subject: [PATCH] tokens qoshildi --- core/apps/vendors/filters/vendor_product.py | 2 +- .../0002_vendorproductmodel_vendor_id_str.py | 18 ++++++++++++++++++ .../0003_remove_vendorproductmodel_vendor.py | 17 +++++++++++++++++ ..._vendor_id_str_vendorproductmodel_vendor.py | 18 ++++++++++++++++++ core/apps/vendors/models/vendor_product.py | 2 +- .../vendor_product/VendorProduct.py | 1 - 6 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 core/apps/vendors/migrations/0002_vendorproductmodel_vendor_id_str.py create mode 100644 core/apps/vendors/migrations/0003_remove_vendorproductmodel_vendor.py create mode 100644 core/apps/vendors/migrations/0004_rename_vendor_id_str_vendorproductmodel_vendor.py diff --git a/core/apps/vendors/filters/vendor_product.py b/core/apps/vendors/filters/vendor_product.py index e3cad2f..0818a95 100644 --- a/core/apps/vendors/filters/vendor_product.py +++ b/core/apps/vendors/filters/vendor_product.py @@ -5,7 +5,7 @@ from core.apps.vendors.models import ProductimageModel, VendorproductModel class VendorproductFilter(filters.FilterSet): name = filters.CharFilter(field_name="name", lookup_expr="icontains") - vendor = filters.CharFilter(field_name="vendor__firestore_id") + vendor = filters.CharFilter(field_name="vendor") category = filters.CharFilter(field_name="category__firestore_id") section = filters.CharFilter(field_name="section__firestore_id") diff --git a/core/apps/vendors/migrations/0002_vendorproductmodel_vendor_id_str.py b/core/apps/vendors/migrations/0002_vendorproductmodel_vendor_id_str.py new file mode 100644 index 0000000..737a13a --- /dev/null +++ b/core/apps/vendors/migrations/0002_vendorproductmodel_vendor_id_str.py @@ -0,0 +1,18 @@ +# Generated by Django 5.2.7 on 2026-03-18 12:47 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('vendors', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='vendorproductmodel', + name='vendor_id_str', + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='vendor firestore id'), + ), + ] diff --git a/core/apps/vendors/migrations/0003_remove_vendorproductmodel_vendor.py b/core/apps/vendors/migrations/0003_remove_vendorproductmodel_vendor.py new file mode 100644 index 0000000..3490ffa --- /dev/null +++ b/core/apps/vendors/migrations/0003_remove_vendorproductmodel_vendor.py @@ -0,0 +1,17 @@ +# Generated by Django 5.2.7 on 2026-03-18 12:52 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('vendors', '0002_vendorproductmodel_vendor_id_str'), + ] + + operations = [ + migrations.RemoveField( + model_name='vendorproductmodel', + name='vendor', + ), + ] diff --git a/core/apps/vendors/migrations/0004_rename_vendor_id_str_vendorproductmodel_vendor.py b/core/apps/vendors/migrations/0004_rename_vendor_id_str_vendorproductmodel_vendor.py new file mode 100644 index 0000000..c8d9ccd --- /dev/null +++ b/core/apps/vendors/migrations/0004_rename_vendor_id_str_vendorproductmodel_vendor.py @@ -0,0 +1,18 @@ +# Generated by Django 5.2.7 on 2026-03-18 12:52 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('vendors', '0003_remove_vendorproductmodel_vendor'), + ] + + operations = [ + migrations.RenameField( + model_name='vendorproductmodel', + old_name='vendor_id_str', + new_name='vendor', + ), + ] diff --git a/core/apps/vendors/models/vendor_product.py b/core/apps/vendors/models/vendor_product.py index 611f3df..bd3ff03 100644 --- a/core/apps/vendors/models/vendor_product.py +++ b/core/apps/vendors/models/vendor_product.py @@ -6,7 +6,7 @@ from model_bakery import baker class VendorproductModel(AbstractBaseModel): firestore_id = models.CharField(verbose_name=_("firestore id"), max_length=255, unique=True, null=True, blank=True) - vendor = models.ForeignKey("VendorModel", verbose_name=_("vendor"), on_delete=models.CASCADE, related_name="products", null=True, blank=True) + vendor = models.CharField(verbose_name=_("vendor firestore id"), max_length=255, null=True, blank=True) category = models.ForeignKey("CategoryModel", verbose_name=_("category"), on_delete=models.SET_NULL, related_name="products", null=True, blank=True) section = models.ForeignKey("SectionModel", verbose_name=_("section"), on_delete=models.SET_NULL, related_name="products", null=True, blank=True) name = models.CharField(verbose_name=_("name"), max_length=255) diff --git a/core/apps/vendors/serializers/vendor_product/VendorProduct.py b/core/apps/vendors/serializers/vendor_product/VendorProduct.py index 623da3a..edade0b 100644 --- a/core/apps/vendors/serializers/vendor_product/VendorProduct.py +++ b/core/apps/vendors/serializers/vendor_product/VendorProduct.py @@ -4,7 +4,6 @@ from core.apps.vendors.models import VendorproductModel, VendorModel, CategoryMo class BaseVendorproductSerializer(serializers.ModelSerializer): - vendor = serializers.SlugRelatedField(slug_field='firestore_id', queryset=VendorModel.objects.all(), required=False, allow_null=True) category = serializers.SlugRelatedField(slug_field='firestore_id', queryset=CategoryModel.objects.all(), required=False, allow_null=True) section = serializers.SlugRelatedField(slug_field='firestore_id', queryset=SectionModel.objects.all(), required=False, allow_null=True)