Merge branch 'main' into DSDGROC-117

zbackend/api/migrations/0007_remove_shoppinglist_quantity_shoppinglist_recipe_id.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.4 on 2024-04-22 01:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("api", "0006_remove_macro_macro_name_remove_macro_quantity_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="shoppinglist",
+            name="quantity",
+        ),
+        migrations.AddField(
+            model_name="shoppinglist",
+            name="recipe_id",
+            field=models.CharField(default=1, max_length=100),
+            preserve_default=False,
+        ),
+    ]

zbackend/api/models.py

@@ -29,10 +29,10 @@ def __str__(self):
 
 
 class ShoppingList(models.Model):
+    recipe_id = models.CharField(max_length=100)
     user = models.ForeignKey(
         settings.AUTH_USER_MODEL, on_delete=models.CASCADE, db_index=True
     )
-    quantity = models.DecimalField(max_digits=10, decimal_places=2)
     is_purchased = models.BooleanField(default=False)
     name = models.CharField(max_length=100)
     image = models.CharField(
@@ -41,7 +41,7 @@ class ShoppingList(models.Model):
     product_id = models.CharField(max_length=255)
 
     def __str__(self):
-        return f"{self.name} ({self.quantity})"
+        return f"{self.name} ({self.product_id})"
 
 
 class FavoriteRecipe(models.Model):

zbackend/api/serializers.py

@@ -35,7 +35,7 @@ class Meta:
 class ShoppingListSerializer(serializers.ModelSerializer):
     class Meta:
         model = ShoppingList
-        fields = ["user", "quantity", "is_purchased", "name", "image", "product_id"]
+        fields = ["recipe_id", "user", "is_purchased", "name", "image", "product_id"]
 
 
 class MacrosSerializer(serializers.ModelSerializer):

zbackend/api/urls.py

@@ -87,5 +87,8 @@
         "users/<int:user_id>/dietaryPreferences/<int:preference_id>/update/",
         views.update_dietary_preference,
         name="update_dietary_preference",
-    ),
+    )
+    # path('users/<int:user_id>/shoppingList/create/', 
+    #     views.create_shopping_list, 
+    #     name='create_shopping_list'),
 ]

zbackend/api/views.py

@@ -37,7 +37,7 @@
 
 class AllowUpdateWithoutAuthentication(BasePermission):
     def has_permission(self, request, view):
-        return request.method in ["PUT", "PATCH"]
+        return request.method in ['PUT', 'PATCH', 'POST']
 
 
 class DietaryPreferenceViewSet(viewsets.ModelViewSet):
@@ -78,9 +78,23 @@ class ShoppingListViewSet(viewsets.ModelViewSet):
     def get_queryset(self):
         user_id = self.kwargs["user_pk"]
         return ShoppingList.objects.filter(user_id=user_id)
-
-    def perform_create(self, serializer):
-        serializer.save(user=self.request.user)
+
+    def perform_create(self, request, *args, **kwargs):
+        data = request.data
+        name = data.get('name')
+
+        query = Ingredient.objects.filter(name=name)
+        ingredient_values = query.values_list()
+        for item in ingredient_values:
+            ing_name = item[1]
+            if name == ing_name:
+                data['is_purchased'] = True
+
+        serializer = ShoppingListSerializer(data=data)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 
 class MacrosViewSet(viewsets.ModelViewSet):
@@ -116,7 +130,7 @@ def perform_create(self, serializer):
         else:
             serializer.save()
 
-
+            
 @api_view(["PUT"])
 @permission_classes([AllowAny])
 def update_dietary_preference(request, user_id, preference_id):