Features: 1) Add include_personal_ordered filter to handle personal orders; 2) Modify ordering filters to support annotation of price using Coalesce and Max;

Fixes: 1) Ensure email and phone number validation rejects duplicates in the user table;

Extra: 1) Minor adjustments to annotated queryset for order filter logic.

core/filters.py

@@ -14,6 +14,7 @@ from django.db.models import (
     Subquery,
     Value,
     When,
+    Max,
 )
 from django.db.models.functions import Coalesce
 from django.utils.http import urlsafe_base64_decode
@@ -73,6 +74,10 @@ class ProductFilter(FilterSet):
     slug = CharFilter(field_name="slug", lookup_expr="exact", label=_("Slug"))
     is_digital = BooleanFilter(field_name="is_digital", label=_("Is Digital"))
     include_subcategories = BooleanFilter(method="filter_include_flag", label=_("Include sub-categories"))
+    include_personal_ordered = BooleanFilter(
+        method="filter_include_personal_ordered",
+        label=_("Include personal ordered"),
+    )
 
     order_by = OrderingFilter(
         fields=(
@@ -82,7 +87,7 @@ class ProductFilter(FilterSet):
             ("slug", "slug"),
             ("created", "created"),
             ("modified", "modified"),
-            ("stocks__price", "price"),
+            ("price", "price"),
             ("?", "random"),
         ),
         initial="uuid",
@@ -127,6 +132,14 @@ class ProductFilter(FilterSet):
                         Value(0, output_field=FloatField()),
                     )
                 )
+            if "price" in order_fields:
+                self.queryset = self.queryset.annotate(
+                    price=Coalesce(
+                        Max("stocks__price"),
+                        Value(0.0),
+                        output_field=FloatField(),
+                    )
+                )
 
     def filter_name(self, queryset, _name, value):
         search_results = process_query(query=value, request=self.request)["products"]
@@ -147,6 +160,11 @@ class ProductFilter(FilterSet):
             raise BadRequest(_("there must be a category_uuid to use include_subcategories flag"))
         return queryset
 
+    def filter_include_personal_ordered(self, queryset, **_kwargs):
+        if self.data.get("include_personal_ordered", False):
+            queryset = queryset.filter(stocks__isnull=False, stocks__quantity__gt=0, stocks__price__gt=0)
+        return queryset
+
     def filter_attributes(self, queryset, _name, value):
         if not value:
             return queryset

vibes_auth/graphene/mutations.py

@@ -111,12 +111,16 @@ class UpdateUser(BaseMutation):
 
         email = kwargs.get("email")
 
-        if email is not None and not is_valid_email(email):
+        if (email is not None and not is_valid_email(email)) or User.objects.filter(email=email).exclude(
+            uuid=uuid
+        ).exists():
             raise BadRequest(_("malformed email"))
 
         phone_number = kwargs.get("phone_number")
 
-        if phone_number is not None and not is_valid_phone_number(phone_number):
+        if (phone_number is not None and not is_valid_phone_number(phone_number)) or User.objects.filter(
+            phone_number=phone_number
+        ).exclude(uuid=uuid).exists():
             raise BadRequest(_(f"malformed phone number: {phone_number}"))
 
         password = kwargs.get("password", "")