From 51c4ef96235d1a9787f77c4946c986565d567ade Mon Sep 17 00:00:00 2001 From: mtyton Date: Sun, 2 Jul 2023 15:51:28 +0200 Subject: [PATCH 01/15] prepared some basic model modification for configurator implementation --- ...ename_productimage_producttemplateimage.py | 16 +++ ...o_producttemplateimage_is_main_and_more.py | 47 ++++++++ ...ryparam_order_productcategoryparamvalue.py | 32 ++++++ .../migrations/0010_auto_20230630_1611.py | 29 +++++ ...aram_delete_templateparamvalue_and_more.py | 42 +++++++ artel/store/models.py | 104 ++++++++++++++---- artel/store/static/js/product_configurator.js | 0 .../templates/store/configure_product.html | 51 +++++++++ .../store/partials/product_card.html | 19 +--- artel/store/tests/factories.py | 17 ++- artel/store/tests/test_models.py | 58 +++++++++- artel/store/tests/test_validators.py | 42 +++++++ artel/store/urls.py | 1 + artel/store/validators.py | 20 ++++ artel/store/views.py | 18 ++- 15 files changed, 455 insertions(+), 41 deletions(-) create mode 100644 artel/store/migrations/0007_rename_productimage_producttemplateimage.py create mode 100644 artel/store/migrations/0008_remove_product_info_producttemplateimage_is_main_and_more.py create mode 100644 artel/store/migrations/0009_productcategoryparam_order_productcategoryparamvalue.py create mode 100644 artel/store/migrations/0010_auto_20230630_1611.py create mode 100644 artel/store/migrations/0011_productparam_delete_templateparamvalue_and_more.py create mode 100644 artel/store/static/js/product_configurator.js create mode 100644 artel/store/templates/store/configure_product.html create mode 100644 artel/store/tests/test_validators.py create mode 100644 artel/store/validators.py diff --git a/artel/store/migrations/0007_rename_productimage_producttemplateimage.py b/artel/store/migrations/0007_rename_productimage_producttemplateimage.py new file mode 100644 index 0000000..e6bc809 --- /dev/null +++ b/artel/store/migrations/0007_rename_productimage_producttemplateimage.py @@ -0,0 +1,16 @@ +# Generated by Django 4.1.9 on 2023-06-25 08:05 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("store", "0006_remove_orderdocument_sent"), + ] + + operations = [ + migrations.RenameModel( + old_name="ProductImage", + new_name="ProductTemplateImage", + ), + ] diff --git a/artel/store/migrations/0008_remove_product_info_producttemplateimage_is_main_and_more.py b/artel/store/migrations/0008_remove_product_info_producttemplateimage_is_main_and_more.py new file mode 100644 index 0000000..fdc2854 --- /dev/null +++ b/artel/store/migrations/0008_remove_product_info_producttemplateimage_is_main_and_more.py @@ -0,0 +1,47 @@ +# Generated by Django 4.1.9 on 2023-06-25 19:24 + +from django.db import migrations, models +import django.db.models.deletion +import modelcluster.fields + + +class Migration(migrations.Migration): + dependencies = [ + ("store", "0007_rename_productimage_producttemplateimage"), + ] + + operations = [ + migrations.RemoveField( + model_name="product", + name="info", + ), + migrations.AddField( + model_name="producttemplateimage", + name="is_main", + field=models.BooleanField(default=False), + ), + migrations.AlterField( + model_name="producttemplateimage", + name="template", + field=modelcluster.fields.ParentalKey( + on_delete=django.db.models.deletion.CASCADE, related_name="template_images", to="store.producttemplate" + ), + ), + migrations.CreateModel( + name="ProductImage", + fields=[ + ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), + ("image", models.ImageField(upload_to="")), + ("is_main", models.BooleanField(default=False)), + ( + "product", + modelcluster.fields.ParentalKey( + on_delete=django.db.models.deletion.CASCADE, related_name="product_images", to="store.product" + ), + ), + ], + options={ + "abstract": False, + }, + ), + ] diff --git a/artel/store/migrations/0009_productcategoryparam_order_productcategoryparamvalue.py b/artel/store/migrations/0009_productcategoryparam_order_productcategoryparamvalue.py new file mode 100644 index 0000000..eb86508 --- /dev/null +++ b/artel/store/migrations/0009_productcategoryparam_order_productcategoryparamvalue.py @@ -0,0 +1,32 @@ +# Generated by Django 4.1.9 on 2023-06-30 16:11 + +from django.db import migrations, models +import django.db.models.deletion +import modelcluster.fields + + +class Migration(migrations.Migration): + dependencies = [ + ("store", "0008_remove_product_info_producttemplateimage_is_main_and_more"), + ] + + operations = [ + migrations.CreateModel( + name="ProductCategoryParamValue", + fields=[ + ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), + ("value", models.CharField(max_length=255)), + ( + "param", + modelcluster.fields.ParentalKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="param_values", + to="store.productcategoryparam", + ), + ), + ], + options={ + "abstract": False, + }, + ), + ] diff --git a/artel/store/migrations/0010_auto_20230630_1611.py b/artel/store/migrations/0010_auto_20230630_1611.py new file mode 100644 index 0000000..c4938f9 --- /dev/null +++ b/artel/store/migrations/0010_auto_20230630_1611.py @@ -0,0 +1,29 @@ +# Generated by Django 4.1.9 on 2023-06-30 16:11 + +from django.db import migrations + + +def copy_old_data(apps, schema_editor): + TemplateParamValue = apps.get_model("store", "TemplateParamValue") + ProductCategoryParamValue = apps.get_model("store", "ProductCategoryParamValue") + + for param_value in TemplateParamValue.objects.all(): + ProductCategoryParamValue.objects.create( + param=param_value.param, + value=param_value.value + ) + + +def remove_new_data(apps, schema_editor): + ProductCategoryParamValue = apps.get_model("store", "ProductCategoryParamValue") + ProductCategoryParamValue.objects.all().delete() + + +class Migration(migrations.Migration): + dependencies = [ + ("store", "0009_productcategoryparam_order_productcategoryparamvalue"), + ] + + operations = [ + migrations.RunPython(copy_old_data, remove_new_data), + ] diff --git a/artel/store/migrations/0011_productparam_delete_templateparamvalue_and_more.py b/artel/store/migrations/0011_productparam_delete_templateparamvalue_and_more.py new file mode 100644 index 0000000..1bceea9 --- /dev/null +++ b/artel/store/migrations/0011_productparam_delete_templateparamvalue_and_more.py @@ -0,0 +1,42 @@ +# Generated by Django 4.1.9 on 2023-07-02 09:34 + +from django.db import migrations, models +import django.db.models.deletion +import modelcluster.fields + + +class Migration(migrations.Migration): + dependencies = [ + ("store", "0010_auto_20230630_1611"), + ] + + operations = [ + migrations.CreateModel( + name="ProductParam", + fields=[ + ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), + ( + "param_value", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to="store.productcategoryparamvalue" + ), + ), + ( + "product", + modelcluster.fields.ParentalKey( + on_delete=django.db.models.deletion.CASCADE, related_name="product_params", to="store.product" + ), + ), + ], + ), + migrations.DeleteModel( + name="TemplateParamValue", + ), + migrations.AddField( + model_name="product", + name="params", + field=models.ManyToManyField( + blank=True, through="store.ProductParam", to="store.productcategoryparamvalue" + ), + ), + ] diff --git a/artel/store/models.py b/artel/store/models.py index 1f29204..948ca51 100644 --- a/artel/store/models.py +++ b/artel/store/models.py @@ -1,5 +1,6 @@ import pdfkit import datetime +import builtins from decimal import Decimal from typing import Any @@ -14,6 +15,7 @@ from django.template import ( Template, Context ) +from django.core.exceptions import ValidationError from modelcluster.models import ClusterableModel from modelcluster.fields import ParentalKey @@ -27,14 +29,19 @@ from taggit.managers import TaggableManager from phonenumber_field.modelfields import PhoneNumberField from num2words import num2words -from store.utils import ( - notify_user_about_order, - notify_manufacturer_about_order -) from mailings.models import ( OutgoingEmail, Attachment ) +from store.validators import ProductParamDuplicateValidator + + +class BaseImageModel(models.Model): + image = models.ImageField() + is_main = models.BooleanField(default=False) + + class Meta: + abstract = True class PersonalData(models.Model): @@ -92,6 +99,28 @@ class ProductCategoryParam(ClusterableModel): def __str__(self): return self.key + + panels = [ + FieldPanel("category"), + FieldPanel("key"), + FieldPanel("param_type"), + InlinePanel("param_values") + ] + + +class ProductCategoryParamValue(ClusterableModel): + param = ParentalKey(ProductCategoryParam, on_delete=models.CASCADE, related_name="param_values") + value = models.CharField(max_length=255) + + def get_value(self): + try: + func = getattr(builtins, self.param.param_type) + return func(self.value) + except ValueError: + return + + def __str__(self): + return f"{self.param.key}: {self.value}" class ProductTemplate(ClusterableModel): @@ -106,45 +135,58 @@ class ProductTemplate(ClusterableModel): def __str__(self): return self.title + @property + def main_image(self): + try: + return self.template_images.get(is_main=True) + except ProductImage.DoesNotExist: + return self.template_images.first() + panels = [ FieldPanel("category"), FieldPanel("author"), FieldPanel('title'), FieldPanel('code'), FieldPanel('description'), - InlinePanel("images"), + InlinePanel("template_images", label="Template Images"), FieldPanel("tags"), ] -class ProductImage(models.Model): +class ProductTemplateImage(BaseImageModel): template = ParentalKey( - ProductTemplate, on_delete=models.CASCADE, related_name="images" + ProductTemplate, on_delete=models.CASCADE, related_name="template_images" ) image = models.ImageField() + is_main = models.BooleanField(default=False) class Product(ClusterableModel): name = models.CharField(max_length=255, blank=True) - info = models.TextField(blank=True) template = models.ForeignKey(ProductTemplate, on_delete=models.CASCADE, related_name="products") + params = models.ManyToManyField( + ProductCategoryParamValue, blank=True, through="ProductParam", + validators=(ProductParamDuplicateValidator(),) + ) price = models.FloatField() available = models.BooleanField(default=True) - + panels = [ FieldPanel("template"), FieldPanel("price"), - InlinePanel("param_values"), + FieldPanel("params"), FieldPanel("available"), FieldPanel("name"), - FieldPanel("info") + InlinePanel("product_images", label="Variant Images"), ] @property def main_image(self): - images = self.template.images.all() - if images: - return images.first().image + try: + return self.product_images.get(is_main=True) + except ProductImage.DoesNotExist: + return self.product_images.first() + @property def tags(self): @@ -163,10 +205,30 @@ class Product(ClusterableModel): return self.name or self.template.title -class TemplateParamValue(models.Model): - param = models.ForeignKey(ProductCategoryParam, on_delete=models.CASCADE) - product = ParentalKey(Product, on_delete=models.CASCADE, related_name="param_values") - value = models.CharField(max_length=255) +class ProductImage(BaseImageModel): + product = ParentalKey( + "Product", on_delete=models.CASCADE, related_name="product_images" + ) + + +class ProductParam(models.Model): + product = ParentalKey(Product, on_delete=models.CASCADE, related_name="product_params") + param_value = models.ForeignKey(ProductCategoryParamValue, on_delete=models.CASCADE) + + def save(self, *args, **kwargs): + self.full_clean() + return super().save(*args, **kwargs) + + def clean(self) -> None: + print("SDADASDASDASD") + # get all of this product params with same category + product_params_count = self.product.product_params.filter( + param_value__param=self.param_value.param + ).count() + if product_params_count > 1: + raise ValidationError("Product can't have two values for one param") + + return super().clean() class ProductListPage(Page): @@ -177,9 +239,9 @@ class ProductListPage(Page): def _get_items(self): if self.tags.all(): - return Product.objects.filter(available=True, template__tags__in=self.tags.all()) - return Product.objects.filter(available=True) - + return ProductTemplate.objects.filter(tags__in=self.tags.all()) + return ProductTemplate.objects.all() + def get_context(self, request): context = super().get_context(request) items = self._get_items() diff --git a/artel/store/static/js/product_configurator.js b/artel/store/static/js/product_configurator.js new file mode 100644 index 0000000..e69de29 diff --git a/artel/store/templates/store/configure_product.html b/artel/store/templates/store/configure_product.html new file mode 100644 index 0000000..b46e34d --- /dev/null +++ b/artel/store/templates/store/configure_product.html @@ -0,0 +1,51 @@ +{% extends 'base.html' %} + +{% block content %} + +
+ +
+

{{template.title}}

+
+ + + + +
+
+
+
+ Responsive image +
+
+

{{template.description}}

+
+
+ +
+ +

Dostępne konfiguracje:

+ +
+
+ {% for product in template.products.all %} +
+
+
+ {{product.name}} +
+
+ Responsive image +
+
+ +
+
+
+ {% if forloop.counter|divisibleby:3 %}
{% endif %} + {% endfor %} +
+
+
+ +{% endblock %} diff --git a/artel/store/templates/store/partials/product_card.html b/artel/store/templates/store/partials/product_card.html index a67c7e9..16623ab 100644 --- a/artel/store/templates/store/partials/product_card.html +++ b/artel/store/templates/store/partials/product_card.html @@ -3,21 +3,12 @@
{{item.title}}
- {{item.title}} + {{item.title}} -
-
- -
-
- +
+
+ Konfiguruj
diff --git a/artel/store/tests/factories.py b/artel/store/tests/factories.py index a7568f3..261da7a 100644 --- a/artel/store/tests/factories.py +++ b/artel/store/tests/factories.py @@ -40,6 +40,14 @@ class ProductCategoryParamFactory(DjangoModelFactory): param_type = 'str' +class ProductCategoryParamValueFactory(DjangoModelFactory): + class Meta: + model = 'store.ProductCategoryParamValue' + + param = SubFactory(ProductCategoryParamFactory) + value = Faker('name') + + class ProductTemplateFactory(DjangoModelFactory): class Meta: model = 'store.ProductTemplate' @@ -56,12 +64,19 @@ class ProductFactory(DjangoModelFactory): model = 'store.Product' name = Faker('name') - info = Faker('text') price = Faker('pydecimal', left_digits=5, right_digits=2, positive=True) available = Faker('boolean') template = SubFactory(ProductTemplateFactory) +class ProductParamFactory(DjangoModelFactory): + class Meta: + model = 'store.ProductParam' + + product = SubFactory(ProductFactory) + param = SubFactory(ProductCategoryParamFactory) + + class PaymentMethodFactory(DjangoModelFactory): class Meta: model = 'store.PaymentMethod' diff --git a/artel/store/tests/test_models.py b/artel/store/tests/test_models.py index e614333..fbdc288 100644 --- a/artel/store/tests/test_models.py +++ b/artel/store/tests/test_models.py @@ -3,15 +3,67 @@ from unittest.mock import patch from django.test import TestCase from django.urls import reverse from django.core import mail +from django.core.exceptions import ValidationError from store.tests import factories from store import models as store_models from mailings.tests.factories import MailTemplateFactory -# TODO - this is fine for now, but we'll want to use factoryboy for this: -# https://factoryboy.readthedocs.io/en/stable/ -# TODO - test have to rewritten - I'll do it tommorow +class ProductCategoryParamValueTestCase(TestCase): + def setUp(self): + super().setUp() + self.category = factories.ProductCategoryFactory() + + + def test_get_value_success(self): + param = factories.ProductCategoryParamFactory( + category=self.category, + param_type="int", + key="test_param" + ) + param_value = factories.ProductCategoryParamValueFactory(param=param, value="23") + proper_value = param_value.get_value() + self.assertEqual(proper_value, 23) + + def test_get_value_failure_wrong_value(self): + param = factories.ProductCategoryParamFactory( + category=self.category, + param_type="int", + key="test_param" + ) + param_value = factories.ProductCategoryParamValueFactory(param=param, value="wrong_value") + proper_value = param_value.get_value() + self.assertEqual(proper_value, None) + + +class ProductTestCase(TestCase): + + def test_category_params_one_value_success(self): + product = factories.ProductFactory() + param = factories.ProductCategoryParamFactory( + category=product.template.category, + param_type="int", + key="test_param" + ) + param_value = factories.ProductCategoryParamValueFactory(param=param, value="23") + product.params.add(param_value) + product.save() + self.assertEqual(product.params.count(), 1) + self.assertEqual(product.params.first().get_value(), 23) + + def test_category_params_multiple_values_failure(self): + product = factories.ProductFactory() + param = factories.ProductCategoryParamFactory( + category=product.template.category, + param_type="int", + key="test_param" + ) + param_value = factories.ProductCategoryParamValueFactory(param=param, value="23") + sec_param_value = factories.ProductCategoryParamValueFactory(param=param, value="24") + with self.assertRaises(ValidationError): + product.params.add(param_value) + product.params.add(sec_param_value) class OrderProductTestCase(TestCase): diff --git a/artel/store/tests/test_validators.py b/artel/store/tests/test_validators.py new file mode 100644 index 0000000..3a68554 --- /dev/null +++ b/artel/store/tests/test_validators.py @@ -0,0 +1,42 @@ +from django.test import TestCase +from django.core.exceptions import ValidationError + +from store.tests import factories +from store.validators import ProductParamDuplicateValidator +from store.models import ( + ProductParam, + Product +) + + +class CategoryParamValidationTestCase(TestCase): + + def setUp(self): + super().setUp() + self.product = factories.ProductFactory() + + def test_set_single_param_success(self): + param = factories.ProductCategoryParamFactory( + category=self.product.template.category, + param_type="int", + key="test_param" + ) + param_value = factories.ProductCategoryParamValueFactory(param=param, value="23") + param = ProductParam(param_value=param_value) + self.product.params.add(param_value) + self.assertEqual(self.product.params.count(), 1) + self.assertEqual(self.product.params.first().get_value(), 23) + + def test_set_multuiple_same_type_param_failure(self): + param = factories.ProductCategoryParamFactory( + category=self.product.template.category, + param_type="int", + key="test_param" + ) + param_value = factories.ProductCategoryParamValueFactory(param=param, value="23") + sec_param_value = factories.ProductCategoryParamValueFactory(param=param, value="24") + param = ProductParam(param_value=param_value) + self.product.params.add(param_value) + with self.assertRaises(ValidationError): + self.product.params.add(sec_param_value) + diff --git a/artel/store/urls.py b/artel/store/urls.py index 1ad8e00..103e01b 100644 --- a/artel/store/urls.py +++ b/artel/store/urls.py @@ -9,6 +9,7 @@ router.register("cart-action", store_views.CartActionView, "cart-action") urlpatterns = [ + path('product-configure//', store_views.ConfigureProductView.as_view(), name='product-configure'), path('cart/', store_views.CartView.as_view(), name='cart'), path("order/", store_views.OrderView.as_view(), name="order"), path("order/confirm/", store_views.OrderConfirmView.as_view(), name="order-confirm") diff --git a/artel/store/validators.py b/artel/store/validators.py new file mode 100644 index 0000000..574981e --- /dev/null +++ b/artel/store/validators.py @@ -0,0 +1,20 @@ +from typing import Any +from django.core.exceptions import ValidationError +from django.core.validators import BaseValidator + + +class ProductParamDuplicateValidator(BaseValidator): + + message = "Product param with this key already exists." + code = "duplicate" + + def __init__(self, *args, **kwargs): + super().__init__(limit_value=1, *args, **kwargs) + + def compare(self, param: Any, limit: Any) -> bool: + raise ValidationError("Not implemented") + print(param, limit) + count = param.product.params.filter( + param__param_value__param__key=param.param_value.param.key + ).count() + return count >= limit diff --git a/artel/store/views.py b/artel/store/views.py index 384e43b..71068d1 100644 --- a/artel/store/views.py +++ b/artel/store/views.py @@ -20,7 +20,8 @@ from store.serializers import ( from store.forms import CustomerDataForm from store.models import ( Order, - Product + Product, + ProductTemplate ) @@ -84,7 +85,20 @@ class CartActionView(ViewSet): items = cart.get_items() serializer = CartSerializer(instance=items, many=True) return Response(serializer.data, status=201) - + + +class ConfigureProductView(View): + template_name = "store/configure_product.html" + + def get_context_data(self, pk: int, **kwargs: Any) -> Dict[str, Any]: + context = {} + context["template"] = ProductTemplate.objects.get(pk=pk) + return context + + def get(self, request, pk: int, *args, **kwargs): + context = self.get_context_data(pk) + return render(request, self.template_name, context) + class OrderView(View): template_name = "store/order.html" From bf33ef4ee990477451724d7d5b2cd6a00e5a43fa Mon Sep 17 00:00:00 2001 From: mtyton Date: Mon, 3 Jul 2023 21:51:24 +0200 Subject: [PATCH 02/15] added correct ProductParam validation --- artel/store/models.py | 42 +++++++++++++++++++++++++++------------ artel/store/validators.py | 20 ------------------- 2 files changed, 29 insertions(+), 33 deletions(-) delete mode 100644 artel/store/validators.py diff --git a/artel/store/models.py b/artel/store/models.py index 948ca51..2be1ef8 100644 --- a/artel/store/models.py +++ b/artel/store/models.py @@ -3,7 +3,10 @@ import datetime import builtins from decimal import Decimal -from typing import Any +from typing import ( + Any, + Self +) from django.db import models from django.core.paginator import ( Paginator, @@ -16,6 +19,7 @@ from django.template import ( Context ) from django.core.exceptions import ValidationError +from django.db.models.signals import m2m_changed from modelcluster.models import ClusterableModel from modelcluster.fields import ParentalKey @@ -33,7 +37,6 @@ from mailings.models import ( OutgoingEmail, Attachment ) -from store.validators import ProductParamDuplicateValidator class BaseImageModel(models.Model): @@ -165,8 +168,7 @@ class Product(ClusterableModel): name = models.CharField(max_length=255, blank=True) template = models.ForeignKey(ProductTemplate, on_delete=models.CASCADE, related_name="products") params = models.ManyToManyField( - ProductCategoryParamValue, blank=True, through="ProductParam", - validators=(ProductParamDuplicateValidator(),) + ProductCategoryParamValue, blank=True, through="ProductParam" ) price = models.FloatField() available = models.BooleanField(default=True) @@ -219,16 +221,30 @@ class ProductParam(models.Model): self.full_clean() return super().save(*args, **kwargs) - def clean(self) -> None: - print("SDADASDASDASD") - # get all of this product params with same category - product_params_count = self.product.product_params.filter( - param_value__param=self.param_value.param - ).count() - if product_params_count > 1: - raise ValidationError("Product can't have two values for one param") - return super().clean() +# SIGNALS +def validate_param(sender, **kwargs): + action = kwargs.pop("action") + if action != "pre_add": + return + pk_set = kwargs.get("pk_set") + product_instance = kwargs.get("instance") + errors = [] + for pk in pk_set: + try: + param = ProductCategoryParamValue.objects.get(pk=pk).param + except ProductCategoryParamValue.DoesNotExist: + # TODO log this + ... + count = product_instance.params.filter(productparam__param_value__param=param).count() + if count >= 1: + errors.append(ValueError("Product param with this key already exists.")) + + if errors: + raise ValidationError(errors) + + +m2m_changed.connect(validate_param, Product.params.through) class ProductListPage(Page): diff --git a/artel/store/validators.py b/artel/store/validators.py deleted file mode 100644 index 574981e..0000000 --- a/artel/store/validators.py +++ /dev/null @@ -1,20 +0,0 @@ -from typing import Any -from django.core.exceptions import ValidationError -from django.core.validators import BaseValidator - - -class ProductParamDuplicateValidator(BaseValidator): - - message = "Product param with this key already exists." - code = "duplicate" - - def __init__(self, *args, **kwargs): - super().__init__(limit_value=1, *args, **kwargs) - - def compare(self, param: Any, limit: Any) -> bool: - raise ValidationError("Not implemented") - print(param, limit) - count = param.product.params.filter( - param__param_value__param__key=param.param_value.param.key - ).count() - return count >= limit From 540318ca48a3f21486334bb4cd14062e5ef6b6c2 Mon Sep 17 00:00:00 2001 From: mtyton Date: Fri, 7 Jul 2023 23:29:42 +0200 Subject: [PATCH 03/15] finished preview version of configurator --- artel/artel/templates/base.html | 1 - artel/store/forms.py | 27 ++++++++++- artel/store/models.py | 6 ++- .../templates/store/configure_product.html | 46 +++++++++++-------- artel/store/tests/test_models.py | 39 ++++++++++++++-- artel/store/tests/test_validators.py | 42 ----------------- artel/store/views.py | 18 ++++++-- 7 files changed, 110 insertions(+), 69 deletions(-) delete mode 100644 artel/store/tests/test_validators.py diff --git a/artel/artel/templates/base.html b/artel/artel/templates/base.html index 086f284..86be8f0 100644 --- a/artel/artel/templates/base.html +++ b/artel/artel/templates/base.html @@ -53,7 +53,6 @@ {# Global javascript #} - diff --git a/artel/store/forms.py b/artel/store/forms.py index 74fe4bb..08e8b09 100644 --- a/artel/store/forms.py +++ b/artel/store/forms.py @@ -1,6 +1,12 @@ from django import forms from phonenumber_field.formfields import PhoneNumberField -# from phonenumber_field.widgets import PhoneNumberPrefixWidget + +from store.models import ( + ProductCategoryParamValue, + ProductCategoryParam, + ProductCategory +) + @@ -32,3 +38,22 @@ class CustomerDataForm(forms.Form): choices=(("PL", "Polska"), ), label="Kraj", widget=forms.Select(attrs={"class": "form-control"}) ) + + +class ProductCategoryParamForm(forms.ModelForm): + class Meta: + model = ProductCategoryParam + fields = ("key", "value", ) + readonly_fields = ("key", ) + + def __init__(self, instance, *args, **kwargs): + super().__init__(*args, instance=instance, **kwargs) + self.fields["key"].widget.attrs["disabled"] = True + self.fields["value"].choices = [ + (param_value.pk, param_value.value) for param_value in instance.param_values.all() + ] + + value = forms.ModelChoiceField( + queryset=ProductCategoryParamValue.objects.none(), + widget=forms.RadioSelect(attrs={"class": "form-control"}) + ) diff --git a/artel/store/models.py b/artel/store/models.py index 2be1ef8..a605055 100644 --- a/artel/store/models.py +++ b/artel/store/models.py @@ -5,7 +5,7 @@ import builtins from decimal import Decimal from typing import ( Any, - Self + Iterator ) from django.db import models from django.core.paginator import ( @@ -110,6 +110,10 @@ class ProductCategoryParam(ClusterableModel): InlinePanel("param_values") ] + def get_available_values(self) -> Iterator[any]: + for elem in self.param_values.all(): + yield elem.get_value() + class ProductCategoryParamValue(ClusterableModel): param = ParentalKey(ProductCategoryParam, on_delete=models.CASCADE, related_name="param_values") diff --git a/artel/store/templates/store/configure_product.html b/artel/store/templates/store/configure_product.html index b46e34d..8e8f773 100644 --- a/artel/store/templates/store/configure_product.html +++ b/artel/store/templates/store/configure_product.html @@ -2,7 +2,7 @@ {% block content %} -
+

{{template.title}}

@@ -24,26 +24,36 @@
-

Dostępne konfiguracje:

- -
-
- {% for product in template.products.all %} -
-
-
- {{product.name}} +
+ {% csrf_token %} + {% for form in forms %} +
+

+ {{form.instance}} +

+ +
+ {% for value, label in form.value.field.choices %} +
+ +
-
- Responsive image -
-
- -
+ {% endfor %} +
+
+ {% endfor %} +
+
+
+ +
+
+
- {% if forloop.counter|divisibleby:3 %}
{% endif %} - {% endfor %} +
+
diff --git a/artel/store/tests/test_models.py b/artel/store/tests/test_models.py index fbdc288..3b07e79 100644 --- a/artel/store/tests/test_models.py +++ b/artel/store/tests/test_models.py @@ -4,12 +4,42 @@ from django.test import TestCase from django.urls import reverse from django.core import mail from django.core.exceptions import ValidationError +from django.db import transaction from store.tests import factories from store import models as store_models from mailings.tests.factories import MailTemplateFactory +class ProductCategoryParamTestCase(TestCase): + def setUp(self): + super().setUp() + self.category = factories.ProductCategoryFactory() + self.param = factories.ProductCategoryParamFactory( + category=self.category, + param_type="int", + key="test_param" + ) + + def test_get_available_values_no_values_success(self): + available_values = [v for v in self.param.get_available_values()] + self.assertEqual(available_values, []) + + def test_get_available_values_one_value_success(self): + factories.ProductCategoryParamValueFactory(param=self.param, value="23") + available_values = [v for v in self.param.get_available_values()] + self.assertEqual(available_values, [23]) + self.assertEqual(len(available_values), 1) + + def test_get_available_values_multiple_values_success(self): + factories.ProductCategoryParamValueFactory(param=self.param, value="23") + factories.ProductCategoryParamValueFactory(param=self.param, value="24") + factories.ProductCategoryParamValueFactory(param=self.param, value="25") + available_values = [v for v in self.param.get_available_values()] + self.assertEqual(available_values, [23, 24, 25]) + self.assertEqual(len(available_values), 3) + + class ProductCategoryParamValueTestCase(TestCase): def setUp(self): super().setUp() @@ -47,7 +77,8 @@ class ProductTestCase(TestCase): key="test_param" ) param_value = factories.ProductCategoryParamValueFactory(param=param, value="23") - product.params.add(param_value) + with transaction.atomic(): + product.params.add(param_value) product.save() self.assertEqual(product.params.count(), 1) self.assertEqual(product.params.first().get_value(), 23) @@ -62,8 +93,10 @@ class ProductTestCase(TestCase): param_value = factories.ProductCategoryParamValueFactory(param=param, value="23") sec_param_value = factories.ProductCategoryParamValueFactory(param=param, value="24") with self.assertRaises(ValidationError): - product.params.add(param_value) - product.params.add(sec_param_value) + with transaction.atomic(): + product.params.add(param_value) + product.params.add(sec_param_value) + self.assertEqual(product.params.count(), 0) class OrderProductTestCase(TestCase): diff --git a/artel/store/tests/test_validators.py b/artel/store/tests/test_validators.py deleted file mode 100644 index 3a68554..0000000 --- a/artel/store/tests/test_validators.py +++ /dev/null @@ -1,42 +0,0 @@ -from django.test import TestCase -from django.core.exceptions import ValidationError - -from store.tests import factories -from store.validators import ProductParamDuplicateValidator -from store.models import ( - ProductParam, - Product -) - - -class CategoryParamValidationTestCase(TestCase): - - def setUp(self): - super().setUp() - self.product = factories.ProductFactory() - - def test_set_single_param_success(self): - param = factories.ProductCategoryParamFactory( - category=self.product.template.category, - param_type="int", - key="test_param" - ) - param_value = factories.ProductCategoryParamValueFactory(param=param, value="23") - param = ProductParam(param_value=param_value) - self.product.params.add(param_value) - self.assertEqual(self.product.params.count(), 1) - self.assertEqual(self.product.params.first().get_value(), 23) - - def test_set_multuiple_same_type_param_failure(self): - param = factories.ProductCategoryParamFactory( - category=self.product.template.category, - param_type="int", - key="test_param" - ) - param_value = factories.ProductCategoryParamValueFactory(param=param, value="23") - sec_param_value = factories.ProductCategoryParamValueFactory(param=param, value="24") - param = ProductParam(param_value=param_value) - self.product.params.add(param_value) - with self.assertRaises(ValidationError): - self.product.params.add(sec_param_value) - diff --git a/artel/store/views.py b/artel/store/views.py index 71068d1..25537b8 100644 --- a/artel/store/views.py +++ b/artel/store/views.py @@ -17,7 +17,10 @@ from store.serializers import ( CartSerializer, CartProductAddSerializer ) -from store.forms import CustomerDataForm +from store.forms import ( + CustomerDataForm, + ProductCategoryParamForm +) from store.models import ( Order, Product, @@ -91,8 +94,17 @@ class ConfigureProductView(View): template_name = "store/configure_product.html" def get_context_data(self, pk: int, **kwargs: Any) -> Dict[str, Any]: - context = {} - context["template"] = ProductTemplate.objects.get(pk=pk) + template = ProductTemplate.objects.get(pk=pk) + category_params = template.category.category_params.all() + + + context = { + "template": template, + "available_variants": Product.objects.filter(template__pk=pk), + "category_params": category_params, + "forms": [ProductCategoryParamForm(instance=param) for param in category_params] + } + return context def get(self, request, pk: int, *args, **kwargs): From c76e6fbc128d54e4c24d94552dad478ee9157fcc Mon Sep 17 00:00:00 2001 From: mtyton Date: Mon, 10 Jul 2023 22:36:11 +0200 Subject: [PATCH 04/15] configurator is almost done --- artel/store/forms.py | 8 ++- artel/store/models.py | 17 ++++++ .../templates/store/configure_product.html | 53 ++++++++----------- .../store/configure_product_summary.html | 0 .../templates/store/product_list_page.html | 20 ------- artel/store/urls.py | 1 + artel/store/views.py | 16 ++++++ 7 files changed, 63 insertions(+), 52 deletions(-) create mode 100644 artel/store/templates/store/configure_product_summary.html diff --git a/artel/store/forms.py b/artel/store/forms.py index 08e8b09..8bc7673 100644 --- a/artel/store/forms.py +++ b/artel/store/forms.py @@ -43,7 +43,7 @@ class CustomerDataForm(forms.Form): class ProductCategoryParamForm(forms.ModelForm): class Meta: model = ProductCategoryParam - fields = ("key", "value", ) + fields = ("key", "value") readonly_fields = ("key", ) def __init__(self, instance, *args, **kwargs): @@ -57,3 +57,9 @@ class ProductCategoryParamForm(forms.ModelForm): queryset=ProductCategoryParamValue.objects.none(), widget=forms.RadioSelect(attrs={"class": "form-control"}) ) + + def save(self, *args, **kwargs): + return ProductCategoryParamValue.objects.get( + param=self.instance, + value=str(self.cleaned_data["value"]) + ) diff --git a/artel/store/models.py b/artel/store/models.py index a605055..30d37bc 100644 --- a/artel/store/models.py +++ b/artel/store/models.py @@ -168,6 +168,23 @@ class ProductTemplateImage(BaseImageModel): is_main = models.BooleanField(default=False) +class ProductManager(models.Manager): + + def get_or_create_by_params(self, params: list[ProductCategoryParamValue], template: ProductTemplate): + product = self.filter(params__in=params).first() + if not product: + product = self.create( + name=f"{template.title} - AUTOGENERATED", + template=template, + price=..., + available=False + ) + for param in params: + product.params.add(param) + + return product + + class Product(ClusterableModel): name = models.CharField(max_length=255, blank=True) template = models.ForeignKey(ProductTemplate, on_delete=models.CASCADE, related_name="products") diff --git a/artel/store/templates/store/configure_product.html b/artel/store/templates/store/configure_product.html index 8e8f773..05666ff 100644 --- a/artel/store/templates/store/configure_product.html +++ b/artel/store/templates/store/configure_product.html @@ -1,16 +1,12 @@ {% extends 'base.html' %} {% block content %} -

{{template.title}}

- - -
@@ -24,36 +20,31 @@
-
- {% csrf_token %} - {% for form in forms %} -
-

- {{form.instance}} -

- -
- {% for value, label in form.value.field.choices %} -
- - +
+ + {% csrf_token %} +
+ {% for form in forms %} +
+

{{form.instance}}

+ {% for value, label in form.value.field.choices %} +
+ + +
+ {% endfor %}
- {% endfor %} -
-
- {% endfor %} -
-
-
- -
-
- + {% if forloop.counter|divisibleby:"2" %}
{% endif %} + {% endfor %} +
+
+
+
+
-
- + +
diff --git a/artel/store/templates/store/configure_product_summary.html b/artel/store/templates/store/configure_product_summary.html new file mode 100644 index 0000000..e69de29 diff --git a/artel/store/templates/store/product_list_page.html b/artel/store/templates/store/product_list_page.html index 778471c..3c09650 100644 --- a/artel/store/templates/store/product_list_page.html +++ b/artel/store/templates/store/product_list_page.html @@ -3,26 +3,6 @@ {% block content %} - -
{% for item in items %} diff --git a/artel/store/urls.py b/artel/store/urls.py index 103e01b..d49b1c7 100644 --- a/artel/store/urls.py +++ b/artel/store/urls.py @@ -10,6 +10,7 @@ router.register("cart-action", store_views.CartActionView, "cart-action") urlpatterns = [ path('product-configure//', store_views.ConfigureProductView.as_view(), name='product-configure'), + path('product-configure/summary//', store_views.ConfigureProductSummaryView.as_view(), name='product-configure-summary'), path('cart/', store_views.CartView.as_view(), name='cart'), path("order/", store_views.OrderView.as_view(), name="order"), path("order/confirm/", store_views.OrderConfirmView.as_view(), name="order-confirm") diff --git a/artel/store/views.py b/artel/store/views.py index 25537b8..c06db5c 100644 --- a/artel/store/views.py +++ b/artel/store/views.py @@ -111,6 +111,22 @@ class ConfigureProductView(View): context = self.get_context_data(pk) return render(request, self.template_name, context) + def post(self, request, pk: int, *args, **kwargs): + print(request.POST) + return HttpResponseRedirect(reverse("product-configure-summary", kwargs={"variant_pk": 1})) + + +class ConfigureProductSummaryView(View): + template_name = "store/configure_product_summary.html" + + def get(self, request, variant_pk: int, *args, **kwargs): + variant = Product.objects.get(pk=variant_pk) + context = { + "variant": variant, + "category_params": variant.template.category.category_params.all() + } + return render(request, self.template_name, context) + class OrderView(View): template_name = "store/order.html" From c7aa69448c6e7a4381d7c8c0b978e2ca782e4ec9 Mon Sep 17 00:00:00 2001 From: mtyton Date: Sun, 16 Jul 2023 16:22:09 +0200 Subject: [PATCH 05/15] [WIP] trying formset attempt --- artel/mailings/admin.py | 2 - artel/store/forms.py | 41 +++++++++----- artel/store/models.py | 16 +++++- .../templates/store/configure_product.html | 21 ++++--- artel/store/tests/test_models.py | 42 ++++++++++++++ artel/store/views.py | 55 ++++++++++++++++--- 6 files changed, 144 insertions(+), 33 deletions(-) diff --git a/artel/mailings/admin.py b/artel/mailings/admin.py index 4440840..3600a42 100644 --- a/artel/mailings/admin.py +++ b/artel/mailings/admin.py @@ -40,12 +40,10 @@ class OutgoingMailAdmin(ModelAdmin): exclude_from_explorer = False list_display = ( "subject", - "to", "sent", ) search_fields = ( "subject", - "to", ) list_filter = ( "subject", diff --git a/artel/store/forms.py b/artel/store/forms.py index 8bc7673..6822fe2 100644 --- a/artel/store/forms.py +++ b/artel/store/forms.py @@ -40,26 +40,39 @@ class CustomerDataForm(forms.Form): ) -class ProductCategoryParamForm(forms.ModelForm): +class ProductCategoryParamFormset(forms.BaseModelFormSet): + ... + + +class ProductCategoryParamValueForm(forms.ModelForm): class Meta: - model = ProductCategoryParam + model = ProductCategoryParamValue fields = ("key", "value") - readonly_fields = ("key", ) - - def __init__(self, instance, *args, **kwargs): - super().__init__(*args, instance=instance, **kwargs) - self.fields["key"].widget.attrs["disabled"] = True - self.fields["value"].choices = [ - (param_value.pk, param_value.value) for param_value in instance.param_values.all() - ] - + + key = forms.CharField(required=True) value = forms.ModelChoiceField( queryset=ProductCategoryParamValue.objects.none(), - widget=forms.RadioSelect(attrs={"class": "form-control"}) + widget=forms.RadioSelect(attrs={"class": "btn-check", "type": "radio", "autocomplete": "off"}), + required=True ) + def _get_instace(self, key: str): + return ProductCategoryParam.objects.get(key=key) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + key = self.initial.get("key") + if not key: + return + self.cat_param = self._get_instace(key) + self.fields["value"].choices = [ + (param_value.pk, param_value.value) for param_value in self.cat_param.param_values.all() + ] + def save(self, *args, **kwargs): - return ProductCategoryParamValue.objects.get( - param=self.instance, + param_value = ProductCategoryParamValue.objects.get( + param__key=str(self.cleaned_data["key"]), value=str(self.cleaned_data["value"]) ) + print(param_value or "DUPSKo") + return param_value diff --git a/artel/store/models.py b/artel/store/models.py index 30d37bc..01c7460 100644 --- a/artel/store/models.py +++ b/artel/store/models.py @@ -171,12 +171,22 @@ class ProductTemplateImage(BaseImageModel): class ProductManager(models.Manager): def get_or_create_by_params(self, params: list[ProductCategoryParamValue], template: ProductTemplate): - product = self.filter(params__in=params).first() + products = self.filter(template=template) + # TODO - other price + price_proposal = products.first().price if products.first() else 4.0 + for param in params: + products = products.filter(params__pk=param.pk) + + # There should be only one + if not products.count() <= 1: + raise ValidationError("There should be only one product with given set of params") + + product = products.first() if not product: product = self.create( name=f"{template.title} - AUTOGENERATED", template=template, - price=..., + price=price_proposal, available=False ) for param in params: @@ -194,6 +204,8 @@ class Product(ClusterableModel): price = models.FloatField() available = models.BooleanField(default=True) + objects = ProductManager() + panels = [ FieldPanel("template"), FieldPanel("price"), diff --git a/artel/store/templates/store/configure_product.html b/artel/store/templates/store/configure_product.html index 05666ff..b67a744 100644 --- a/artel/store/templates/store/configure_product.html +++ b/artel/store/templates/store/configure_product.html @@ -23,16 +23,21 @@
{% csrf_token %} + + {{ formset.management_form }}
- {% for form in forms %} + {% for form in formset.forms %}
-

{{form.instance}}

- {% for value, label in form.value.field.choices %} -
- - -
- {% endfor %} +

{{form.cat_param}}

+ {% if form.value.field.choices %} + + {% for value, label in form.value.field.choices %} +
+ + +
+ {% endfor %} + {% endif %}
{% if forloop.counter|divisibleby:"2" %}
{% endif %} {% endfor %} diff --git a/artel/store/tests/test_models.py b/artel/store/tests/test_models.py index 3b07e79..b29364a 100644 --- a/artel/store/tests/test_models.py +++ b/artel/store/tests/test_models.py @@ -98,6 +98,48 @@ class ProductTestCase(TestCase): product.params.add(sec_param_value) self.assertEqual(product.params.count(), 0) + def test_get_or_create_by_params_success(self): + product = factories.ProductFactory(available=True) + value1 = factories.ProductCategoryParamValueFactory() + value2 = factories.ProductCategoryParamValueFactory() + product.params.add(value1) + product.params.add(value2) + product.save() + prod = store_models.Product.objects.get_or_create_by_params( + params=[value1, value2], template=product.template, + ) + self.assertIsNotNone(prod) + self.assertEqual(prod.pk, product.pk) + self.assertTrue(prod.available) + + def test_get_or_create_by_params_success_not_existing_product(self): + product = factories.ProductFactory(available=True) + value1 = factories.ProductCategoryParamValueFactory() + value2 = factories.ProductCategoryParamValueFactory() + product.params.add(value1) + product.price = 13.0 + product.save() + + prod = store_models.Product.objects.get_or_create_by_params( + params=[value1, value2], template=product.template, + ) + self.assertIsNotNone(prod) + self.assertNotEqual(prod.pk, product.pk) + self.assertFalse(prod.available) + self.assertEqual(prod.price, 13.0) + + def test_get_or_create_by_params_success_not_existing_product_no_other_products(self): + template = factories.ProductTemplateFactory() + value1 = factories.ProductCategoryParamValueFactory() + value2 = factories.ProductCategoryParamValueFactory() + + prod = store_models.Product.objects.get_or_create_by_params( + params=[value1, value2], template=template, + ) + self.assertIsNotNone(prod) + self.assertFalse(prod.available) + self.assertEqual(prod.price, 4.0) + class OrderProductTestCase(TestCase): def setUp(self): diff --git a/artel/store/views.py b/artel/store/views.py index c06db5c..75ff0dd 100644 --- a/artel/store/views.py +++ b/artel/store/views.py @@ -8,6 +8,7 @@ from django.shortcuts import render from django.urls import reverse from django.http import HttpResponseRedirect from django.contrib import messages +from django.forms import modelformset_factory from rest_framework.viewsets import ViewSet from rest_framework.decorators import action from rest_framework.response import Response @@ -19,12 +20,14 @@ from store.serializers import ( ) from store.forms import ( CustomerDataForm, - ProductCategoryParamForm + ProductCategoryParamValueForm, + ProductCategoryParamFormset ) from store.models import ( Order, Product, - ProductTemplate + ProductTemplate, + ProductCategoryParamValue ) @@ -96,13 +99,17 @@ class ConfigureProductView(View): def get_context_data(self, pk: int, **kwargs: Any) -> Dict[str, Any]: template = ProductTemplate.objects.get(pk=pk) category_params = template.category.category_params.all() - - + formset_class = modelformset_factory( + ProductCategoryParamValue, + form=ProductCategoryParamValueForm, + formset=ProductCategoryParamFormset + ) + formset = formset_class(queryset=category_params) context = { "template": template, "available_variants": Product.objects.filter(template__pk=pk), "category_params": category_params, - "forms": [ProductCategoryParamForm(instance=param) for param in category_params] + "formset": formset } return context @@ -112,8 +119,42 @@ class ConfigureProductView(View): return render(request, self.template_name, context) def post(self, request, pk: int, *args, **kwargs): + # first select template + template = ProductTemplate.objects.get(pk=pk) + category_params = template.category.category_params.all() + params_values = [] + formset_class = modelformset_factory( + ProductCategoryParamValue, + form=ProductCategoryParamValueForm, + formset=ProductCategoryParamFormset + ) + formset = formset_class(queryset=category_params, data=request.POST) print(request.POST) - return HttpResponseRedirect(reverse("product-configure-summary", kwargs={"variant_pk": 1})) + if not formset.is_valid(): + print(formset.errors) + messages.error(request, "Niepoprawne dane") + context = self.get_context_data(pk) + context["formset"] = formset + return render(request, self.template_name, context) + + for form in formset.forms: + if not form.is_valid(): + messages.error(request, "Niepoprawne dane") + context = self.get_context_data(pk) + context["formset"] = formset + return render(request, self.template_name, context) + params_values.append(form.save()) + + product_variant = Product.objects.get_or_create_by_params( + template=ProductTemplate.objects.get(pk=pk), params=params_values + ) + if not product_variant: + messages.error(request, "Nie udało się utworzyć wariantu produktu") + return HttpResponseRedirect(reverse("product-configure", kwargs={"pk": pk})) + + return HttpResponseRedirect( + reverse("product-configure-summary", kwargs={"variant_pk": product_variant.pk}) + ) class ConfigureProductSummaryView(View): @@ -123,7 +164,7 @@ class ConfigureProductSummaryView(View): variant = Product.objects.get(pk=variant_pk) context = { "variant": variant, - "category_params": variant.template.category.category_params.all() + "params_values": variant.params.all() } return render(request, self.template_name, context) From 10b952726119204b53b23a898c57dc3ad72efbcf Mon Sep 17 00:00:00 2001 From: mtyton Date: Thu, 20 Jul 2023 17:49:12 +0200 Subject: [PATCH 06/15] [WIP] added offer request --- artel/store/forms.py | 54 ++++++++----------- artel/store/models.py | 7 +-- .../templates/store/configure_product.html | 16 ++---- .../store/configure_product_summary.html | 52 ++++++++++++++++++ .../store/forms/button_toggle_select.html | 28 ++++++++++ artel/store/tests/test_models.py | 2 +- artel/store/tests/test_views.py | 11 ++++ artel/store/urls.py | 2 +- artel/store/views.py | 51 +++--------------- 9 files changed, 129 insertions(+), 94 deletions(-) create mode 100644 artel/store/templates/store/forms/button_toggle_select.html create mode 100644 artel/store/tests/test_views.py diff --git a/artel/store/forms.py b/artel/store/forms.py index 6822fe2..e687bc7 100644 --- a/artel/store/forms.py +++ b/artel/store/forms.py @@ -2,9 +2,9 @@ from django import forms from phonenumber_field.formfields import PhoneNumberField from store.models import ( + ProductTemplate, ProductCategoryParamValue, - ProductCategoryParam, - ProductCategory + Product ) @@ -40,39 +40,27 @@ class CustomerDataForm(forms.Form): ) -class ProductCategoryParamFormset(forms.BaseModelFormSet): - ... +class ButtonToggleSelect(forms.RadioSelect): + template_name = "store/forms/button_toggle_select.html" -class ProductCategoryParamValueForm(forms.ModelForm): - class Meta: - model = ProductCategoryParamValue - fields = ("key", "value") +class ProductTemplateConfigForm(forms.Form): - key = forms.CharField(required=True) - value = forms.ModelChoiceField( - queryset=ProductCategoryParamValue.objects.none(), - widget=forms.RadioSelect(attrs={"class": "btn-check", "type": "radio", "autocomplete": "off"}), - required=True - ) - - def _get_instace(self, key: str): - return ProductCategoryParam.objects.get(key=key) - - def __init__(self, *args, **kwargs): + def _create_dynamic_fields(self, template: ProductTemplate): + category_params = template.category.category_params.all() + for param in category_params: + self.fields[param.key] = forms.ModelChoiceField( + queryset=ProductCategoryParamValue.objects.filter(param=param), + widget=ButtonToggleSelect(attrs={"class": "btn-group btn-group-toggle"}), + ) + + def __init__( + self, template: ProductTemplate, *args, **kwargs + ): + self.template = template super().__init__(*args, **kwargs) - key = self.initial.get("key") - if not key: - return - self.cat_param = self._get_instace(key) - self.fields["value"].choices = [ - (param_value.pk, param_value.value) for param_value in self.cat_param.param_values.all() - ] + self._create_dynamic_fields(template) - def save(self, *args, **kwargs): - param_value = ProductCategoryParamValue.objects.get( - param__key=str(self.cleaned_data["key"]), - value=str(self.cleaned_data["value"]) - ) - print(param_value or "DUPSKo") - return param_value + def get_product(self): + params = list(self.cleaned_data.values()) + return Product.objects.get_or_create_by_params(template=self.template, params=params) diff --git a/artel/store/models.py b/artel/store/models.py index 01c7460..eb85f28 100644 --- a/artel/store/models.py +++ b/artel/store/models.py @@ -172,8 +172,7 @@ class ProductManager(models.Manager): def get_or_create_by_params(self, params: list[ProductCategoryParamValue], template: ProductTemplate): products = self.filter(template=template) - # TODO - other price - price_proposal = products.first().price if products.first() else 4.0 + for param in params: products = products.filter(params__pk=param.pk) @@ -186,7 +185,7 @@ class ProductManager(models.Manager): product = self.create( name=f"{template.title} - AUTOGENERATED", template=template, - price=price_proposal, + price=0, available=False ) for param in params: @@ -220,6 +219,8 @@ class Product(ClusterableModel): try: return self.product_images.get(is_main=True) except ProductImage.DoesNotExist: + if main_image := self.template.main_image: + return main_image return self.product_images.first() diff --git a/artel/store/templates/store/configure_product.html b/artel/store/templates/store/configure_product.html index b67a744..4e59610 100644 --- a/artel/store/templates/store/configure_product.html +++ b/artel/store/templates/store/configure_product.html @@ -23,21 +23,11 @@
{% csrf_token %} - - {{ formset.management_form }}
- {% for form in formset.forms %} + {% for field in form %}
-

{{form.cat_param}}

- {% if form.value.field.choices %} - - {% for value, label in form.value.field.choices %} -
- - -
- {% endfor %} - {% endif %} +

{{field.label}}

+ {{field}}
{% if forloop.counter|divisibleby:"2" %}
{% endif %} {% endfor %} diff --git a/artel/store/templates/store/configure_product_summary.html b/artel/store/templates/store/configure_product_summary.html index e69de29..59e9b4d 100644 --- a/artel/store/templates/store/configure_product_summary.html +++ b/artel/store/templates/store/configure_product_summary.html @@ -0,0 +1,52 @@ +{% extends 'base.html' %} + +{% block content %} +
+
+
+
+ Responsive image +
+
+
+
+ {% for value in params_values %} +
+
+

{{value}}

+
+
+
+ {% endfor %} +
+
+
+
+ {% if not variant.available %} +
+
+ Niestety skonfigurowany przez Ciebie wariant produktu nie jest jeszcze dostępny. + Jeżeli jesteś zainteresowany tą konfiguracją złóż zapytanie ofertowe. +
+
+ {% endif %} +
+
+ {% if variant.available %} +

Cena: {{variant.price}} zł

+ {% endif %} +
+
+ Wróć do konfiguratora + {% if variant.available %} + + {% else %} + + {% endif %} +
+
+
+
+ +{% endblock %} diff --git a/artel/store/templates/store/forms/button_toggle_select.html b/artel/store/templates/store/forms/button_toggle_select.html new file mode 100644 index 0000000..2d5e4b6 --- /dev/null +++ b/artel/store/templates/store/forms/button_toggle_select.html @@ -0,0 +1,28 @@ + +{% with id=widget.attrs.id %} +
+ {% for group, options, index in widget.optgroups %} + {% for option in options %} + + + {% endfor %} + {% endfor %} +
+{% endwith %} + diff --git a/artel/store/tests/test_models.py b/artel/store/tests/test_models.py index b29364a..8e0e44b 100644 --- a/artel/store/tests/test_models.py +++ b/artel/store/tests/test_models.py @@ -138,7 +138,7 @@ class ProductTestCase(TestCase): ) self.assertIsNotNone(prod) self.assertFalse(prod.available) - self.assertEqual(prod.price, 4.0) + self.assertEqual(prod.price, 0) class OrderProductTestCase(TestCase): diff --git a/artel/store/tests/test_views.py b/artel/store/tests/test_views.py new file mode 100644 index 0000000..d5249a2 --- /dev/null +++ b/artel/store/tests/test_views.py @@ -0,0 +1,11 @@ +from django.test import TestCase + + +class ConfigureProductViewTestCase(TestCase): + + def setUp(self): + ... + + def test_sdkfsdf(self): + ... + diff --git a/artel/store/urls.py b/artel/store/urls.py index d49b1c7..7e181a9 100644 --- a/artel/store/urls.py +++ b/artel/store/urls.py @@ -10,7 +10,7 @@ router.register("cart-action", store_views.CartActionView, "cart-action") urlpatterns = [ path('product-configure//', store_views.ConfigureProductView.as_view(), name='product-configure'), - path('product-configure/summary//', store_views.ConfigureProductSummaryView.as_view(), name='product-configure-summary'), + path('product-configure/summary//', store_views.ConfigureProductSummaryView.as_view(), name='configure-product-summary'), path('cart/', store_views.CartView.as_view(), name='cart'), path("order/", store_views.OrderView.as_view(), name="order"), path("order/confirm/", store_views.OrderConfirmView.as_view(), name="order-confirm") diff --git a/artel/store/views.py b/artel/store/views.py index 75ff0dd..c499d15 100644 --- a/artel/store/views.py +++ b/artel/store/views.py @@ -20,8 +20,7 @@ from store.serializers import ( ) from store.forms import ( CustomerDataForm, - ProductCategoryParamValueForm, - ProductCategoryParamFormset + ProductTemplateConfigForm ) from store.models import ( Order, @@ -98,18 +97,11 @@ class ConfigureProductView(View): def get_context_data(self, pk: int, **kwargs: Any) -> Dict[str, Any]: template = ProductTemplate.objects.get(pk=pk) - category_params = template.category.category_params.all() - formset_class = modelformset_factory( - ProductCategoryParamValue, - form=ProductCategoryParamValueForm, - formset=ProductCategoryParamFormset - ) - formset = formset_class(queryset=category_params) + form = ProductTemplateConfigForm(template=template) context = { "template": template, "available_variants": Product.objects.filter(template__pk=pk), - "category_params": category_params, - "formset": formset + "form": form } return context @@ -121,41 +113,14 @@ class ConfigureProductView(View): def post(self, request, pk: int, *args, **kwargs): # first select template template = ProductTemplate.objects.get(pk=pk) - category_params = template.category.category_params.all() - params_values = [] - formset_class = modelformset_factory( - ProductCategoryParamValue, - form=ProductCategoryParamValueForm, - formset=ProductCategoryParamFormset - ) - formset = formset_class(queryset=category_params, data=request.POST) - print(request.POST) - if not formset.is_valid(): - print(formset.errors) - messages.error(request, "Niepoprawne dane") + form = ProductTemplateConfigForm(template=template, data=request.POST) + if not form.is_valid(): context = self.get_context_data(pk) - context["formset"] = formset + context["form"] = form return render(request, self.template_name, context) - - for form in formset.forms: - if not form.is_valid(): - messages.error(request, "Niepoprawne dane") - context = self.get_context_data(pk) - context["formset"] = formset - return render(request, self.template_name, context) - params_values.append(form.save()) - product_variant = Product.objects.get_or_create_by_params( - template=ProductTemplate.objects.get(pk=pk), params=params_values - ) - if not product_variant: - messages.error(request, "Nie udało się utworzyć wariantu produktu") - return HttpResponseRedirect(reverse("product-configure", kwargs={"pk": pk})) - - return HttpResponseRedirect( - reverse("product-configure-summary", kwargs={"variant_pk": product_variant.pk}) - ) - + product_variant = form.get_product() + return HttpResponseRedirect(reverse("configure-product-summary", args=[product_variant.pk])) class ConfigureProductSummaryView(View): template_name = "store/configure_product_summary.html" From cffbc1fd4116996b9ecb0f5a7b14cb11d651e513 Mon Sep 17 00:00:00 2001 From: mtyton Date: Thu, 20 Jul 2023 18:32:10 +0200 Subject: [PATCH 07/15] added sepparate docker-compose file for tests --- artel/docker-compose-test.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 artel/docker-compose-test.yml diff --git a/artel/docker-compose-test.yml b/artel/docker-compose-test.yml new file mode 100644 index 0000000..f44132b --- /dev/null +++ b/artel/docker-compose-test.yml @@ -0,0 +1,30 @@ +version: "3.8" +services: + test_db: + image: postgres + restart: always + environment: + - POSTGRES_ROOT_PASSWORD + - POSTGRES_USER + - POSTGRES_PASSWORD + - POSTGRES_DB + volumes: + - ../postgres/:/var/lib/postgresql + env_file: + - .env + test_comfy: + depends_on: + - test_db + build: + dockerfile: Dockerfile.local + context: ./ + user: "${UID}:${GID}" + volumes: + - ./:/app + environment: + - SECRET_KEY + - DATABASE_URL + env_file: + - .env + command: + python manage.py test --noinput From 3a8ffd73c57b52229fbe7a7e362b6e9a09dd71c3 Mon Sep 17 00:00:00 2001 From: mtyton Date: Fri, 21 Jul 2023 21:34:37 +0200 Subject: [PATCH 08/15] configurator is finished summary page has been added --- artel/docker-compose.yml | 3 ++ .../0012_order_uuid_product_uuid.py | 23 ++++++++++++++ artel/store/models.py | 3 ++ artel/store/static/js/cart.js | 2 +- .../store/configure_product_summary.html | 29 +++++++++++++++-- .../store/templates/store/order_success.html | 31 +++++++++++++++++++ .../templates/store/partials/cart_item.html | 2 +- .../store/partials/summary_cart_item.html | 2 +- artel/store/urls.py | 3 +- artel/store/views.py | 28 ++++++++++++++--- 10 files changed, 115 insertions(+), 11 deletions(-) create mode 100644 artel/store/migrations/0012_order_uuid_product_uuid.py create mode 100644 artel/store/templates/store/order_success.html diff --git a/artel/docker-compose.yml b/artel/docker-compose.yml index 280cffa..7ea367e 100644 --- a/artel/docker-compose.yml +++ b/artel/docker-compose.yml @@ -6,6 +6,9 @@ services: - "1025:1025" - "8025:8025" comfy: + depends_on: + - smtp-server + - db build: dockerfile: Dockerfile.local context: ./ diff --git a/artel/store/migrations/0012_order_uuid_product_uuid.py b/artel/store/migrations/0012_order_uuid_product_uuid.py new file mode 100644 index 0000000..48b4604 --- /dev/null +++ b/artel/store/migrations/0012_order_uuid_product_uuid.py @@ -0,0 +1,23 @@ +# Generated by Django 4.1.9 on 2023-07-20 16:50 + +from django.db import migrations, models +import uuid + + +class Migration(migrations.Migration): + dependencies = [ + ("store", "0011_productparam_delete_templateparamvalue_and_more"), + ] + + operations = [ + migrations.AddField( + model_name="order", + name="uuid", + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AddField( + model_name="product", + name="uuid", + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + ] diff --git a/artel/store/models.py b/artel/store/models.py index eb85f28..ad9890b 100644 --- a/artel/store/models.py +++ b/artel/store/models.py @@ -1,6 +1,7 @@ import pdfkit import datetime import builtins +import uuid from decimal import Decimal from typing import ( @@ -202,6 +203,7 @@ class Product(ClusterableModel): ) price = models.FloatField() available = models.BooleanField(default=True) + uuid = models.UUIDField(default=uuid.uuid4, editable=False) objects = ProductManager() @@ -439,6 +441,7 @@ class Order(models.Model): sent = models.BooleanField(default=False) order_number = models.CharField(max_length=255, null=True) + uuid = models.UUIDField(default=uuid.uuid4, editable=False) objects = OrderManager() @property diff --git a/artel/store/static/js/cart.js b/artel/store/static/js/cart.js index 0d40000..b0c1261 100644 --- a/artel/store/static/js/cart.js +++ b/artel/store/static/js/cart.js @@ -10,7 +10,7 @@ $(document).on('click', '.add-to-cart-button', function(event) { const csrfToken = $(this).data('csrf-token'); console.log(productID); formData.append('product_id', productID); - formData.append('quantity', quantity); // Serialize the form data correctly + formData.append('quantity', 1); // Serialize the form data correctly button.prop('disabled', true); $.ajax({ type: 'POST', diff --git a/artel/store/templates/store/configure_product_summary.html b/artel/store/templates/store/configure_product_summary.html index 59e9b4d..6707231 100644 --- a/artel/store/templates/store/configure_product_summary.html +++ b/artel/store/templates/store/configure_product_summary.html @@ -1,6 +1,27 @@ {% extends 'base.html' %} {% block content %} + + +
+ Wróć do konfiguratora +
+
@@ -38,9 +59,13 @@ {% endif %}
- Wróć do konfiguratora + {% if variant.available %} - + {% else %} {% endif %} diff --git a/artel/store/templates/store/order_success.html b/artel/store/templates/store/order_success.html new file mode 100644 index 0000000..58f3ebc --- /dev/null +++ b/artel/store/templates/store/order_success.html @@ -0,0 +1,31 @@ +{% extends 'base.html' %} + +{% block content %} +
+
+
+ + + + +
+
+

Dziękujemy za zakup!

+
+ Twoje zamówienia zostały przekazane do realizacji. + Oczekuj maili z dokumentami to zamówień.
+ + Twoje numery zamówień: +
+ {% for order in orders %} +
{{order.order_number}}
+ {% endfor %} +
+ +
+ Powrót do sklepu +
+
+{% endblock %} \ No newline at end of file diff --git a/artel/store/templates/store/partials/cart_item.html b/artel/store/templates/store/partials/cart_item.html index 52c2c41..c2be5d9 100644 --- a/artel/store/templates/store/partials/cart_item.html +++ b/artel/store/templates/store/partials/cart_item.html @@ -5,7 +5,7 @@
diff --git a/artel/store/templates/store/partials/summary_cart_item.html b/artel/store/templates/store/partials/summary_cart_item.html index 662af8a..1d7b68e 100644 --- a/artel/store/templates/store/partials/summary_cart_item.html +++ b/artel/store/templates/store/partials/summary_cart_item.html @@ -5,7 +5,7 @@
diff --git a/artel/store/urls.py b/artel/store/urls.py index 7e181a9..193d724 100644 --- a/artel/store/urls.py +++ b/artel/store/urls.py @@ -13,5 +13,6 @@ urlpatterns = [ path('product-configure/summary//', store_views.ConfigureProductSummaryView.as_view(), name='configure-product-summary'), path('cart/', store_views.CartView.as_view(), name='cart'), path("order/", store_views.OrderView.as_view(), name="order"), - path("order/confirm/", store_views.OrderConfirmView.as_view(), name="order-confirm") + path("order/confirm/", store_views.OrderConfirmView.as_view(), name="order-confirm"), + path("order/success/", store_views.OrderSuccessView.as_view(), name="order-success") ] + router.urls diff --git a/artel/store/views.py b/artel/store/views.py index c499d15..2609d47 100644 --- a/artel/store/views.py +++ b/artel/store/views.py @@ -26,7 +26,7 @@ from store.models import ( Order, Product, ProductTemplate, - ProductCategoryParamValue + ProductListPage ) @@ -127,9 +127,11 @@ class ConfigureProductSummaryView(View): def get(self, request, variant_pk: int, *args, **kwargs): variant = Product.objects.get(pk=variant_pk) + context = { "variant": variant, - "params_values": variant.params.all() + "params_values": variant.params.all(), + "store_url": ProductListPage.objects.first().get_url() } return render(request, self.template_name, context) @@ -186,11 +188,27 @@ class OrderConfirmView(View): def post(self, request): customer_data = request.session["customer_data"] cart = SessionCart(self.request) - Order.objects.create_from_cart( + order = Order.objects.create_from_cart( cart.get_items(), None, customer_data ) request.session.pop("customer_data") cart.clear() - messages.success(request, "Zamówienie zostało złożone, sprawdź swój email.") - return HttpResponseRedirect(reverse("cart")) + request.session["order_uuids"] = [str(elem) for elem in order.values_list("uuid", flat=True)] + return HttpResponseRedirect(reverse("order-success")) + + +class OrderSuccessView(View): + template_name = "store/order_success.html" + + def get_context_data(self, **kwargs: Any) -> Dict[str, Any]: + return { + "orders": Order.objects.filter(uuid__in=self.request.session.get("order_uuids")), + "store_url": ProductListPage.objects.first().get_url() + } + + def get(self, request, *args, **kwargs): + if not self.request.session.get("order_uuids"): + return HttpResponseRedirect(reverse("cart")) + + return render(request, self.template_name, self.get_context_data()) From 24f98cc3de054fbfa53da92f86b07a6b21a32b50 Mon Sep 17 00:00:00 2001 From: mtyton Date: Sat, 22 Jul 2023 18:53:18 +0200 Subject: [PATCH 09/15] added product_request mechanism --- artel/store/models.py | 1 - artel/store/tasks.py | 30 ++++++ .../store/configure_product_summary.html | 23 +++-- .../store/templates/store/order_success.html | 2 +- artel/store/tests/test_views.py | 93 ++++++++++++++++++- artel/store/views.py | 30 ++++-- 6 files changed, 155 insertions(+), 24 deletions(-) create mode 100644 artel/store/tasks.py diff --git a/artel/store/models.py b/artel/store/models.py index ad9890b..1ab34f0 100644 --- a/artel/store/models.py +++ b/artel/store/models.py @@ -225,7 +225,6 @@ class Product(ClusterableModel): return main_image return self.product_images.first() - @property def tags(self): return self.template.tags.all() diff --git a/artel/store/tasks.py b/artel/store/tasks.py new file mode 100644 index 0000000..94e28f8 --- /dev/null +++ b/artel/store/tasks.py @@ -0,0 +1,30 @@ +import logging +from django.conf import settings + +from mailings.models import OutgoingEmail +from store.models import Product + + +logger = logging.getLogger(__name__) + +# TODO - those should be modified to be celery tasks + +def send_produt_request_email(variant_pk: int): + try: + variant = Product.objects.get(pk=variant_pk) + except Product.DoesNotExist: + logger.exception(f"Product with pk={variant_pk} does not exist") + + try: + send = OutgoingEmail.objects.send( + template_name="product_request", + subject="Zapytanie o produkt", + recipient=variant.template.author.email, + context={"product": variant}, + sender=settings.DEFAULT_FROM_EMAIL + ) + except Exception as e: + logger.exception(f"Could not send email for variant pk={variant_pk}, exception: {e} has occured") + else: + if not send: + logger.exception(f"Could not send email for variant pk={variant_pk}") diff --git a/artel/store/templates/store/configure_product_summary.html b/artel/store/templates/store/configure_product_summary.html index 6707231..f9ff2b2 100644 --- a/artel/store/templates/store/configure_product_summary.html +++ b/artel/store/templates/store/configure_product_summary.html @@ -18,10 +18,6 @@
-
- Wróć do konfiguratora -
-
@@ -51,14 +47,18 @@ Jeżeli jesteś zainteresowany tą konfiguracją złóż zapytanie ofertowe.
+ {% else %} +
+
+

Cena: {{variant.price}} zł

+
+
{% endif %}
-
- {% if variant.available %} -

Cena: {{variant.price}} zł

- {% endif %} +
+ Wróć do konfiguratora
-
+
{% if variant.available %} + + {% csrf_token %} + + {% endif %}
diff --git a/artel/store/templates/store/order_success.html b/artel/store/templates/store/order_success.html index 58f3ebc..3549124 100644 --- a/artel/store/templates/store/order_success.html +++ b/artel/store/templates/store/order_success.html @@ -28,4 +28,4 @@ Powrót do sklepu
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/artel/store/tests/test_views.py b/artel/store/tests/test_views.py index d5249a2..ca6acb1 100644 --- a/artel/store/tests/test_views.py +++ b/artel/store/tests/test_views.py @@ -1,11 +1,98 @@ from django.test import TestCase +from django.shortcuts import reverse + +from store.models import ( + ProductCategoryParam, + ProductCategoryParamValue, + CategoryParamTypeChoices +) +from store.tests.factories import ( + ProductTemplateFactory, + ProductCategoryFactory, + ProductFactory, + ProductCategoryParamValueFactory +) class ConfigureProductViewTestCase(TestCase): def setUp(self): - ... + super().setUp() + self.category = ProductCategoryFactory() + self.product_template = ProductTemplateFactory(category=self.category) + # create template params and values for those params + self.param1 = ProductCategoryParam.objects.create( + key="Mocowanie", category=self.category, + param_type=CategoryParamTypeChoices.STRING + ) + self.param1_value1 = ProductCategoryParamValueFactory(param=self.param1) + self.param1_value2 = ProductCategoryParamValueFactory(param=self.param1) + self.param2 = ProductCategoryParam.objects.create( + key="Format", category=self.category, + param_type=CategoryParamTypeChoices.STRING + ) + self.param2_value1 = ProductCategoryParamValueFactory(param=self.param2) + self.param2_value2 = ProductCategoryParamValueFactory(param=self.param2) + # create product variant + self.variant1 = ProductFactory( + template=self.product_template + ) + self.variant1.params.set([self.param1_value1, self.param2_value1]) + self.variant1.save() - def test_sdkfsdf(self): - ... + self.variant2 = ProductFactory( + template=self.product_template, + ) + self.variant2.params.set([self.param1_value2, self.param2_value2]) + self.variant2.save() + def test_get_success(self): + response = self.client.get( + reverse("product-configure", args=[self.product_template.pk]), + ) + self.assertEqual(response.status_code, 200) + self.assertTemplateUsed(response, "store/configure_product.html") + + def test_get_failure_wrong_pk(self): + response = self.client.get( + reverse("product-configure", args=[12312]), + ) + self.assertEqual(response.status_code, 404) + + def test_post_success(self): + data = { + self.param1.key: [str(self.param1_value1.pk)], + self.param2.key: [str(self.param2_value1.pk)] + } + response = self.client.post( + reverse("product-configure", args=[self.product_template.pk]), + data=data + ) + self.assertEqual(response.status_code, 302) + self.assertEqual(response.url, reverse("configure-product-summary", args=[self.variant1.pk])) + + def test_post_failure_not_existing_template(self): + data = { + self.param1.key: [str(self.param1_value1.pk)], + self.param2.key: [str(self.param2_value1.pk)] + } + response = self.client.post( + reverse("product-configure", args=[2137]), + data=data + ) + self.assertEqual(response.status_code, 404) + + def test_post_not_existing_config(self): + data = { + self.param1.key: [str(self.param1_value2.pk)], + self.param2.key: [str(self.param2_value1.pk)] + } + response = self.client.post( + reverse("product-configure", args=[self.product_template.pk]), + data=data + ) + self.assertEqual(response.status_code, 302) + + +class ConfigureProductSummaryViewTestCase(TestCase): + ... diff --git a/artel/store/views.py b/artel/store/views.py index 2609d47..336e7c7 100644 --- a/artel/store/views.py +++ b/artel/store/views.py @@ -4,7 +4,10 @@ from django.views.generic import ( TemplateView, View ) -from django.shortcuts import render +from django.shortcuts import ( + render, + get_object_or_404 +) from django.urls import reverse from django.http import HttpResponseRedirect from django.contrib import messages @@ -13,6 +16,7 @@ from rest_framework.viewsets import ViewSet from rest_framework.decorators import action from rest_framework.response import Response +from store.tasks import send_produt_request_email from store.cart import SessionCart from store.serializers import ( CartSerializer, @@ -96,14 +100,12 @@ class ConfigureProductView(View): template_name = "store/configure_product.html" def get_context_data(self, pk: int, **kwargs: Any) -> Dict[str, Any]: - template = ProductTemplate.objects.get(pk=pk) + template = get_object_or_404(ProductTemplate, pk=pk) form = ProductTemplateConfigForm(template=template) context = { "template": template, - "available_variants": Product.objects.filter(template__pk=pk), "form": form } - return context def get(self, request, pk: int, *args, **kwargs): @@ -112,7 +114,7 @@ class ConfigureProductView(View): def post(self, request, pk: int, *args, **kwargs): # first select template - template = ProductTemplate.objects.get(pk=pk) + template = get_object_or_404(ProductTemplate, pk=pk) form = ProductTemplateConfigForm(template=template, data=request.POST) if not form.is_valid(): context = self.get_context_data(pk) @@ -125,16 +127,26 @@ class ConfigureProductView(View): class ConfigureProductSummaryView(View): template_name = "store/configure_product_summary.html" - def get(self, request, variant_pk: int, *args, **kwargs): - variant = Product.objects.get(pk=variant_pk) - - context = { + def get_context_data(self, variant_pk): + variant = get_object_or_404(Product, pk=variant_pk) + return { "variant": variant, "params_values": variant.params.all(), "store_url": ProductListPage.objects.first().get_url() } + + def get(self, request, variant_pk: int, *args, **kwargs): + context = self.get_context_data(variant_pk) return render(request, self.template_name, context) + def post(self, request, variant_pk: int, *args, **kwargs): + # Here just send the email with product request + variant = Product.objects.get(pk=variant_pk) + send_produt_request_email(variant.pk) + messages.success(request, "Zapytanie o produkt zostało wysłane") + context = self.get_context_data(variant_pk) + return HttpResponseRedirect(context["store_url"]) + class OrderView(View): template_name = "store/order.html" From 3580a3b1e1d79adccc3b4c0b04af0dab545d57bb Mon Sep 17 00:00:00 2001 From: mtyton Date: Sat, 22 Jul 2023 20:39:12 +0200 Subject: [PATCH 10/15] added data encrption for customer --- artel/store/admin.py | 8 +++- artel/store/cart.py | 23 +++++++++++ artel/store/forms.py | 27 ++++++++++++- ...method_order_uuid_product_uuid_and_more.py | 39 +++++++++++++++++++ .../0012_order_uuid_product_uuid.py | 23 ----------- artel/store/models.py | 17 +++++++- artel/store/templates/store/order.html | 38 ++++++++++++++---- artel/store/views.py | 17 ++++---- 8 files changed, 152 insertions(+), 40 deletions(-) create mode 100644 artel/store/migrations/0012_deliverymethod_order_uuid_product_uuid_and_more.py delete mode 100644 artel/store/migrations/0012_order_uuid_product_uuid.py diff --git a/artel/store/admin.py b/artel/store/admin.py index fe0eeef..0a6aa7f 100644 --- a/artel/store/admin.py +++ b/artel/store/admin.py @@ -42,6 +42,11 @@ class PaymentMethodAdmin(ModelAdmin): list_display = ("name", "active") +class DeliveryMethodAdmin(ModelAdmin): + model = models.DeliveryMethod + list_display = ("name", "active") + + class DocumentTemplateAdmin(ModelAdmin): model = models.DocumentTemplate list_display = ("name", ) @@ -58,7 +63,8 @@ class StoreAdminGroup(ModelAdminGroup): ProductTemplateAdmin, ProductAdmin, DocumentTemplateAdmin, - PaymentMethodAdmin + PaymentMethodAdmin, + DeliveryMethodAdmin ) diff --git a/artel/store/cart.py b/artel/store/cart.py index 6eb3782..e02865f 100644 --- a/artel/store/cart.py +++ b/artel/store/cart.py @@ -9,6 +9,7 @@ from typing import ( from dataclasses import dataclass from django.http.request import HttpRequest from django.conf import settings +from django.core import signing from store.models import ( Product, @@ -116,3 +117,25 @@ class SessionCart(BaseCart): def clear(self) -> None: self._cart = {} self.save_cart() + + +class CustomerData: + + def _encrypt_data(self, data: dict[str, Any]) -> str: + signer = signing.Signer() + return signer.sign_object(data) + + def _decrypt_data(self, data: str) -> dict[str, Any]: + signer = signing.Signer() + return signer.unsign_object(data) + + def __init__(self, data: dict[str, Any]=None, encrypted_data: str=None) -> None: + self._data = self._encrypt_data(data) if data else encrypted_data + + @property + def data(self) -> dict[str, Any]: + return self._data + + @property + def decrypted_data(self) -> dict[str, Any]: + return self._decrypt_data(self._data) diff --git a/artel/store/forms.py b/artel/store/forms.py index e687bc7..fbfa40e 100644 --- a/artel/store/forms.py +++ b/artel/store/forms.py @@ -1,10 +1,14 @@ from django import forms from phonenumber_field.formfields import PhoneNumberField +from phonenumber_field.phonenumber import PhoneNumber +from django.db.models import Model from store.models import ( ProductTemplate, ProductCategoryParamValue, - Product + Product, + PaymentMethod, + DeliveryMethod ) @@ -38,6 +42,27 @@ class CustomerDataForm(forms.Form): choices=(("PL", "Polska"), ), label="Kraj", widget=forms.Select(attrs={"class": "form-control"}) ) + payment_method = forms.ModelChoiceField( + queryset=PaymentMethod.objects.filter(active=True), label="Sposób płatności", + widget=forms.Select(attrs={"class": "form-control"}) + ) + delivery_method = forms.ModelChoiceField( + queryset=DeliveryMethod.objects.filter(active=True), label="Sposób dostawy", + widget=forms.Select(attrs={"class": "form-control"}) + ) + + def clean(self): + """Clean method should return JSON serializable""" + cleaned_data = super().clean() + new_cleaned_data = {} + for key, value in cleaned_data.items(): + if isinstance(value, PhoneNumber): + new_cleaned_data[key] = str(value) + elif isinstance(value, Model): + new_cleaned_data[key] = value.pk + else: + new_cleaned_data[key] = value + return new_cleaned_data class ButtonToggleSelect(forms.RadioSelect): diff --git a/artel/store/migrations/0012_deliverymethod_order_uuid_product_uuid_and_more.py b/artel/store/migrations/0012_deliverymethod_order_uuid_product_uuid_and_more.py new file mode 100644 index 0000000..f3ad473 --- /dev/null +++ b/artel/store/migrations/0012_deliverymethod_order_uuid_product_uuid_and_more.py @@ -0,0 +1,39 @@ +# Generated by Django 4.1.9 on 2023-07-22 17:18 + +from django.db import migrations, models +import django.db.models.deletion +import uuid + + +class Migration(migrations.Migration): + dependencies = [ + ("store", "0011_productparam_delete_templateparamvalue_and_more"), + ] + + operations = [ + migrations.CreateModel( + name="DeliveryMethod", + fields=[ + ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), + ("name", models.CharField(max_length=255)), + ("description", models.TextField(blank=True)), + ("price", models.FloatField(default=0)), + ("active", models.BooleanField(default=True)), + ], + ), + migrations.AddField( + model_name="order", + name="uuid", + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AddField( + model_name="product", + name="uuid", + field=models.UUIDField(default=uuid.uuid4, editable=False), + ), + migrations.AddField( + model_name="order", + name="delivery_method", + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to="store.deliverymethod"), + ), + ] diff --git a/artel/store/migrations/0012_order_uuid_product_uuid.py b/artel/store/migrations/0012_order_uuid_product_uuid.py deleted file mode 100644 index 48b4604..0000000 --- a/artel/store/migrations/0012_order_uuid_product_uuid.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 4.1.9 on 2023-07-20 16:50 - -from django.db import migrations, models -import uuid - - -class Migration(migrations.Migration): - dependencies = [ - ("store", "0011_productparam_delete_templateparamvalue_and_more"), - ] - - operations = [ - migrations.AddField( - model_name="order", - name="uuid", - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - migrations.AddField( - model_name="product", - name="uuid", - field=models.UUIDField(default=uuid.uuid4, editable=False), - ), - ] diff --git a/artel/store/models.py b/artel/store/models.py index 1ab34f0..ee5d2e4 100644 --- a/artel/store/models.py +++ b/artel/store/models.py @@ -432,9 +432,22 @@ class PaymentMethod(models.Model): description = models.TextField(blank=True) active = models.BooleanField(default=True) + def __str__(self) -> str: + return self.name + +class DeliveryMethod(models.Model): + name = models.CharField(max_length=255) + description = models.TextField(blank=True) + price = models.FloatField(default=0) + active = models.BooleanField(default=True) + + def __str__(self) -> str: + return self.name + class Order(models.Model): payment_method = models.ForeignKey(PaymentMethod, on_delete=models.CASCADE) + delivery_method = models.ForeignKey(DeliveryMethod, on_delete=models.CASCADE, null=True) created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) sent = models.BooleanField(default=False) @@ -449,10 +462,12 @@ class Order(models.Model): @property def total_price(self) -> Decimal: - return sum( + price = sum( [order_product.product.price * order_product.quantity for order_product in self.products.all()] ) + delivery_price = self.delivery_method.price if self.delivery_method else 5.0 + return price + delivery_price @property def total_price_words(self) -> str: diff --git a/artel/store/templates/store/order.html b/artel/store/templates/store/order.html index 9e8ec8f..0776346 100644 --- a/artel/store/templates/store/order.html +++ b/artel/store/templates/store/order.html @@ -8,9 +8,9 @@
-

Twoje dane

-
+

Twoje dane

+
@@ -42,12 +42,13 @@
-
- -
- +
+
+

Dane do wysyłki

-
+
+
+
@@ -72,7 +73,30 @@ {{form.zip_code}}
+
+
+
+

Płatność i wysyłka

+
+
+
+
+
+
+ + {{form.payment_method}} +
+
+
+
+ + {{form.delivery_method}} +
+
+
+ +
diff --git a/artel/store/views.py b/artel/store/views.py index 336e7c7..8d8477e 100644 --- a/artel/store/views.py +++ b/artel/store/views.py @@ -11,13 +11,15 @@ from django.shortcuts import ( from django.urls import reverse from django.http import HttpResponseRedirect from django.contrib import messages -from django.forms import modelformset_factory from rest_framework.viewsets import ViewSet from rest_framework.decorators import action from rest_framework.response import Response from store.tasks import send_produt_request_email -from store.cart import SessionCart +from store.cart import ( + SessionCart, + CustomerData +) from store.serializers import ( CartSerializer, CartProductAddSerializer @@ -174,9 +176,8 @@ class OrderView(View): context = self.get_context_data() context["form"] = form return render(request, self.template_name, context) - customer_data = form.data - # TODO - add encryption - request.session["customer_data"] = customer_data + customer_data = CustomerData(data=form.cleaned_data) + request.session["customer_data"] = customer_data.data return HttpResponseRedirect(reverse("order-confirm")) @@ -184,7 +185,9 @@ class OrderConfirmView(View): template_name = "store/order_confirm.html" def get_context_data(self, **kwargs: Any) -> Dict[str, Any]: - customer_data = self.request.session["customer_data"] + customer_data = CustomerData( + encrypted_data=self.request.session["customer_data"] + ).decrypted_data return { "cart": SessionCart(self.request), "customer_data": customer_data @@ -193,7 +196,7 @@ class OrderConfirmView(View): def get(self, request, *args, **kwargs): cart = SessionCart(self.request) if cart.is_empty(): - # TODO - messages + messages.error(request, "Twój koszyk jest pusty") return HttpResponseRedirect(reverse("cart")) return render(request, self.template_name, self.get_context_data()) From 783e04a134adaa473c4d7e9d14f7fbbf78ecee12 Mon Sep 17 00:00:00 2001 From: mtyton Date: Sun, 23 Jul 2023 00:48:09 +0200 Subject: [PATCH 11/15] added delivery feature and payment method --- artel/store/cart.py | 72 ++++++++++++++----- artel/store/forms.py | 5 +- artel/store/static/images/icons/truck.svg | 3 + artel/store/templates/store/cart.html | 2 +- .../store/templates/store/order_confirm.html | 14 +++- .../store/partials/delivery_cart_item.html | 25 +++++++ .../store/partials/summary_cart_item.html | 2 +- artel/store/tests/test_models.py | 2 +- artel/store/views.py | 33 +++++---- 9 files changed, 119 insertions(+), 39 deletions(-) create mode 100644 artel/store/static/images/icons/truck.svg create mode 100644 artel/store/templates/store/partials/delivery_cart_item.html diff --git a/artel/store/cart.py b/artel/store/cart.py index e02865f..03eca99 100644 --- a/artel/store/cart.py +++ b/artel/store/cart.py @@ -1,6 +1,9 @@ +import logging + from abc import ( ABC, - abstractmethod + abstractmethod, + abstractproperty ) from typing import ( List, @@ -13,9 +16,12 @@ from django.core import signing from store.models import ( Product, - ProductAuthor + ProductAuthor, + DeliveryMethod ) +logger = logging.getLogger("cart_logger") + class BaseCart(ABC): @@ -34,22 +40,54 @@ class BaseCart(ABC): def update_item_quantity(self, item_id, change): ... - @abstractmethod - def get_items(self): + @abstractproperty + def display_items(self): ... class SessionCart(BaseCart): - def __init__(self, request: HttpRequest) -> None: + + def _get_author_total_price(self, author_id: int): + author_cart = self._cart[str(author_id)] + author_price = 0 + product_ids = list(int(pk) for pk in author_cart.keys()) + queryset = Product.objects.filter(id__in=product_ids) + for product in queryset: + author_price += product.price * author_cart[str(product.id)] + + if self._delivery_info: + author_price += self._delivery_info.price + + return author_price + + def _prepare_display_items(self)-> List[dict[str, dict|str]]: + items: List[dict[str, dict|str]] = [] + for author_id, cart_items in self._cart.items(): + author = ProductAuthor.objects.get(id=int(author_id)) + products = [] + for item_id, quantity in cart_items.items(): + product=Product.objects.get(id=int(item_id)) + products.append({"product": product, "quantity": quantity}) + items.append({ + "author": author, + "products": products, + "group_price": self._get_author_total_price(author_id) + }) + return items + + def __init__(self, request: HttpRequest, delivery: DeliveryMethod=None) -> None: super().__init__() self.session = request.session self._cart = self.session.get(settings.CART_SESSION_ID, None) if not self._cart: self._cart = {} self.session[settings.CART_SESSION_ID] = self._cart - + self._delivery_info = delivery + self._display_items = self._prepare_display_items() + def save_cart(self): + self._display_items = self._prepare_display_items() self.session[settings.CART_SESSION_ID] = self._cart self.session.modified = True @@ -76,8 +114,7 @@ class SessionCart(BaseCart): self._cart[str(author.id)].pop(str(item_id)) self.save_cart() except KeyError: - # TODO - add logging - ... + logger.exception(f"Item {item_id} not found in cart") def update_item_quantity(self, item_id: int, new_quantity: int) -> None: product = self.validate_and_get_product(item_id) @@ -91,17 +128,14 @@ class SessionCart(BaseCart): self._cart[str(author.id)][str(product.id)] = new_quantity self.save_cart() - def get_items(self) -> List[dict[str, dict|str]]: - items: List[dict[str, dict|str]] = [] - for author_id, cart_items in self._cart.items(): - author = ProductAuthor.objects.get(id=int(author_id)) - products = [] - for item_id, quantity in cart_items.items(): - product=Product.objects.get(id=int(item_id)) - products.append({"product": product, "quantity": quantity}) - items.append({"author": author, "products": products}) - return items + @property + def delivery_info(self): + return self._delivery_info + @property + def display_items(self) -> List[dict[str, dict|str]]: + return self._display_items + @property def total_price(self): total = 0 @@ -109,6 +143,8 @@ class SessionCart(BaseCart): for item_id, quantity in cart_items.items(): product = Product.objects.get(id=int(item_id)) total += product.price * quantity + if self._delivery_info: + total += self._delivery_info.price * len(self._cart.keys()) return total def is_empty(self) -> bool: diff --git a/artel/store/forms.py b/artel/store/forms.py index fbfa40e..64ab14f 100644 --- a/artel/store/forms.py +++ b/artel/store/forms.py @@ -51,11 +51,10 @@ class CustomerDataForm(forms.Form): widget=forms.Select(attrs={"class": "form-control"}) ) - def clean(self): + def serialize(self): """Clean method should return JSON serializable""" - cleaned_data = super().clean() new_cleaned_data = {} - for key, value in cleaned_data.items(): + for key, value in self.cleaned_data.items(): if isinstance(value, PhoneNumber): new_cleaned_data[key] = str(value) elif isinstance(value, Model): diff --git a/artel/store/static/images/icons/truck.svg b/artel/store/static/images/icons/truck.svg new file mode 100644 index 0000000..1afc549 --- /dev/null +++ b/artel/store/static/images/icons/truck.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/artel/store/templates/store/cart.html b/artel/store/templates/store/cart.html index 4fb1df7..b19a5cc 100644 --- a/artel/store/templates/store/cart.html +++ b/artel/store/templates/store/cart.html @@ -9,7 +9,7 @@

Koszyk

- {% for group in cart.get_items %} + {% for group in cart.display_items %} {% if group.products %}

Wykonawca: {{group.author.display_name}}

{% for item in group.products %} diff --git a/artel/store/templates/store/order_confirm.html b/artel/store/templates/store/order_confirm.html index 75d9436..bca41d1 100644 --- a/artel/store/templates/store/order_confirm.html +++ b/artel/store/templates/store/order_confirm.html @@ -57,20 +57,28 @@

Zamówione przedmioty

- {% for group in cart.get_items %} + {% for group in cart.display_items %} {% if group.products %}

Wykonawca: {{group.author.display_name}}

{% for item in group.products %} {% include 'store/partials/summary_cart_item.html' %} {% endfor %} + {% if cart.delivery_info %} + {% with delivery=cart.delivery_info %} + {% include 'store/partials/delivery_cart_item.html' %} + {% endwith %} + {% endif %} +
+
W sumie: {{group.group_price}} zł
+
{% endif %} {% endfor %} -
+
-
Do zapłaty: {{cart.total_price}}
+
Do zapłaty: {{cart.total_price}} zł
diff --git a/artel/store/templates/store/partials/delivery_cart_item.html b/artel/store/templates/store/partials/delivery_cart_item.html new file mode 100644 index 0000000..2488e7e --- /dev/null +++ b/artel/store/templates/store/partials/delivery_cart_item.html @@ -0,0 +1,25 @@ +{% load static %} + +
+
+
+
+ +
+
+

{{delivery.name}}

+
+
+ 1 +
+
+
{{delivery.price}} zł
+
+ +
+
+ +
+ \ No newline at end of file diff --git a/artel/store/templates/store/partials/summary_cart_item.html b/artel/store/templates/store/partials/summary_cart_item.html index 1d7b68e..512c6ce 100644 --- a/artel/store/templates/store/partials/summary_cart_item.html +++ b/artel/store/templates/store/partials/summary_cart_item.html @@ -15,7 +15,7 @@ {{item.quantity}}
-
{{item.product.price}} ZŁ
+
{{item.product.price}} zł
diff --git a/artel/store/tests/test_models.py b/artel/store/tests/test_models.py index 8e0e44b..e3ffe3b 100644 --- a/artel/store/tests/test_models.py +++ b/artel/store/tests/test_models.py @@ -126,7 +126,7 @@ class ProductTestCase(TestCase): self.assertIsNotNone(prod) self.assertNotEqual(prod.pk, product.pk) self.assertFalse(prod.available) - self.assertEqual(prod.price, 13.0) + self.assertEqual(prod.price, 0) def test_get_or_create_by_params_success_not_existing_product_no_other_products(self): template = factories.ProductTemplateFactory() diff --git a/artel/store/views.py b/artel/store/views.py index 8d8477e..deffd4f 100644 --- a/artel/store/views.py +++ b/artel/store/views.py @@ -58,7 +58,7 @@ class CartActionView(ViewSet): def list_products(self, request): # get cart items cart = SessionCart(self.request) - items = cart.get_items() + items = cart.display_items serializer = CartSerializer(instance=items, many=True) return Response(serializer.data) @@ -69,7 +69,7 @@ class CartActionView(ViewSet): if not serializer.is_valid(): return Response(serializer.errors, status=400) serializer.save(cart) - items = cart.get_items() + items = cart.display_items serializer = CartSerializer(instance=items, many=True) return Response(serializer.data, status=201) @@ -82,7 +82,7 @@ class CartActionView(ViewSet): except Product.DoesNotExist: return Response({"error": "Product does not exist"}, status=400) - items = cart.get_items() + items = cart.display_items serializer = CartSerializer(instance=items, many=True) return Response(serializer.data, status=201) @@ -93,7 +93,7 @@ class CartActionView(ViewSet): cart.update_item_quantity(pk, int(request.data["quantity"])) except Product.DoesNotExist: return Response({"error": "Product does not exist"}, status=404) - items = cart.get_items() + items = cart.display_items serializer = CartSerializer(instance=items, many=True) return Response(serializer.data, status=201) @@ -176,7 +176,7 @@ class OrderView(View): context = self.get_context_data() context["form"] = form return render(request, self.template_name, context) - customer_data = CustomerData(data=form.cleaned_data) + customer_data = CustomerData(data=form.serialize()) request.session["customer_data"] = customer_data.data return HttpResponseRedirect(reverse("order-confirm")) @@ -185,12 +185,19 @@ class OrderConfirmView(View): template_name = "store/order_confirm.html" def get_context_data(self, **kwargs: Any) -> Dict[str, Any]: - customer_data = CustomerData( - encrypted_data=self.request.session["customer_data"] - ).decrypted_data + + form = CustomerDataForm( + data=CustomerData( + encrypted_data=self.request.session["customer_data"] + ).decrypted_data + ) + if not form.is_valid(): + raise Exception("Customer data is not valid") + + customer_data = form.cleaned_data return { - "cart": SessionCart(self.request), - "customer_data": customer_data + "cart": SessionCart(self.request, delivery=customer_data["delivery_method"]), + "customer_data": customer_data } def get(self, request, *args, **kwargs): @@ -201,10 +208,12 @@ class OrderConfirmView(View): return render(request, self.template_name, self.get_context_data()) def post(self, request): - customer_data = request.session["customer_data"] + customer_data = CustomerData( + encrypted_data=self.request.session["customer_data"] + ).decrypted_data cart = SessionCart(self.request) order = Order.objects.create_from_cart( - cart.get_items(), + cart.display_items, None, customer_data ) request.session.pop("customer_data") From f310781cebcd55951848f6d253b402d837421bd2 Mon Sep 17 00:00:00 2001 From: mtyton Date: Sun, 23 Jul 2023 18:14:09 +0200 Subject: [PATCH 12/15] finished styling --- artel/store/tasks.py | 2 +- .../store/templates/store/configure_product_summary.html | 8 ++++---- artel/store/templates/store/order_success.html | 6 ++++-- artel/store/views.py | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/artel/store/tasks.py b/artel/store/tasks.py index 94e28f8..bf399f4 100644 --- a/artel/store/tasks.py +++ b/artel/store/tasks.py @@ -18,7 +18,7 @@ def send_produt_request_email(variant_pk: int): try: send = OutgoingEmail.objects.send( template_name="product_request", - subject="Zapytanie o produkt", + subject="Złożono zapytanie ofertowe", recipient=variant.template.author.email, context={"product": variant}, sender=settings.DEFAULT_FROM_EMAIL diff --git a/artel/store/templates/store/configure_product_summary.html b/artel/store/templates/store/configure_product_summary.html index f9ff2b2..a44a4b2 100644 --- a/artel/store/templates/store/configure_product_summary.html +++ b/artel/store/templates/store/configure_product_summary.html @@ -5,14 +5,14 @@
-
Added to cart
+
Dodano do koszyka
-

Item has been added to cart.

+

Przedmiot dodany do koszyka

- Continue shopping - Go to cart + Kontynuuj zakupy + Idź do koszyka
diff --git a/artel/store/templates/store/order_success.html b/artel/store/templates/store/order_success.html index 3549124..b0c3efe 100644 --- a/artel/store/templates/store/order_success.html +++ b/artel/store/templates/store/order_success.html @@ -20,12 +20,14 @@ Twoje numery zamówień:
{% for order in orders %} -
{{order.order_number}}
+ {{order.order_number}}
{% endfor %}
- Powrót do sklepu + + Powrót do sklepu +
{% endblock %} diff --git a/artel/store/views.py b/artel/store/views.py index deffd4f..7d21563 100644 --- a/artel/store/views.py +++ b/artel/store/views.py @@ -209,7 +209,7 @@ class OrderConfirmView(View): def post(self, request): customer_data = CustomerData( - encrypted_data=self.request.session["customer_data"] + encrypted_data=self.request.session["customer_data"] ).decrypted_data cart = SessionCart(self.request) order = Order.objects.create_from_cart( From 2d464431ba328b881eff7678fbab13eeb93f6b98 Mon Sep 17 00:00:00 2001 From: mtyton Date: Sun, 23 Jul 2023 18:27:15 +0200 Subject: [PATCH 13/15] small changes --- artel/store/templates/store/partials/product_card.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artel/store/templates/store/partials/product_card.html b/artel/store/templates/store/partials/product_card.html index b3e0a4d..b3f72ee 100644 --- a/artel/store/templates/store/partials/product_card.html +++ b/artel/store/templates/store/partials/product_card.html @@ -4,7 +4,7 @@
{{item.title}}
{{item.ti + class=
From dcae7a433fd7bace211fba15d9ce12128ed921a7 Mon Sep 17 00:00:00 2001 From: mtyton Date: Sun, 23 Jul 2023 19:16:08 +0200 Subject: [PATCH 14/15] updated mail context --- artel/store/tasks.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/artel/store/tasks.py b/artel/store/tasks.py index bf399f4..cebc7f4 100644 --- a/artel/store/tasks.py +++ b/artel/store/tasks.py @@ -3,6 +3,7 @@ from django.conf import settings from mailings.models import OutgoingEmail from store.models import Product +from store.admin import ProductAdmin logger = logging.getLogger(__name__) @@ -16,11 +17,12 @@ def send_produt_request_email(variant_pk: int): logger.exception(f"Product with pk={variant_pk} does not exist") try: + admin_url = ProductAdmin().url_helper.get_action_url("edit", variant.pk) send = OutgoingEmail.objects.send( template_name="product_request", subject="Złożono zapytanie ofertowe", recipient=variant.template.author.email, - context={"product": variant}, + context={"product": variant, "admin_url": admin_url}, sender=settings.DEFAULT_FROM_EMAIL ) except Exception as e: From a8b03dd1a19d6bf0b0b28571b228b8528fc8d01f Mon Sep 17 00:00:00 2001 From: mtyton Date: Wed, 26 Jul 2023 00:31:10 +0200 Subject: [PATCH 15/15] Added proper logging for the whole store and mailing application --- artel/artel/settings/base.py | 16 ++++++++++++++++ artel/artel/urls.py | 1 + artel/docker-compose.yml | 3 ++- artel/mailings/models.py | 15 ++++++++++++++- artel/store/cart.py | 1 - artel/store/models.py | 25 ++++++++++++++++++------- 6 files changed, 51 insertions(+), 10 deletions(-) diff --git a/artel/artel/settings/base.py b/artel/artel/settings/base.py index 33f2dbf..9a423d2 100644 --- a/artel/artel/settings/base.py +++ b/artel/artel/settings/base.py @@ -21,6 +21,7 @@ from sentry_sdk.integrations.django import DjangoIntegration # -> GlitchTip error reporting sentry_sdk.init( + dsn=os.environ.get("SENTRY_DSN", ''), integrations=[DjangoIntegration()], auto_session_tracking=False, traces_sample_rate=0 @@ -212,3 +213,18 @@ EMAIL_HOST_PASSWORD = os.environ.get("EMAIL_HOST_PASSWORD", '') EMAIL_PORT = os.environ.get('EMAIL_PORT', 587) EMAIL_USE_TLS = True DEFAULT_FROM_EMAIL = os.environ.get('DEFAULT_FROM_EMAIL', 'artel-sklep@tepewu.pl') + + +LOGGING = { + "version": 1, + "disable_existing_loggers": False, + "handlers": { + "console": { + "class": "logging.StreamHandler", + }, + }, + "root": { + "handlers": ["console"], + "level": "WARNING", + }, +} diff --git a/artel/artel/urls.py b/artel/artel/urls.py index edfa02e..28515a4 100644 --- a/artel/artel/urls.py +++ b/artel/artel/urls.py @@ -14,6 +14,7 @@ from search import views as search_views handler404 = 'artel.views.my_custom_page_not_found_view' + urlpatterns = [ path("django-admin/", admin.site.urls), path("admin/", include(wagtailadmin_urls)), diff --git a/artel/docker-compose.yml b/artel/docker-compose.yml index f000ed2..2a7f970 100644 --- a/artel/docker-compose.yml +++ b/artel/docker-compose.yml @@ -6,6 +6,7 @@ services: - "1025:1025" - "8025:8025" comfy: + restart: always depends_on: - smtp-server - db @@ -16,7 +17,7 @@ services: ports: - "8001:8000" volumes: -# - ./:/app + - ./:/app - media:/app/media environment: - SECRET_KEY diff --git a/artel/mailings/models.py b/artel/mailings/models.py index 8612435..0e63bef 100644 --- a/artel/mailings/models.py +++ b/artel/mailings/models.py @@ -1,3 +1,5 @@ +import logging + from typing import Any from dataclasses import dataclass @@ -11,6 +13,9 @@ from django.core.mail import EmailMessage from django.conf import settings +logger = logging.getLogger(__name__) + + @dataclass class Attachment: name: str @@ -34,7 +39,11 @@ def send_mail( message.content_subtype = 'html' for attachment in attachments: message.attach(attachment.name, attachment.content, attachment.contenttype) - return bool(message.send()) + + sent = bool(message.send()) + if not sent: + logger.exception(f"Sending email to {to} with subject {subject} caused an exception") + return sent class MailTemplate(models.Model): @@ -54,6 +63,10 @@ class MailTemplate(models.Model): def load_and_process_template(self, context: dict|Context): if not self.template: + logger.exception( + f"Template file is missing for template with "+ + f"pk={self.pk}, template_name={self.template_name}" + ) raise FileNotFoundError("Template file is missing") if isinstance(context, dict): context = Context(context) diff --git a/artel/store/cart.py b/artel/store/cart.py index 03eca99..39727a7 100644 --- a/artel/store/cart.py +++ b/artel/store/cart.py @@ -92,7 +92,6 @@ class SessionCart(BaseCart): self.session.modified = True def add_item(self, item_id: int, quantity: int) -> None: - # TODO - add logging product = self.validate_and_get_product(item_id) author = product.author quantity = int(quantity) diff --git a/artel/store/models.py b/artel/store/models.py index ee5d2e4..beef666 100644 --- a/artel/store/models.py +++ b/artel/store/models.py @@ -2,6 +2,7 @@ import pdfkit import datetime import builtins import uuid +import logging from decimal import Decimal from typing import ( @@ -40,6 +41,9 @@ from mailings.models import ( ) +logger = logging.getLogger(__name__) + + class BaseImageModel(models.Model): image = models.ImageField() is_main = models.BooleanField(default=False) @@ -179,7 +183,10 @@ class ProductManager(models.Manager): # There should be only one if not products.count() <= 1: - raise ValidationError("There should be only one product with given set of params") + logger.exception( + f"There should be only one product with given set of params, detected: " + + f"{products.count()}, params: {params}, template: {template}" + ) product = products.first() if not product: @@ -268,9 +275,8 @@ def validate_param(sender, **kwargs): for pk in pk_set: try: param = ProductCategoryParamValue.objects.get(pk=pk).param - except ProductCategoryParamValue.DoesNotExist: - # TODO log this - ... + except ProductCategoryParamValue.DoesNotExist as e: + logger.exception(f"Product param validation failed with exception: {str(e)}") count = product_instance.params.filter(productparam__param_value__param=param).count() if count >= 1: errors.append(ValueError("Product param with this key already exists.")) @@ -320,7 +326,10 @@ class OrderProductManager(models.Manager): pks = [] for item in items: if item["quantity"] < 1: - # TODO - logging + logger.exception( + f"This is not possible to add less than one item to Order, omitting item: "+ + f"{item['product']}" + ) continue pk = self.create( @@ -420,8 +429,9 @@ class OrderManager(models.Manager): sent = self._send_notifications(order, author, customer_data, docs) if not sent: - # TODO - store data temporarily - raise Exception("Error while sending emails") + logger.exception( + f"Error while sending emails, for order: {order.order_number}" + ) return Order.objects.filter(pk__in=orders_pks) @@ -435,6 +445,7 @@ class PaymentMethod(models.Model): def __str__(self) -> str: return self.name + class DeliveryMethod(models.Model): name = models.CharField(max_length=255) description = models.TextField(blank=True)