fix/add IngredientInShoppingList model

Author: huggerkios

src/apps/recipes/admin.py

@@ -15,6 +15,7 @@
     IngredientInRecipe,
     Measurement,
     ShoppingList,
+    IngredientInShoppingList,
 )
 
 
@@ -86,7 +87,6 @@ class IngredientInRecipeAdmin(admin.ModelAdmin):
     list_display = (
         'ingredient',
         'recipe',
-        'recipe',
         'amount',
         'measurement',
         'recommendation',
@@ -114,3 +114,21 @@ class ShoppingListAdmin(admin.ModelAdmin):
     )
     search_fields = ('name', 'author__username')
     list_filter = ('author',)
+
+
+@admin.register(IngredientInShoppingList)
+class IngredientInShoppingListAdmin(admin.ModelAdmin):
+    list_display = (
+        'ingredient',
+        'shopping_list',
+        'amount',
+        'measurement',
+        'recommendation',
+    )
+    search_fields = (
+        'ingredient__name',
+        'shopping_list__name',
+        'shopping_list__author__username',
+        'measurement__name',
+    )
+    list_filter = ('ingredient', 'shopping_list', 'measurement')

src/apps/recipes/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.16 on 2024-11-11 08:16
+# Generated by Django 4.2.16 on 2024-11-11 09:08
 
 import apps.core.validators
 import apps.recipes.models
@@ -176,6 +176,52 @@ class Migration(migrations.Migration):
                 "get_latest_by": ("created",),
             },
         ),
+        migrations.CreateModel(
+            name="IngredientInShoppingList",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "created",
+                    models.DateTimeField(
+                        auto_now_add=True, db_index=True, verbose_name="Date created"
+                    ),
+                ),
+                (
+                    "amount",
+                    models.PositiveSmallIntegerField(verbose_name="Ingredient amount"),
+                ),
+                (
+                    "recommendation",
+                    models.CharField(
+                        max_length=128, verbose_name="Ingredient recommendation note"
+                    ),
+                ),
+                (
+                    "ingredient",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="shopping_lists_details",
+                        to="recipes.ingredient",
+                        verbose_name="Ingredient in recipe",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Ingredient in shopping list",
+                "verbose_name_plural": "Ingredients in shopping lists",
+                "db_table_comment": "Ingredients in shopping lists",
+                "ordering": ("-created",),
+                "get_latest_by": ("created",),
+            },
+        ),
         migrations.CreateModel(
             name="Measurement",
             fields=[
@@ -448,6 +494,7 @@ class Migration(migrations.Migration):
                     models.ManyToManyField(
                         blank=True,
                         related_name="shopping_lists",
+                        through="recipes.IngredientInShoppingList",
                         to="recipes.ingredient",
                         verbose_name="Ingredients in list",
                     ),
@@ -592,6 +639,37 @@ class Migration(migrations.Migration):
                 verbose_name="Recipe timers",
             ),
         ),
+        migrations.AddField(
+            model_name="ingredientinshoppinglist",
+            name="measurement",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="shopping_lists_details",
+                to="recipes.measurement",
+                verbose_name="Ingredient measurement",
+            ),
+        ),
+        migrations.AddField(
+            model_name="ingredientinshoppinglist",
+            name="shopping_list",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="ingredients_details",
+                to="recipes.shoppinglist",
+                verbose_name="ShoppingList",
+            ),
+        ),
+        migrations.AddField(
+            model_name="ingredientinshoppinglist",
+            name="substitutes",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="Ingredients that can be used instead of",
+                to="recipes.ingredientinshoppinglist",
+                verbose_name="Substitutes",
+            ),
+        ),
         migrations.AddField(
             model_name="ingredientinrecipe",
             name="measurement",

src/apps/recipes/models.py

@@ -304,6 +304,7 @@ class ShoppingList(CreatedModel, AuthorModel, UUIDModel):
     )
     ingredients = models.ManyToManyField(
         'Ingredient',
+        through='IngredientInShoppingList',
         related_name='shopping_lists',
         verbose_name=_('Ingredients in list'),
         blank=True,
@@ -320,6 +321,53 @@ def __str__(self) -> str:
         return _(f'{self.name} (author: {self.author})')
 
 
+class IngredientInShoppingList(CreatedModel):
+    """Ingredient, shopping list intermediate model."""
+
+    shopping_list = models.ForeignKey(
+        'ShoppingList',
+        verbose_name=_('ShoppingList'),
+        on_delete=models.CASCADE,
+        related_name='ingredients_details',
+    )
+    ingredient = models.ForeignKey(
+        'Ingredient',
+        verbose_name=_('Ingredient in recipe'),
+        on_delete=models.CASCADE,
+        related_name='shopping_lists_details',
+    )
+    amount = models.PositiveSmallIntegerField(
+        _('Ingredient amount'),
+        null=False,
+        blank=False,
+    )
+    measurement = models.ForeignKey(
+        'Measurement',
+        verbose_name=_('Ingredient measurement'),
+        on_delete=models.SET_NULL,
+        related_name='shopping_lists_details',
+        null=True,
+    )
+    recommendation = models.CharField(
+        _('Ingredient recommendation note'),
+        max_length=RecipesLengthLimits.INGREDIENT_RECOMMENDATION_MAX_LENGTH,
+    )
+    substitutes = models.ManyToManyField(
+        'self',
+        symmetrical=False,
+        verbose_name=_('Substitutes'),
+        help_text=_('Ingredients that can be used instead of'),
+        blank=True,
+    )
+
+    class Meta:
+        verbose_name = _('Ingredient in shopping list')
+        verbose_name_plural = _('Ingredients in shopping lists')
+        db_table_comment = _('Ingredients in shopping lists')
+        ordering = ('-created',)
+        get_latest_by = ('created',)
+
+
 class CookingStep(CreatedModel, ModifiedModel, UUIDModel):
     """Recipe cooking step model."""