Merge pull request #38 from lordlabakdas/inventory

Inventory

Author: lordlabakdas

api/firebase_api.py

@@ -4,12 +4,14 @@
 from firebase_admin import auth as firebase_auth
 from google.oauth2 import id_token
 
-from api.validators.user_validation import (ChangePasswordPayload,
-                                            ChangePasswordResponse,
-                                            FirebaseLoginPayload,
-                                            FirebaseLoginResponse,
-                                            FirebaseRegistrationPayload,
-                                            FirebaseRegistrationResponse)
+from api.validators.user_validation import (
+    ChangePasswordPayload,
+    ChangePasswordResponse,
+    FirebaseLoginPayload,
+    FirebaseLoginResponse,
+    FirebaseRegistrationPayload,
+    FirebaseRegistrationResponse,
+)
 from models.service.user_service import User
 
 logger = logging.getLogger("groceror")

api/helpers/inventory_helper.py

@@ -9,12 +9,22 @@
 
 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:
         self.user = user
 
-    def add_inventory(self, name: str, quantity: int, category: Enum, notes: str = None) -> dict:
+    def add_inventory(
+        self, name: str, quantity: int, category: Enum, notes: str = None
+    ) -> dict:
         try:
             inventory_obj = (
                 db_session.query(Inventory)
@@ -42,32 +52,26 @@ def add_inventory(self, name: str, quantity: int, category: Enum, notes: str = N
         finally:
             db_session.close()
 
-    def get_store_inventory(
-        self, items: List[str] = None, quantity_limit: int = None
-    ) -> List[Dict]:
+    def get_store_inventory(self, items: List[str] = None) -> List[Dict]:
         try:
             store_inventory = (
                 db_session.query(Inventory)
                 .join(User)
                 .filter(User.id == self.user.id)
-                .first()
+                .all()
             )
             if store_inventory:
                 if items:
                     store_inventory = store_inventory.filter(
                         Inventory.name.in_(items)
                     ).all()
-                if quantity_limit:
-                    store_inventory = store_inventory.filter(
-                        Inventory.quantity > quantity_limit
-                    )
             else:
                 logger.critical(f"No store inventory found for {self.user}")
         except Exception as e:
             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()
 
@@ -85,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()
 
@@ -109,10 +113,14 @@ def get_inventory_by_name(self, name: str) -> List[Dict]:
 
     def update_inventory(self, inventory: dict) -> None:
         try:
-            db_session.query(Inventory).filter(Inventory.id == inventory.id).update(inventory)
+            db_session.query(Inventory).filter(Inventory.id == inventory.id).update(
+                inventory
+            )
             db_session.commit()
         except Exception as e:
-            logger.exception(f"Error while updating inventory with exception details {e}")
+            logger.exception(
+                f"Error while updating inventory with exception details {e}"
+            )
             raise e
         finally:
             db_session.close()
@@ -122,5 +130,7 @@ def delete_inventory(self, inventory: dict) -> None:
             db_session.query(Inventory).filter(Inventory.id == inventory.id).delete()
             db_session.commit()
         except Exception as e:
-            logger.exception(f"Error while deleting inventory with exception details {e}")
-            raise e
+            logger.exception(
+                f"Error while deleting inventory with exception details {e}"
+            )
+            raise e

api/inventory_api.py

@@ -4,9 +4,11 @@
 from fastapi import APIRouter, Depends, HTTPException, status
 
 from api.helpers.inventory_helper import InventoryHelper
-from api.validators.inventory_validation import (AddInventoryPayload,
-                                                 AddInventoryResponse,
-                                                 StoreInventoryResponse)
+from api.validators.inventory_validation import (
+    AddInventoryPayload,
+    AddInventoryResponse,
+    StoreInventoryResponse,
+)
 from helpers.jwt import auth_required
 from models.entity.user_entity import User
 
@@ -34,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}"
@@ -61,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/user_api.py

@@ -6,11 +6,14 @@
 from loguru import logger
 
 from api.helpers import auth_helper
-from api.validators.user_validation import (ChangePasswordPayload,
-                                            ChangePasswordResponse,
-                                            LoginPayload, LoginResponse,
-                                            RegistrationPayload,
-                                            RegistrationResponse)
+from api.validators.user_validation import (
+    ChangePasswordPayload,
+    ChangePasswordResponse,
+    LoginPayload,
+    LoginResponse,
+    RegistrationPayload,
+    RegistrationResponse,
+)
 from config import JWTConfig
 from helpers.jwt import JWT
 
@@ -43,9 +46,7 @@ async def register(registration_payload: RegistrationPayload):
     logger.info(f"Registering user with payload: {registration_payload}")
     try:
         if not auth_helper.is_user_exists(email=registration_payload.email):
-            new_user = auth_helper.register(
-                **registration_payload.dict()
-            )
+            new_user = auth_helper.register(**registration_payload.dict())
         else:
             raise HTTPException(
                 status_code=status.HTTP_409_CONFLICT,
@@ -87,5 +88,3 @@ async def change_password(
     logger.info(f"Changing password for user with payload: {change_password_payload}")
     auth_helper.change_password(current_user, change_password_payload)
     return {"status": "success"}
-
-

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):

engine/inventory/cart.py

@@ -1,5 +1,6 @@
 from models.entity.user_entity import User
 
+
 class Cart(object):
     def __init__(self, user: User):
         self.user = user
@@ -13,26 +14,25 @@ def remove_item(self, item: dict):
 
     def get_cart(self):
         return self.items
-    
+
     def clear_cart(self):
         self.items = []
-    
+
     def get_total(self):
-        return sum(item['price'] for item in self.items)
-    
+        return sum(item["price"] for item in self.items)
+
     def checkout(self):
         self.clear_cart()
         return self.get_cart_total()
-    
+
     def get_cart_items(self):
         return self.items
-    
+
     def get_cart_total(self):
         return self.get_total()
 
     def get_cart_count(self):
         return len(self.items)
 
     def get_cart_items_total(self):
-        return sum(item['price'] for item in self.items)
-    
+        return sum(item["price"] for item in self.items)

helpers/jwt.py

@@ -55,19 +55,16 @@ def decode_token(self, token: str) -> Union[Dict[str, str], None]:
         except jwt.ExpiredSignatureError:
             logger.exception("Token has expired")
             raise HTTPException(
-                status_code=status.HTTP_401_UNAUTHORIZED,
-                detail="Token has expired"
+                status_code=status.HTTP_401_UNAUTHORIZED, detail="Token has expired"
             )
         except jwt.InvalidTokenError:
             logger.exception("Invalid token")
             raise HTTPException(
-                status_code=status.HTTP_401_UNAUTHORIZED,
-                detail="Invalid token"
+                status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid token"
             )
         except Exception as e:
             logger.exception(f"Error while decoding token: {e}")
             raise HTTPException(
-                status_code=status.HTTP_401_UNAUTHORIZED,
-                detail="Error decoding token"
+                status_code=status.HTTP_401_UNAUTHORIZED, detail="Error decoding token"
             )
         return decoded_token

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)

models/entity/user_entity.py

@@ -22,4 +22,4 @@ class User(SQLModel, table=True):
     created_at: datetime = Field(default_factory=datetime.utcnow, nullable=False)
     updated_at: datetime = Field(default_factory=datetime.utcnow, nullable=False)
     location: Optional[str] = None
-    #inventory: List["Inventory"] = Relationship(back_populates="user")
+    # inventory: List["Inventory"] = Relationship(back_populates="user")

models/service/user_service.py

@@ -5,6 +5,7 @@
 import sqlalchemy
 
 from helpers.exceptions import GrocerorError
+
 # from helpers.jwt import JWT
 from models.db import db_session
 from models.entity.user_entity import User