get and add inventory working

Author: lordlabakdas

api/helpers/inventory_helper.py

@@ -9,6 +9,14 @@
 
 logger = logging.getLogger()
 
+def to_dict(self):
+    return {
+        "name": self.name,
+        "quantity": self.quantity,
+        "category": self.category,
+        "user_id": self.user_id,
+        "notes": self.notes,
+    }
 
 class InventoryHelper(object):
     def __init__(self, user: User) -> None:
@@ -50,7 +58,7 @@ def get_store_inventory(self, items: List[str] = None) -> List[Dict]:
                 db_session.query(Inventory)
                 .join(User)
                 .filter(User.id == self.user.id)
-                .first()
+                .all()
             )
             if store_inventory:
                 if items:
@@ -63,7 +71,7 @@ def get_store_inventory(self, items: List[str] = None) -> List[Dict]:
             logger.exception(f"Error while adding inventory with exception details {e}")
             raise e
         else:
-            return DBHelper.convert_query_result_to_dict(query_result=store_inventory)
+            return [to_dict(inventory) for inventory in store_inventory]
         finally:
             db_session.close()
 
@@ -81,7 +89,7 @@ def get_inventory_by_category(self, category: Enum) -> List[Dict]:
             )
             raise e
         else:
-            return DBHelper.convert_query_result_to_dict(query_result=inventory)
+            return [inv.to_dict() for inv in inventory]
         finally:
             db_session.close()
 

api/inventory_api.py

@@ -36,18 +36,15 @@ async def add_inventory(
         return {"inventory_id": new_inventory_id}
 
 
-@inventory_apis.post("/get-store-inventory", response_model=StoreInventoryResponse)
+@inventory_apis.get("/get-store-inventory", response_model=StoreInventoryResponse)
 async def get_store_inventory(
     items: List[str] = None,
-    quantity_limit: int = None,
     user: User = Depends(auth_required),
 ):
     logger.info(f"Getting inventory for store: {user.email}")
     try:
         inventory_helper_obj = InventoryHelper(user=user)
-        inventory = inventory_helper_obj.get_store_inventory(
-            items=items, quantity_limit=quantity_limit
-        )
+        inventory = inventory_helper_obj.get_store_inventory(items=items)
     except Exception as e:
         logger.exception(
             f"Error while retreiving store inventory with exception details {e}"
@@ -63,15 +60,12 @@ async def get_store_inventory(
 @inventory_apis.delete("/delete-inventory", response_model=StoreInventoryResponse)
 async def delete_inventory(
     items: List[str] = None,
-    quantity_limit: int = None,
     user: User = Depends(auth_required),
 ):
     logger.info(f"Deleting inventory for user: {user.email}")
     try:
         inventory_helper_obj = InventoryHelper(user=user)
-        inventory = inventory_helper_obj.delete_inventory(
-            items=items, quantity_limit=quantity_limit
-        )
+        inventory_helper_obj.delete_inventory(items=items)
     except Exception as e:
         logger.exception(f"Error while deleting inventory with exception details {e}")
         raise HTTPException(

api/validators/inventory_validation.py

@@ -26,10 +26,10 @@ class AddInventoryResponse(BaseModel):
 
 
 class StoreInventory(BaseModel):
-    email: str
-    name: str  # TODO distinguish between user name and inventory name
-    address: str
+    name: str
     quantity: int
+    category: InventoryCategory
+    notes: Optional[str] = None
 
 
 class StoreInventoryResponse(BaseModel):

main.py

@@ -53,4 +53,4 @@ async def welcome():
 create_db_and_tables()
 
 if __name__ == "__main__":
-    uvicorn.run(app, port=8009)
+    uvicorn.run(app, port=8000)