From c4eebaccca17840317c0d8cf442bf45d9dee0a6c Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Sat, 31 Dec 2022 01:09:22 -0600
Subject: [PATCH] Fix for shopping list recipe delete route (#1954)

* fixed broken types

* changed remove recipe route from delete to post
---
 frontend/lib/api/user/group-shopping-lists.ts |  5 +++--
 .../groups/controller_shopping_lists.py       |  2 +-
 .../test_group_shopping_lists.py              | 20 ++++++++++---------
 tests/utils/api_routes/__init__.py            |  5 +++++
 tests/utils/assertion_helpers.py              |  4 ++--
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/frontend/lib/api/user/group-shopping-lists.ts b/frontend/lib/api/user/group-shopping-lists.ts
index f4100c7f..4b906753 100644
--- a/frontend/lib/api/user/group-shopping-lists.ts
+++ b/frontend/lib/api/user/group-shopping-lists.ts
@@ -15,6 +15,7 @@ const routes = {
   shoppingLists: `${prefix}/groups/shopping/lists`,
   shoppingListsId: (id: string) => `${prefix}/groups/shopping/lists/${id}`,
   shoppingListIdAddRecipe: (id: string, recipeId: string) => `${prefix}/groups/shopping/lists/${id}/recipe/${recipeId}`,
+  shoppingListIdRemoveRecipe: (id: string, recipeId: string) => `${prefix}/groups/shopping/lists/${id}/recipe/${recipeId}/delete`,
 
   shoppingListItems: `${prefix}/groups/shopping/items`,
   shoppingListItemsId: (id: string) => `${prefix}/groups/shopping/items/${id}`,
@@ -28,8 +29,8 @@ export class ShoppingListsApi extends BaseCRUDAPI<ShoppingListCreate, ShoppingLi
     return await this.requests.post(routes.shoppingListIdAddRecipe(itemId, recipeId), {recipeIncrementQuantity});
   }
 
-  async removeRecipe(itemId: string, recipeId: string) {
-    return await this.requests.delete(routes.shoppingListIdAddRecipe(itemId, recipeId));
+  async removeRecipe(itemId: string, recipeId: string, recipeDecrementQuantity = 1) {
+    return await this.requests.post(routes.shoppingListIdRemoveRecipe(itemId, recipeId), {recipeDecrementQuantity});
   }
 }
 
diff --git a/mealie/routes/groups/controller_shopping_lists.py b/mealie/routes/groups/controller_shopping_lists.py
index e29e8b59..4655e304 100644
--- a/mealie/routes/groups/controller_shopping_lists.py
+++ b/mealie/routes/groups/controller_shopping_lists.py
@@ -268,7 +268,7 @@ class ShoppingListController(BaseCrudController):
 
         return shopping_list
 
-    @router.delete("/{item_id}/recipe/{recipe_id}", response_model=ShoppingListOut)
+    @router.post("/{item_id}/recipe/{recipe_id}/delete", response_model=ShoppingListOut)
     def remove_recipe_ingredients_from_list(
         self, item_id: UUID4, recipe_id: UUID4, data: ShoppingListRemoveRecipeParams | None = None
     ):
diff --git a/tests/integration_tests/user_group_tests/test_group_shopping_lists.py b/tests/integration_tests/user_group_tests/test_group_shopping_lists.py
index 0cdad25b..b82b90fb 100644
--- a/tests/integration_tests/user_group_tests/test_group_shopping_lists.py
+++ b/tests/integration_tests/user_group_tests/test_group_shopping_lists.py
@@ -202,8 +202,9 @@ def test_shopping_lists_remove_recipe(
         assert item["note"] in known_ingredients
 
     # Remove Recipe
-    response = api_client.delete(
-        api_routes.groups_shopping_lists_item_id_recipe_recipe_id(sample_list.id, recipe.id), headers=unique_user.token
+    response = api_client.post(
+        api_routes.groups_shopping_lists_item_id_recipe_recipe_id_delete(sample_list.id, recipe.id),
+        headers=unique_user.token,
     )
 
     # Get List and Check for Ingredients
@@ -241,8 +242,9 @@ def test_shopping_lists_remove_recipe_multiple_quantity(
         assert item["note"] in known_ingredients
 
     # Remove Recipe
-    response = api_client.delete(
-        api_routes.groups_shopping_lists_item_id_recipe_recipe_id(sample_list.id, recipe.id), headers=unique_user.token
+    response = api_client.post(
+        api_routes.groups_shopping_lists_item_id_recipe_recipe_id_delete(sample_list.id, recipe.id),
+        headers=unique_user.token,
     )
 
     # Get List and Check for Ingredients
@@ -271,7 +273,7 @@ def test_shopping_list_remove_recipe_scale(
     recipe = recipe_ingredient_only
 
     recipe_initital_scale = 100
-    payload = {"recipeIncrementQuantity": recipe_initital_scale}
+    payload: dict = {"recipeIncrementQuantity": recipe_initital_scale}
 
     # first add a bunch of quantity to the list
     response = api_client.post(
@@ -299,8 +301,8 @@ def test_shopping_list_remove_recipe_scale(
     recipe_expected_scale = recipe_initital_scale - recipe_decrement_scale
 
     # remove some of the recipes
-    response = api_client.delete(
-        api_routes.groups_shopping_lists_item_id_recipe_recipe_id(sample_list.id, recipe.id),
+    response = api_client.post(
+        api_routes.groups_shopping_lists_item_id_recipe_recipe_id_delete(sample_list.id, recipe.id),
         headers=unique_user.token,
         json=payload,
     )
@@ -366,8 +368,8 @@ def test_recipe_decrement_max(
 
     # now remove way too many instances of the recipe
     payload = {"recipeDecrementQuantity": recipe_scale * 100}
-    response = api_client.delete(
-        api_routes.groups_shopping_lists_item_id_recipe_recipe_id(sample_list.id, recipe.id),
+    response = api_client.post(
+        api_routes.groups_shopping_lists_item_id_recipe_recipe_id_delete(sample_list.id, recipe.id),
         headers=unique_user.token,
         json=payload,
     )
diff --git a/tests/utils/api_routes/__init__.py b/tests/utils/api_routes/__init__.py
index e28d3fa9..01e40d63 100644
--- a/tests/utils/api_routes/__init__.py
+++ b/tests/utils/api_routes/__init__.py
@@ -279,6 +279,11 @@ def groups_shopping_lists_item_id_recipe_recipe_id(item_id, recipe_id):
     return f"{prefix}/groups/shopping/lists/{item_id}/recipe/{recipe_id}"
 
 
+def groups_shopping_lists_item_id_recipe_recipe_id_delete(item_id, recipe_id):
+    """`/api/groups/shopping/lists/{item_id}/recipe/{recipe_id}/delete`"""
+    return f"{prefix}/groups/shopping/lists/{item_id}/recipe/{recipe_id}/delete"
+
+
 def groups_webhooks_item_id(item_id):
     """`/api/groups/webhooks/{item_id}`"""
     return f"{prefix}/groups/webhooks/{item_id}"
diff --git a/tests/utils/assertion_helpers.py b/tests/utils/assertion_helpers.py
index 371f4a36..072ec184 100644
--- a/tests/utils/assertion_helpers.py
+++ b/tests/utils/assertion_helpers.py
@@ -1,7 +1,7 @@
-from requests import Response
+from httpx import Response
 
 
-def assert_ignore_keys(dict1: dict, dict2: dict, ignore_keys: list = None) -> None:
+def assert_ignore_keys(dict1: dict, dict2: dict, ignore_keys: list | None = None) -> None:
     """
     Itterates through a list of keys and checks if they are in the the provided ignore_keys list,
     if they are not in the ignore_keys list, it checks the value of the key in the provided against