sandwitches 2.2.0__tar.gz → 2.3.1__tar.gz

{sandwitches-2.2.0 → sandwitches-2.3.1}/PKG-INFO

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

{sandwitches-2.2.0 → sandwitches-2.3.1}/pyproject.toml

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

{sandwitches-2.2.0 → sandwitches-2.3.1}/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
+from .models import Recipe, Tag, Rating, Setting, Order
 from django.utils.html import format_html
 from import_export import resources
 from import_export.admin import ImportExportModelAdmin
@@ -24,6 +24,11 @@ class RatingResource(resources.ModelResource):
         model = Rating
 
 
+class OrderResource(resources.ModelResource):
+    class Meta:
+        model = Order
+
+
 User = get_user_model()
 
 
@@ -42,7 +47,14 @@ class CustomUserAdmin(UserAdmin):
 @admin.register(Recipe)
 class RecipeAdmin(ImportExportModelAdmin):
     resource_classes = [RecipeResource]
-    list_display = ("title", "uploaded_by", "created_at", "is_highlighted", "show_url")
+    list_display = (
+        "title",
+        "uploaded_by",
+        "price",
+        "created_at",
+        "is_highlighted",
+        "show_url",
+    )
     list_editable = ("is_highlighted",)
     readonly_fields = ("created_at", "updated_at")
 
@@ -67,3 +79,12 @@ class TagAdmin(ImportExportModelAdmin):
 @admin.register(Rating)
 class RatingAdmin(ImportExportModelAdmin):
     resource_classes = [RatingResource]
+
+
+@admin.register(Order)
+class OrderAdmin(ImportExportModelAdmin):
+    resource_classes = [OrderResource]
+    list_display = ("id", "user", "recipe", "status", "total_price", "created_at")
+    list_filter = ("status", "created_at")
+    search_fields = ("user__username", "recipe__title")
+    readonly_fields = ("total_price", "created_at", "updated_at")

{sandwitches-2.2.0 → sandwitches-2.3.1}/src/sandwitches/api.py

@@ -1,6 +1,6 @@
 import logging
 from ninja import NinjaAPI
-from .models import Recipe, Tag, Setting, Rating
+from .models import Recipe, Tag, Setting, Rating, Order
 from django.contrib.auth import get_user_model
 from .utils import (
     parse_ingredient_line,
@@ -14,6 +14,7 @@ from django.shortcuts import get_object_or_404
 from datetime import date
 import random
 from typing import List, Optional  # Import typing hints
+from django.core.exceptions import ValidationError
 
 from ninja.security import django_auth
 
@@ -82,6 +83,16 @@ class ScaledIngredient(Schema):  # New Schema for scaled ingredients
     name: Optional[str]
 
 
+class OrderSchema(ModelSchema):
+    class Meta:
+        model = Order
+        fields = ["id", "status", "total_price", "created_at"]
+
+
+class CreateOrderSchema(Schema):
+    recipe_id: int
+
+
 @api.get("ping")
 def ping(request):
     return {"status": "ok", "message": "pong"}
@@ -205,3 +216,13 @@ def get_tags(request):
 def get_tag(request, tag_id: int):
     tag = get_object_or_404(Tag, id=tag_id)
     return tag
+
+
+@api.post("v1/orders", auth=django_auth, response={201: OrderSchema, 400: Error})
+def create_order(request, payload: CreateOrderSchema):
+    recipe = get_object_or_404(Recipe, id=payload.recipe_id)
+    try:
+        order = Order.objects.create(user=request.user, recipe=recipe)  # ty:ignore[unresolved-attribute]
+        return 201, order
+    except (ValidationError, ValueError) as e:
+        return 400, {"message": str(e)}

{sandwitches-2.2.0 → sandwitches-2.3.1}/src/sandwitches/forms.py

@@ -85,6 +85,18 @@ class UserSignupForm(UserCreationForm, BaseUserFormMixin):
         return user
 
 
+class UserProfileForm(forms.ModelForm):
+    class Meta:
+        model = User
+        fields = (
+            "first_name",
+            "last_name",
+            "email",
+            "avatar",
+            "bio",
+        )
+
+
 class UserEditForm(forms.ModelForm):
     class Meta:
         model = User
@@ -124,6 +136,10 @@ class RecipeForm(forms.ModelForm):
             "description",
             "ingredients",
             "instructions",
+            "price",
+            "is_highlighted",
+            "is_approved",
+            "max_daily_orders",
         ]
         widgets = {
             "image": forms.FileInput(),
@@ -162,6 +178,39 @@ class RecipeForm(forms.ModelForm):
         return recipe
 
 
+class UserRecipeSubmissionForm(forms.ModelForm):
+    tags_string = forms.CharField(
+        required=False,
+        label=_("Tags (comma separated)"),
+        widget=forms.TextInput(attrs={"placeholder": _("e.g. spicy, vegan, quick")}),
+    )
+
+    class Meta:
+        model = Recipe
+        fields = [
+            "title",
+            "image",
+            "description",
+            "ingredients",
+            "instructions",
+            "price",
+            "servings",
+        ]
+        widgets = {
+            "image": forms.FileInput(),
+        }
+
+    def save(self, commit=True):
+        recipe = super().save(commit=commit)
+        if commit:
+            recipe.set_tags_from_string(self.cleaned_data.get("tags_string", ""))
+        else:
+            self.save_m2m = lambda: recipe.set_tags_from_string(
+                self.cleaned_data.get("tags_string", "")
+            )
+        return recipe
+
+
 class RatingForm(forms.Form):
     """Form for rating recipes (0-10) with an optional comment."""
 

sandwitches-2.3.1/src/sandwitches/management/commands/reset_daily_orders.py

@@ -0,0 +1,14 @@
+from django.core.management.base import BaseCommand
+from sandwitches.tasks import reset_daily_orders
+
+
+class Command(BaseCommand):
+    help = "Resets the daily order count for all recipes. Should be run at midnight."
+
+    def handle(self, *args, **options):
+        task_result = reset_daily_orders.enqueue()
+        self.stdout.write(
+            self.style.SUCCESS(
+                f"Enqueued daily order count reset task (Result ID: {task_result.id})."
+            )
+        )

sandwitches-2.3.1/src/sandwitches/migrations/0007_historicalrecipe_price_recipe_price_order.py

@@ -0,0 +1,86 @@
+# Generated by Django 6.0.1 on 2026-01-20 10:49
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0006_historicalrecipe_is_highlighted_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicalrecipe",
+            name="price",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                max_digits=6,
+                null=True,
+                verbose_name="Price (€)",
+            ),
+        ),
+        migrations.AddField(
+            model_name="recipe",
+            name="price",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                max_digits=6,
+                null=True,
+                verbose_name="Price (€)",
+            ),
+        ),
+        migrations.CreateModel(
+            name="Order",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "status",
+                    models.CharField(
+                        choices=[
+                            ("PENDING", "Pending"),
+                            ("COMPLETED", "Completed"),
+                            ("CANCELLED", "Cancelled"),
+                        ],
+                        default="PENDING",
+                        max_length=20,
+                    ),
+                ),
+                ("total_price", models.DecimalField(decimal_places=2, max_digits=6)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "recipe",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="orders",
+                        to="sandwitches.recipe",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="orders",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Order",
+                "verbose_name_plural": "Orders",
+                "ordering": ("-created_at",),
+            },
+        ),
+    ]

sandwitches-2.3.1/src/sandwitches/migrations/0008_historicalrecipe_daily_orders_count_and_more.py

@@ -0,0 +1,36 @@
+# Generated by Django 6.0.1 on 2026-01-21 09:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0007_historicalrecipe_price_recipe_price_order"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicalrecipe",
+            name="daily_orders_count",
+            field=models.PositiveIntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name="historicalrecipe",
+            name="max_daily_orders",
+            field=models.PositiveIntegerField(
+                blank=True, null=True, verbose_name="Max daily orders"
+            ),
+        ),
+        migrations.AddField(
+            model_name="recipe",
+            name="daily_orders_count",
+            field=models.PositiveIntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name="recipe",
+            name="max_daily_orders",
+            field=models.PositiveIntegerField(
+                blank=True, null=True, verbose_name="Max daily orders"
+            ),
+        ),
+    ]

sandwitches-2.3.1/src/sandwitches/migrations/0009_historicalrecipe_is_approved_recipe_is_approved.py

@@ -0,0 +1,22 @@
+# Generated by Django 6.0.1 on 2026-01-22 12:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0008_historicalrecipe_daily_orders_count_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicalrecipe",
+            name="is_approved",
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name="recipe",
+            name="is_approved",
+            field=models.BooleanField(default=True),
+        ),
+    ]

{sandwitches-2.2.0 → sandwitches-2.3.1}/src/sandwitches/models.py

@@ -4,12 +4,13 @@ from .storage import HashedFilenameStorage
 from simple_history.models import HistoricalRecords
 from django.contrib.auth.models import AbstractUser
 from django.db.models import Avg
-from .tasks import email_users
+from .tasks import email_users, notify_order_submitted
 from django.conf import settings
 from django.core.validators import MinValueValidator, MaxValueValidator
 import logging
 from django.urls import reverse
 from solo.models import SingletonModel
+from django.core.exceptions import ValidationError
 
 from imagekit.models import ImageSpecField
 from imagekit.processors import ResizeToFill
@@ -89,6 +90,9 @@ class Recipe(models.Model):
     ingredients = models.TextField(blank=True)
     instructions = models.TextField(blank=True)
     servings = models.IntegerField(default=1, validators=[MinValueValidator(1)])
+    price = models.DecimalField(
+        max_digits=6, decimal_places=2, null=True, blank=True, verbose_name="Price (€)"
+    )
     uploaded_by = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         related_name="recipes",
@@ -128,6 +132,11 @@ class Recipe(models.Model):
     )
     tags = models.ManyToManyField(Tag, blank=True, related_name="recipes")
     is_highlighted = models.BooleanField(default=False)
+    is_approved = models.BooleanField(default=True)
+    max_daily_orders = models.PositiveIntegerField(
+        null=True, blank=True, verbose_name="Max daily orders"
+    )
+    daily_orders_count = models.PositiveIntegerField(default=0)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
     history = HistoricalRecords()
@@ -216,3 +225,56 @@ class Rating(models.Model):
 
     def __str__(self):
         return f"{self.recipe} — {self.score} by {self.user}"
+
+
+class Order(models.Model):
+    STATUS_CHOICES = (
+        ("PENDING", "Pending"),
+        ("COMPLETED", "Completed"),
+        ("CANCELLED", "Cancelled"),
+    )
+
+    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")
+    total_price = models.DecimalField(max_digits=6, decimal_places=2)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        ordering = ("-created_at",)
+        verbose_name = "Order"
+        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)
+
+    def __str__(self):
+        return f"Order #{self.pk} - {self.user} - {self.recipe}"

{sandwitches-2.2.0 → sandwitches-2.3.1}/src/sandwitches/settings.py

@@ -132,6 +132,7 @@ LOGGING = {
 
 LOGIN_REDIRECT_URL = "index"
 LOGOUT_REDIRECT_URL = "index"
+LOGIN_URL = "login"
 
 
 # Password validation

{sandwitches-2.2.0 → sandwitches-2.3.1}/src/sandwitches/tasks.py

@@ -35,6 +35,80 @@ def email_users(context, recipe_id):
     return True
 
 
+@task(priority=5)
+def reset_daily_orders():
+    from .models import Recipe
+
+    count = Recipe.objects.update(daily_orders_count=0)  # ty:ignore[unresolved-attribute]
+    logging.info(f"Successfully reset daily order count for {count} recipes.")
+    return count
+
+
+@task(priority=2, queue_name="emails")
+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]
+    except Order.DoesNotExist:  # ty:ignore[unresolved-attribute]
+        logging.warning(f"Order {order_id} not found. Skipping notification.")
+        return
+
+    user = order.user
+    if not user.email:
+        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}
+    from_email = getattr(settings, "EMAIL_FROM_ADDRESS")
+
+    context_data = {
+        "user_name": user.get_full_name() or user.username,
+        "recipe_title": recipe.title,
+        "order_id": order.id,
+        "total_price": order.total_price,
+    }
+
+    text_content = (
+        _(
+            "Hello %(user_name)s,\n\n"
+            "Your order for %(recipe_title)s has been successfully submitted!\n"
+            "Order ID: %(order_id)s\n"
+            "Total Price: %(total_price)s\n\n"
+            "Thank you for ordering with Sandwitches.\n"
+        )
+        % context_data
+    )
+
+    html_content = (
+        _(
+            "<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>"
+            "<ul>"
+            "<li>Order ID: %(order_id)s</li>"
+            "<li>Total Price: %(total_price)s</li>"
+            "</ul>"
+            "<p>Thank you for ordering with Sandwitches.</p>"
+            "</div>"
+        )
+        % context_data
+    )
+
+    msg = EmailMultiAlternatives(
+        subject=subject,
+        body=text_content,
+        from_email=from_email,
+        to=[user.email],
+    )
+    msg.attach_alternative(html_content, "text/html")
+    msg.send()
+
+    logging.info(f"Order confirmation email sent to {user.email} for order {order.id}")
+
+
 def send_emails(recipe_id, emails):
     from .models import Recipe
 

{sandwitches-2.2.0 → sandwitches-2.3.1}/src/sandwitches/templates/admin/admin_base.html

@@ -68,6 +68,10 @@
             <i>star</i>
             <span>{% trans "Ratings" %}</span>
         </a>
+        <a href="{% url 'admin_order_list' %}" class="{% if request.resolver_match.url_name == 'admin_order_list' %}active{% endif %}">
+            <i>shopping_cart</i>
+            <span>{% trans "Orders" %}</span>
+        </a>
         <a href="{% url 'admin_task_list' %}" class="{% if request.resolver_match.url_name == 'admin_task_list' %}active{% endif %}">
             <i>assignment</i>
             <span>{% trans "Tasks" %}</span>