Remove From Grocery List Feature

Harin-Archives · Apr 3, 2022 · a9485dc · a9485dc
1 parent 609b82d
commit a9485dc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/backend/app/route/grocery_list.py b/backend/app/route/grocery_list.py
@@ -53,7 +53,7 @@ async def read_grocery_list(user_id: str):
         }
 
 @router.put("/")
-async def update_grocery_list(grocery_list_item_id: int, user_id: str, obtained_status: bool):
+async def update_grocery_list(grocery_list_item_id: str, user_id: str, obtained_status: bool):
     try:
         conn, cursor = init_conn()
         if user_id:
@@ -77,7 +77,7 @@ async def update_grocery_list(grocery_list_item_id: int, user_id: str, obtained_
         }
 
 @router.delete("/")
-async def delete_grocery_list_item(grocery_list_item_id: int, user_id: str):
+async def delete_grocery_list_item(grocery_list_item_id: str, user_id: str):
     try:
         conn, cursor = init_conn()
         if user_id:

diff --git a/database/sproc/groceryListSproc.sql b/database/sproc/groceryListSproc.sql
@@ -25,11 +25,11 @@ DELIMITER ;
 DELIMITER $$ 
 
 CREATE PROCEDURE `deleteGroceryListItem` (
-    IN `_grocery_list_item_id` INT,
+    IN `_grocery_list_item_id` VARCHAR(255),
     IN `_user_id` VARCHAR(50)
 ) BEGIN 
 DELETE FROM `grocery_list_table`
-WHERE `grocery_list_item_id` = `_grocery_list_item_id` AND `user_id` = `_user_id`;
+WHERE `ingredient_id` = `_grocery_list_item_id` AND `user_id` = `_user_id`;
 
 END $$
 
@@ -53,14 +53,14 @@ DELIMITER ;
 DELIMITER $$ 
 
 CREATE PROCEDURE `updateGroceryListObtainedStatus` (
-    IN `_grocery_list_item_id` INT,
+    IN `_grocery_list_item_id` VARCHAR(255),
     IN `_user_id` VARCHAR(50),
     IN `_obtained` BOOLEAN
 ) BEGIN 
 
 UPDATE `grocery_list_table`
 SET `obtained` = `_obtained`
-WHERE `grocery_list_item_id` = `_grocery_list_item_id` AND `user_id` = `_user_id`;
+WHERE `ingredient_id` = `_grocery_list_item_id` AND `user_id` = `_user_id`;
 
 END $$
 

diff --git a/frontend/src/saga/groceryListSaga.js b/frontend/src/saga/groceryListSaga.js
@@ -146,17 +146,12 @@ function* addIngredientCall(param) {
 
 function* removeIngredientCall(param) {
   try {
-    const data = JSON.stringify({
-      user_id: param.payload.userID,
-      ingredient_id: param.payload.item.id,
-    });
     const apiConfig = {
       method: 'delete',
-      url: `${API_URL}/grocery_list`,
+      url: `${API_URL}/grocery_list?user_id=${param.payload.userID}&grocery_list_item_id=${param.payload.item.id}`,
       headers: {
         'Content-Type': 'application/json',
       },
-      data,
     };
 
     const response = yield call(axios, apiConfig);
@@ -215,7 +210,7 @@ export function* addGroceryIngredient() {
   yield takeLatest(ADD_GROCERY_INGREDIENT, addIngredientCall);
 }
 
-export function* removeIngredient() {
+export function* removeGroceryIngredient() {
   yield takeLatest(REMOVE_INGREDIENT, removeIngredientCall);
 }
 

diff --git a/frontend/src/saga/index.js b/frontend/src/saga/index.js
@@ -12,7 +12,8 @@ import {
 import {
   getGroceryList,
   addGroceryIngredient,
-  addRecipeIngredient
+  addRecipeIngredient,
+  removeGroceryIngredient,
 } from './groceryListSaga'; 
 import {
   deleteRecipe,
@@ -53,6 +54,7 @@ export default function* rootSaga() {
     fork(getMyNotifications),
     fork(removeRecipeIngredient),
     fork(addGroceryIngredient), 
-    fork(addRecipeIngredient)
+    fork(addRecipeIngredient),
+    fork(removeGroceryIngredient)
   ]);
 }
diff --git a/frontend/src/screens/tab2/groceryList.js b/frontend/src/screens/tab2/groceryList.js
@@ -21,7 +21,6 @@ import {ADD_PANTRY_INGREDIENT} from '../../actions/pantryActions';
 import {
   // ADD_INGREDIENT,
   GET_ALL_INGREDIENTS,
-  REMOVE_INGREDIENT,
   SEARCH_INGREDIENTS,
 } from '../../actions/groceryListActions';
 import Alerts from '../../components/Alerts';