Complete recipes page

one_trip_api/api/admin.py

@@ -6,8 +6,16 @@ import nested_admin
 from api.models import *
 # Register your models here.
 
-class IngredientInline(nested_admin.NestedGenericTabularInline):
-    model = Ingredient
+# class IngredientInline(nested_admin.NestedGenericTabularInline):
+#     model = Ingredient
+#     extra = 0
+
+class RecipeIngredientInline(nested_admin.NestedTabularInline):
+    model = RecipeIngredient
+    extra = 0
+
+class ListIngredientInline(nested_admin.NestedTabularInline):
+    model = ListIngredient
     extra = 0
 
 class UserInline(nested_admin.NestedTabularInline):
@@ -28,20 +36,20 @@ class HomegroupInviteInline(nested_admin.NestedTabularInline):
 
 class RecipeInline(nested_admin.NestedTabularInline):
     model = Recipe
-    inlines = (IngredientInline,)
+    inlines = (RecipeIngredientInline,)
     extra = 0
 
 @admin.register(Recipe)
 class RecipeAdmin(nested_admin.NestedModelAdmin):
     list_display = ("name",)
-    inlines = (IngredientInline,)
+    inlines = (RecipeIngredientInline,)
 
 @admin.register(Homegroup)
 class HomegroupAdmin(nested_admin.NestedModelAdmin):
     list_display = ("id", "name")
-    inlines = (UserInline, HomegroupInviteInline, RecipeInline, IngredientInline)
+    inlines = (UserInline, HomegroupInviteInline, RecipeInline,)
 
 @admin.register(List)
 class ListAdmin(nested_admin.NestedModelAdmin):
     list_display = ("homegroup",)
-    inlines = (RecipeInline, IngredientInline)
+    inlines = (ListIngredientInline,)

one_trip_api/api/migrations/0003_recipeingredient_listingredient.py

@@ -0,0 +1,31 @@
+# Generated by Django 4.1.3 on 2022-11-27 21:53
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0002_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='RecipeIngredient',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=50)),
+                ('recipe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ingredients', to='api.recipe')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ListIngredient',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=50)),
+                ('in_cart', models.BooleanField(default=False)),
+                ('list', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ingredients', to='api.list')),
+            ],
+        ),
+    ]

one_trip_api/api/migrations/0004_remove_recipe_list_delete_ingredient.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.1.3 on 2022-11-27 22:00
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0003_recipeingredient_listingredient'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='recipe',
+            name='list',
+        ),
+        migrations.DeleteModel(
+            name='Ingredient',
+        ),
+    ]

one_trip_api/api/models.py

@@ -3,15 +3,6 @@ from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
 
 # Create your models here.
-class Ingredient(models.Model):
-    limit = models.Q(app_label="api", model="recipe") | models.Q(app_label="api", model="list")
-    content_type = models.ForeignKey(ContentType, limit_choices_to=limit, on_delete=models.CASCADE)
-    object_id = models.PositiveBigIntegerField()
-    content_object = GenericForeignKey()
-
-
-    name = models.CharField(max_length=50)
-    in_stock = models.BooleanField(default=False)
 
 class HomegroupInvite(models.Model):
     homegroup = models.ForeignKey("api.Homegroup", on_delete=models.CASCADE, related_name="invites", blank=True)
@@ -33,15 +24,21 @@ class Homegroup(models.Model):
         return f"{self.id}: {self.name}"
 
 class List(models.Model):
-    # Foreign Key Recipe -> List [as recipes]
-    extra_ingredients = GenericRelation(Ingredient, related_query_name="extra_ingredients")
+    # Foreign Key ListIngredient -> List [as ingredients]
     homegroup = models.OneToOneField(Homegroup, on_delete=models.CASCADE, primary_key=True)
     
 
 class Recipe(models.Model):
+    # Foreign Key RecipeIngredient -> List [as ingredients]
     name = models.CharField(max_length=50)
     homegroup = models.ForeignKey(Homegroup, related_name="recipes", on_delete=models.CASCADE)
-    list = models.ForeignKey(List, related_name="recipes", on_delete=models.SET_NULL, blank=True, null=True)
-    ingredients = GenericRelation(Ingredient, related_query_name="ingredients")
 
 
+class RecipeIngredient(models.Model):
+    name = models.CharField(max_length=50)
+    recipe = models.ForeignKey(Recipe, on_delete=models.CASCADE, related_name="ingredients")
+
+class ListIngredient(models.Model):
+    name = models.CharField(max_length=50)
+    list = models.ForeignKey(List, on_delete=models.CASCADE, related_name="ingredients")
+    in_cart = models.BooleanField(default=False)

one_trip_api/api/serializers.py

@@ -2,11 +2,15 @@ from rest_framework import serializers
 from api.models import *
 from users.serializers import UserSerializer
 
-class IngredientSerializer(serializers.ModelSerializer):
+class RecipeIngredientSerializer(serializers.ModelSerializer):
     class Meta:
-        model = Ingredient
-        fields = ["id", "name", "in_stock", "content_type", "object_id"]
-        read_only_fields = ["id"]
+        model = RecipeIngredient
+        fields = ["id", "name", "recipe"]
+
+class ListIngredientSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ListIngredient
+        fields = ["id", "name", "list", "in_cart"]
 
 class RecipeSerializer(serializers.ModelSerializer):
     ingredients = serializers.SerializerMethodField()
@@ -18,7 +22,20 @@ class RecipeSerializer(serializers.ModelSerializer):
 
     def get_ingredients(self, instance):
         ingredients = instance.ingredients.all().order_by("name")
-        return IngredientSerializer(ingredients, many=True).data
+        return RecipeIngredientSerializer(ingredients, many=True).data
+
+class ListSerializer(serializers.ModelSerializer):
+    ingredients = serializers.SerializerMethodField()
+
+    class Meta:
+        model = List
+        fields = ["homegroup", "ingredients"]
+        read_only_fields = ["homegroup"]
+
+    def get_ingredients(self, instance):
+        ingredients = instance.ingredients.all().order_by("name")
+        return ListIngredientSerializer(ingredients, many=True).data
+
 
 class HomegroupSerializer(serializers.ModelSerializer):
     users = serializers.PrimaryKeyRelatedField(many=True, read_only=True)

one_trip_api/api/urls.py

@@ -4,10 +4,13 @@ from api import views
 
 router = routers.DefaultRouter()
 router.register(r'recipes', views.RecipeView)
-router.register(r'ingredients', views.IngredientView)
+router.register(r'lists', views.ListView)
+router.register(r'recipeingredients', views.RecipeIngredientView)
+router.register(r'listingredients', views.ListIngredientView)
 router.register(r'homegroups', views.HomegroupView)
 router.register(r'groupinvites', views.HomegroupInviteView)
 
 urlpatterns = [
-    path('', include(router.urls))
+    path('', include(router.urls)),
+    # path('ingredienttypes/', views.IngredientContentTypesView.as_view())
 ]

one_trip_api/api/views.py

@@ -1,5 +1,5 @@
-from rest_framework import viewsets
-
+from rest_framework import viewsets, mixins, views, status, permissions
+from rest_framework.response import Response
 from api.serializers import *
 from api.models import *
 
@@ -7,14 +7,22 @@ class RecipeView(viewsets.ModelViewSet):
     serializer_class = RecipeSerializer
     queryset = Recipe.objects.all()
 
-class IngredientView(viewsets.ModelViewSet):
-    serializer_class = IngredientSerializer
-    queryset = Ingredient.objects.all()
-
 class HomegroupView(viewsets.ModelViewSet):
     serializer_class = HomegroupSerializer
     queryset = Homegroup.objects.all()
 
 class HomegroupInviteView(viewsets.ModelViewSet):
     serializer_class = InviteSerializer
-    queryset = HomegroupInvite.objects.all()
+    queryset = HomegroupInvite.objects.all() 
+
+class RecipeIngredientView(viewsets.ModelViewSet):
+    serializer_class = RecipeIngredientSerializer
+    queryset = RecipeIngredient.objects.all()
+
+class ListIngredientView(viewsets.ModelViewSet):
+    serializer_class = ListIngredientSerializer
+    queryset = ListIngredient.objects.all()
+
+class ListView(mixins.RetrieveModelMixin, viewsets.GenericViewSet):
+    serializer_class = ListSerializer
+    queryset = List.objects.all()

one_trip_api/gunicorn.service

@@ -0,0 +1,18 @@
+[Unit]
+Description=gunicorn daemon
+Requires=gunicorn.socket
+After=network.target
+
+[Service]
+User=django
+Group=www-data
+Environment="DJANGO_RELEASE=True"
+WorkingDirectory=/opt/django/OneTrip/one_trip_api
+ExecStart=/opt/django/OneTrip/one_trip_api/venv/bin/gunicorn \
+          --access-logfile - \
+          --workers 3 \
+          --bind unix:/run/gunicorn.sock \
+          one_trip_api.wsgi:application
+
+[Install]
+WantedBy=multi-user.target

one_trip_api/gunicorn.socket

@@ -0,0 +1,8 @@
+[Unit]
+Description=gunicorn socket
+
+[Socket]
+ListenStream=/run/gunicorn.sock
+
+[Install]
+WantedBy=sockets.target

one_trip_api/one_trip_api/settings/base.py

@@ -13,7 +13,7 @@ https://docs.djangoproject.com/en/4.1/ref/settings/
 from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent
+BASE_DIR = Path(__file__).resolve().parent.parent.parent
 STATIC_URL = "static/"
 MEDIA_URL = "/media/"
 
@@ -24,7 +24,8 @@ REST_FRAMEWORK = {
     'DEFAULT_AUTHENTICATION_CLASSES': [
         'rest_framework.authentication.TokenAuthentication',
         'rest_framework.authentication.SessionAuthentication',
-    ]
+    ],
+    'DEFAULT_FILTER_BACKENDS': ['django_filters.rest_framework.DjangoFilterBackend']
 }
 
 # Application definition