sandwitches 2.5.3__tar.gz → 2.5.5__tar.gz

{sandwitches-2.5.3 → sandwitches-2.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sandwitches
-Version: 2.5.3
+Version: 2.5.5
 Summary: Add your description here
 Author: Martyn van Dijke
 Author-email: Martyn van Dijke <martijnvdijke600@gmail.com>

{sandwitches-2.5.3 → sandwitches-2.5.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sandwitches"
-version = "2.5.3"
+version = "2.5.5"
 description = "Add your description here"
 readme = "README.md"
 authors = [

{sandwitches-2.5.3 → sandwitches-2.5.5}/src/sandwitches/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.contrib.auth.admin import UserAdmin
-from .models import Recipe, Tag, Rating, Setting, Order
+from .models import Recipe, Tag, Rating, Setting, Order, OrderItem
 from django.utils.html import format_html
 from import_export import resources
 from import_export.admin import ImportExportModelAdmin
@@ -81,18 +81,23 @@ class RatingAdmin(ImportExportModelAdmin):
     resource_classes = [RatingResource]
 
 
+class OrderItemInline(admin.TabularInline):
+    model = OrderItem
+    extra = 0
+
+
 @admin.register(Order)
 class OrderAdmin(ImportExportModelAdmin):
     resource_classes = [OrderResource]
+    inlines = [OrderItemInline]
     list_display = (
         "id",
         "user",
-        "recipe",
         "status",
         "completed",
         "total_price",
         "created_at",
     )
     list_filter = ("status", "completed", "created_at")
-    search_fields = ("user__username", "recipe__title")
+    search_fields = ("user__username",)
     readonly_fields = ("total_price", "created_at", "updated_at")

{sandwitches-2.5.3 → sandwitches-2.5.5}/src/sandwitches/api.py

@@ -220,9 +220,25 @@ def get_tag(request, tag_id: int):
 
 @api.post("v1/orders", auth=django_auth, response={201: OrderSchema, 400: Error})
 def create_order(request, payload: CreateOrderSchema):
+    from .models import OrderItem
+    from django.db import transaction
+    from .tasks import notify_order_submitted, send_gotify_notification
+
     recipe = get_object_or_404(Recipe, id=payload.recipe_id)
     try:
-        order = Order.objects.create(user=request.user, recipe=recipe)  # ty:ignore[unresolved-attribute]
+        with transaction.atomic():
+            order = Order.objects.create(user=request.user)  # ty:ignore[unresolved-attribute]
+            OrderItem.objects.create(order=order, recipe=recipe, quantity=1)  # ty:ignore[unresolved-attribute]
+            order.total_price = recipe.price
+            order.save()
+
+            notify_order_submitted.enqueue(order_id=order.pk)
+            send_gotify_notification.enqueue(
+                title="New Order Received",
+                message=f"Order #{order.pk} by {request.user.username}. Total: {order.total_price}€",
+                priority=6,
+            )
+
         return 201, order
     except (ValidationError, ValueError) as e:
         return 400, {"message": str(e)}

sandwitches-2.5.5/src/sandwitches/migrations/0018_remove_order_recipe_alter_order_total_price_and_more.py

@@ -0,0 +1,58 @@
+# Generated by Django 6.0.1 on 2026-02-02 19:20
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0017_setting_gotify_token_setting_gotify_url"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="order",
+            name="recipe",
+        ),
+        migrations.AlterField(
+            model_name="order",
+            name="total_price",
+            field=models.DecimalField(decimal_places=2, default=0, max_digits=6),
+        ),
+        migrations.CreateModel(
+            name="OrderItem",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("quantity", models.PositiveIntegerField(default=1)),
+                ("price", models.DecimalField(decimal_places=2, max_digits=6)),
+                (
+                    "order",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="items",
+                        to="sandwitches.order",
+                    ),
+                ),
+                (
+                    "recipe",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="order_items",
+                        to="sandwitches.recipe",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Order Item",
+                "verbose_name_plural": "Order Items",
+            },
+        ),
+    ]

{sandwitches-2.5.3 → sandwitches-2.5.5}/src/sandwitches/models.py

@@ -276,10 +276,9 @@ class Order(models.Model):
     user = models.ForeignKey(
         settings.AUTH_USER_MODEL, related_name="orders", on_delete=models.CASCADE
     )
-    recipe = models.ForeignKey(Recipe, related_name="orders", on_delete=models.CASCADE)
     status = models.CharField(max_length=20, choices=STATUS_CHOICES, default="PENDING")
     completed = models.BooleanField(default=False)
-    total_price = models.DecimalField(max_digits=6, decimal_places=2)
+    total_price = models.DecimalField(max_digits=6, decimal_places=2, default=0)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
@@ -289,40 +288,54 @@ class Order(models.Model):
         verbose_name_plural = "Orders"
 
     def save(self, *args, **kwargs):
-        if not self.recipe.price:  # ty:ignore[possibly-missing-attribute]
-            raise ValueError("Cannot order a recipe without a price.")
-        if not self.total_price:
-            self.total_price = self.recipe.price  # ty:ignore[possibly-missing-attribute]
-
         is_new = self.pk is None
-        if is_new:
-            # We use select_for_update to lock the row and prevent race conditions
-            # However, since 'self.recipe' is already fetched, we need to re-fetch it with lock if we want to be strict.
-            # For simplicity in this context, we will reload it or trust the current instance but ideally:
-
-            # We need to wrap this in a transaction if not already
-            # But simple increment logic:
-            if (
-                self.recipe.max_daily_orders is not None  # ty:ignore[possibly-missing-attribute]
-                and self.recipe.daily_orders_count >= self.recipe.max_daily_orders  # ty:ignore[possibly-missing-attribute]
-            ):
-                raise ValidationError("Daily order limit reached for this recipe.")
-
-            self.recipe.daily_orders_count += 1  # ty:ignore[possibly-missing-attribute]
-            self.recipe.save(update_fields=["daily_orders_count"])  # ty:ignore[possibly-missing-attribute]
-
         super().save(*args, **kwargs)
-
         if is_new:
             notify_order_submitted.enqueue(order_id=self.pk)
             send_gotify_notification.enqueue(
                 title="New Order Received",
-                message=f"Order #{self.pk} for '{self.recipe.title}' by {self.user.username}. Total: {self.total_price}€",
+                message=f"Order #{self.pk} by {self.user.username}. Total: {self.total_price}€",
                 priority=6,
             )
 
     def __str__(self):
-        return f"Order #{self.pk} - {self.user} - {self.recipe}"
+        return f"Order #{self.pk} - {self.user}"
+
+
+class OrderItem(models.Model):
+    order = models.ForeignKey(Order, related_name="items", on_delete=models.CASCADE)
+    recipe = models.ForeignKey(
+        Recipe, related_name="order_items", on_delete=models.CASCADE
+    )
+    quantity = models.PositiveIntegerField(default=1)
+    price = models.DecimalField(max_digits=6, decimal_places=2)
+
+    class Meta:
+        verbose_name = "Order Item"
+        verbose_name_plural = "Order Items"
+
+    def save(self, *args, **kwargs):
+        if not self.price:
+            self.price = self.recipe.price
+
+        is_new = self.pk is None
+        if is_new:
+            if (
+                self.recipe.max_daily_orders is not None
+                and self.recipe.daily_orders_count + self.quantity
+                > self.recipe.max_daily_orders
+            ):
+                raise ValidationError(
+                    f"Daily order limit reached for {self.recipe.title}."
+                )
+
+            self.recipe.daily_orders_count += self.quantity
+            self.recipe.save(update_fields=["daily_orders_count"])
+
+        super().save(*args, **kwargs)
+
+    def __str__(self):
+        return f"{self.quantity}x {self.recipe.title} in Order #{self.order.pk}"
 
 
 class CartItem(models.Model):

{sandwitches-2.5.3 → sandwitches-2.5.5}/src/sandwitches/tasks.py

@@ -49,7 +49,11 @@ def notify_order_submitted(order_id):
     from .models import Order
 
     try:
-        order = Order.objects.select_related("user", "recipe").get(pk=order_id)  # ty:ignore[unresolved-attribute]
+        order = (
+            Order.objects.select_related("user")  # ty:ignore[unresolved-attribute]
+            .prefetch_related("items__recipe")
+            .get(pk=order_id)
+        )  # ty:ignore[unresolved-attribute]
     except Order.DoesNotExist:  # ty:ignore[unresolved-attribute]
         logging.warning(f"Order {order_id} not found. Skipping notification.")
         return
@@ -59,22 +63,38 @@ def notify_order_submitted(order_id):
         logging.warning(f"User {user.username} has no email. Skipping notification.")
         return
 
-    recipe = order.recipe
-    subject = _("Order Confirmation: %(recipe_title)s") % {"recipe_title": recipe.title}
+    items = order.items.all()
+    if not items:
+        logging.warning(f"Order {order_id} has no items. Skipping notification.")
+        return
+
+    # Construct item list string
+    item_lines = []
+    for item in items:
+        item_lines.append(f"- {item.quantity}x {item.recipe.title}")
+
+    items_summary = "\n".join(item_lines)
+    items_html_list = "".join(
+        [f"<li>{item.quantity}x {item.recipe.title}</li>" for item in items]
+    )
+
+    subject = _("Order Confirmation: Order #%(order_id)s") % {"order_id": order.id}
     from_email = getattr(settings, "EMAIL_FROM_ADDRESS")
 
     context_data = {
         "user_name": user.get_full_name() or user.username,
-        "recipe_title": recipe.title,
+        "items_summary": items_summary,
         "order_id": order.id,
         "total_price": order.total_price,
+        "items_html_list": items_html_list,
     }
 
     text_content = (
         _(
             "Hello %(user_name)s,\n\n"
-            "Your order for %(recipe_title)s has been successfully submitted!\n"
+            "Your order has been successfully submitted!\n"
             "Order ID: %(order_id)s\n"
+            "Items:\n%(items_summary)s\n"
             "Total Price: %(total_price)s\n\n"
             "Thank you for ordering with Sandwitches.\n"
         )
@@ -86,9 +106,10 @@ def notify_order_submitted(order_id):
             "<div style='font-family: sans-serif;'>"
             "<h2>Order Confirmation</h2>"
             "<p>Hello <strong>%(user_name)s</strong>,</p>"
-            "<p>Your order for <strong>%(recipe_title)s</strong> has been successfully submitted!</p>"
+            "<p>Your order has been successfully submitted!</p>"
             "<ul>"
             "<li>Order ID: %(order_id)s</li>"
+            "%(items_html_list)s"
             "<li>Total Price: %(total_price)s</li>"
             "</ul>"
             "<p>Thank you for ordering with Sandwitches.</p>"

{sandwitches-2.5.3 → sandwitches-2.5.5}/src/sandwitches/templates/admin/order_list.html

@@ -16,7 +16,7 @@
             <tr>
                 <th>ID</th>
                 <th>{% trans "User" %}</th>
-                <th>{% trans "Recipe" %}</th>
+                <th>{% trans "Items" %}</th>
                 <th>{% trans "Price" %}</th>
                 <th>{% trans "Status" %}</th>
                 <th>{% trans "Date" %}</th>

{sandwitches-2.5.3 → sandwitches-2.5.5}/src/sandwitches/templates/admin/partials/order_rows.html

@@ -12,7 +12,11 @@
             <span class="max">{{ order.user.username }}</span>
         </div>
     </td>
-    <td>{{ order.recipe.title }}</td>
+    <td>
+        {% for item in order.items.all %}
+            <div>{{ item.quantity }}x {{ item.recipe.title }}</div>
+        {% endfor %}
+    </td>
     <td>€ {{ order.total_price }} </td>
     <td>
         <form method="post" action="{% url 'admin_order_update_status' order.pk %}" class="row align-center no-space">

{sandwitches-2.5.3 → sandwitches-2.5.5}/src/sandwitches/templates/order_detail.html

@@ -35,22 +35,24 @@
           <div class="divider"></div>
 
           <h6>{% trans "Item Details" %}</h6>
+          {% for item in order.items.all %}
           <div class="row">
               <div class="max">
-                  <a href="{% url 'recipe_detail' order.recipe.slug %}" class="bold primary-text">{{ order.recipe.title }}</a>
-                  <p class="small-text">{{ order.recipe.description|truncatewords:20 }}</p>
+                  <a href="{% url 'recipe_detail' item.recipe.slug %}" class="bold primary-text">{{ item.quantity }}x {{ item.recipe.title }}</a>
+                  <p class="small-text">{{ item.recipe.description|truncatewords:20 }}</p>
               </div>
               <div class="min">
-                  <span class="bold">{{ order.total_price }} €</span>
+                   <!-- Calculate item total: price * quantity -->
+                  <span class="bold">{% widthratio item.price 1 item.quantity %} €</span>
               </div>
           </div>
 
-          {% if order.recipe.image %}
+          {% if item.recipe.image %}
           <div class="space"></div>
-          <img src="{{ order.recipe.image.url }}" class="responsive round border" alt="{{ order.recipe.title }}">
+          <img src="{{ item.recipe.image.url }}" class="responsive round border" alt="{{ item.recipe.title }}" style="max-height: 200px; object-fit: cover;">
           {% endif %}
-
           <div class="divider"></div>
+          {% endfor %}
 
           <div class="row">
               <div class="max text-right">

{sandwitches-2.5.3 → sandwitches-2.5.5}/src/sandwitches/templates/profile.html

@@ -136,7 +136,16 @@
                 <tr>
                     <td>{{ order.id }}</td>
                     <td>
-                        <a href="{% url 'recipe_detail' order.recipe.slug %}">{{ order.recipe.title }}</a>
+                        {% with first_item=order.items.first %}
+                            {% if first_item %}
+                                <a href="{% url 'recipe_detail' first_item.recipe.slug %}">{{ first_item.recipe.title }}</a>
+                                {% if order.items.count > 1 %}
+                                    <span class="small-text">(+{{ order.items.count|add:"-1" }})</span>
+                                {% endif %}
+                            {% else %}
+                                <span>{% trans "No items" %}</span>
+                            {% endif %}
+                        {% endwith %}
                     </td>
                     <td>{{ order.created_at|date:"d/m/Y" }}</td>
                     <td>

{sandwitches-2.5.3 → sandwitches-2.5.5}/src/sandwitches/urls.py

@@ -50,9 +50,6 @@ urlpatterns = [
     path("cart/checkout/", views.checkout_cart, name="checkout_cart"),
     path("", views.index, name="index"),
     path("feeds/latest/", LatestRecipesFeed(), name="latest_recipes_feed"),
-    path(
-        "feeds/latest/", LatestRecipesFeed(), name="latest_recipes_feed"
-    ),  # Add this line
 ]
 
 urlpatterns += i18n_patterns(

{sandwitches-2.5.3 → sandwitches-2.5.5}/src/sandwitches/views.py

@@ -9,7 +9,11 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.admin.views.decorators import staff_member_required
 from django.utils.translation import gettext as _
 from django.utils import translation
-from .models import Recipe, Rating, Tag, Order, CartItem, Setting
+from .models import Recipe, Rating, Tag, Order, CartItem, Setting, OrderItem
+from .tasks import (
+    notify_order_submitted,
+    send_gotify_notification,
+)
 from .utils import ORDER_DB
 from .forms import (
     RecipeForm,
@@ -542,7 +546,8 @@ def admin_order_update_status(request, pk):
 @staff_member_required
 def admin_order_list(request):
     orders = (
-        Order.objects.select_related("user", "recipe")  # ty:ignore[unresolved-attribute]
+        Order.objects.select_related("user")  # ty:ignore[unresolved-attribute]
+        .prefetch_related("items__recipe")
         .all()
         .order_by("-created_at")
     )
@@ -626,12 +631,27 @@ def order_recipe(request, pk):
     """
     Create an order for the given recipe by the logged-in user.
     """
+    from django.db import transaction
+    from .models import OrderItem
+
     recipe = get_object_or_404(Recipe, pk=pk)
     if request.method != "POST":
         return redirect("recipe_detail", slug=recipe.slug)
 
     try:
-        order = Order.objects.create(user=request.user, recipe=recipe)  # ty:ignore[unresolved-attribute]
+        with transaction.atomic():
+            order = Order.objects.create(user=request.user)  # ty:ignore[unresolved-attribute]
+            OrderItem.objects.create(order=order, recipe=recipe, quantity=1)  # ty:ignore[unresolved-attribute]
+            order.total_price = recipe.price
+            order.save()
+
+            notify_order_submitted.enqueue(order_id=order.pk)
+            send_gotify_notification.enqueue(
+                title="New Order Received",
+                message=f"Order #{order.pk} by {request.user.username}. Total: {order.total_price}€",
+                priority=6,
+            )
+
         logging.debug(f"Created {order}")
         messages.success(
             request,
@@ -918,7 +938,7 @@ def user_profile(request):
     else:
         form = UserProfileForm(instance=request.user)
 
-    orders = request.user.orders.select_related("recipe").all()
+    orders = request.user.orders.prefetch_related("items__recipe").all()
 
     # Filtering
     status_filter = request.GET.get("status")
@@ -1052,39 +1072,82 @@ def update_cart_quantity(request, pk):
 
 @login_required
 def checkout_cart(request):
-    cart_items = CartItem.objects.filter(user=request.user)  # ty:ignore[unresolved-attribute]
+    if request.method != "POST":
+        return redirect("view_cart")
+
+    cart_items = CartItem.objects.filter(user=request.user).select_related("recipe")  # ty:ignore[unresolved-attribute]
     if not cart_items.exists():
         messages.error(request, _("Your cart is empty."))
         return redirect("view_cart")
 
-    created_orders = []  # noqa: F841
-    errors = []
-
-    # We use a transaction to ensure either all orders are created or none if something goes wrong
     from django.db import transaction
 
     try:
         with transaction.atomic():
+            # 1. Validate all items have prices and satisfy limits
+            for item in cart_items:
+                if not item.recipe.price:
+                    raise ValidationError(
+                        _(
+                            "Recipe '%(title)s' cannot be ordered because it has no price."
+                        )
+                        % {"title": item.recipe.title}
+                    )
+
+                if (
+                    item.recipe.max_daily_orders is not None
+                    and item.recipe.daily_orders_count + item.quantity
+                    > item.recipe.max_daily_orders
+                ):
+                    raise ValidationError(
+                        _("Daily order limit reached for %(title)s.")
+                        % {"title": item.recipe.title}
+                    )
+
+            # 2. Create the order
+            order = Order.objects.create(user=request.user)  # ty:ignore[unresolved-attribute]
+            total_price = 0
+
+            # 3. Create order items and update recipe counts
             for item in cart_items:
-                # Create Order for each recipe in cart (quantity times?)
-                # Current Order model doesn't have quantity, so we create multiple orders or update Order model.
-                # For now, let's create 'quantity' number of orders as per current schema
-                # OR we could update Order model to support quantity.
-                # Let's see if Order has quantity. (Checked: it does not).
-                for i in range(item.quantity):
-                    try:
-                        Order.objects.create(user=request.user, recipe=item.recipe)  # ty:ignore[unresolved-attribute]
-                    except (ValidationError, ValueError) as e:
-                        errors.append(f"{item.recipe.title}: {str(e)}")
-                        raise e  # Trigger rollback
+                order_item = OrderItem.objects.create(  # ty:ignore[unresolved-attribute]
+                    order=order,
+                    recipe=item.recipe,
+                    quantity=item.quantity,
+                    price=item.recipe.price,
+                )
+                total_price += order_item.price * order_item.quantity
 
+                # Note: OrderItem.save already updates daily_orders_count
+                # But since we already checked it, it should be fine.
+
+            # 4. Finalize order
+            order.total_price = total_price
+            order.save()
+
+            # 5. Clear cart
             cart_items.delete()
-            messages.success(request, _("Orders submitted successfully!"))
-            return redirect("user_profile")
-    except Exception:
-        if errors:
-            for error in errors:
-                messages.error(request, error)
-        else:
-            messages.error(request, _("An error occurred during checkout."))
+
+        # 6. Notifications (outside atomic block for better reliability if using DB-backed tasks)
+        notify_order_submitted.enqueue(order_id=order.pk)
+        send_gotify_notification.enqueue(
+            title="New Order Received",
+            message=f"Order #{order.pk} by {request.user.username}. Total: {order.total_price}€",
+            priority=6,
+        )
+
+        messages.success(request, _("Orders submitted successfully!"))
+        return redirect("user_profile")
+
+    except ValidationError as e:
+        # Specific validation error (e.g. price missing or limit reached)
+        messages.error(request, str(e))
+        return redirect("view_cart")
+    except Exception as e:
+        # General error
+        logging.exception("Error during checkout")
+        messages.error(
+            request,
+            _("An error occurred during checkout: %(error)s") % {"error": str(e)},
+        )
         return redirect("view_cart")