changes to db schema

Author: lordlabakdas

main.py

@@ -1,5 +1,6 @@
 import logging
 import sys
+import os
 
 import uvicorn
 from fastapi import FastAPI
@@ -15,17 +16,14 @@
 from api.cart_api import cart_apis
 from models.db import create_db_and_tables
 
-logger.add(
-    sys.stderr, format="{time} {level} {message}", filter="my_module", level="INFO"
-)
-logger.add("file_{time}.log")
-logger.add(
-    sys.stdout, colorize=True, format="<green>{time}</green> <level>{message}</level>"
-)
-logger = logging.getLogger("groceror")
+# Configure logging
+logging.basicConfig(level=logging.INFO)
+logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
 
 app = FastAPI(debug=False)
-app.logger = logger
+
+# Get port from environment variable (Heroku sets this)
+port = int(os.getenv("PORT", 8000))
 
 # Allow requests from any origin
 origins = ["*"]
@@ -88,4 +86,14 @@ def custom_openapi():
 app.openapi = custom_openapi
 
 if __name__ == "__main__":
-    uvicorn.run(app, port=8000)
+    try:
+        uvicorn.run(
+            "main:app",
+            host="0.0.0.0",
+            port=port,
+            log_level="info",
+            reload=False  # Set to False in production
+        )
+    except Exception as e:
+        logger.error(f"Failed to start server: {e}")
+        sys.exit(1)

models/db.py

@@ -1,14 +1,31 @@
+from sqlalchemy import text
 from sqlalchemy_utils import create_database, database_exists
 from sqlmodel import Session, SQLModel, create_engine
 
 from config import DBConfig
 
-engine = create_engine(DBConfig.DB_URL, echo=True)
+engine = create_engine(
+    DBConfig.DB_URL, 
+    echo=True, 
+    connect_args={"options": "-c search_path=public"}
+)
 db_session = Session(engine)
 
 
 def create_db_and_tables():
     if not database_exists(engine.url):
         create_database(engine.url)
-    # SQLModel.metadata.clear()
+        
+    # Create schema if it doesn't exist
+    with engine.begin() as conn:
+        conn.execute(text("CREATE SCHEMA IF NOT EXISTS public"))
+        # No need for explicit commit when using 'begin()'
+    
+    # Create all tables
     SQLModel.metadata.create_all(bind=engine)
+
+def get_session():
+    try:
+        yield db_session
+    finally:
+        db_session.close()

models/entity/inventory_entity.py

@@ -6,21 +6,38 @@
 from sqlmodel import Field, SQLModel
 
 
-class InventoryCategory(Enum):
-    PRODUCE = "produce"
-    MEAT_AND_POULTRY = "meat_and_poultry"
-    DAIRY_AND_EGGS = "dairy_and_eggs"
-    FROZEN_FOOD = "frozen_foods"
-    CANNED_FOOD = "canned_food"
+class InventoryCategory(str, Enum):
+    GROCERY = "GROCERY"
+    PRODUCE = "PRODUCE"
+    MEAT = "MEAT"
+    DAIRY = "DAIRY"
+    BAKERY = "BAKERY"
+    OTHER = "OTHER"
 
 
 class Inventory(SQLModel, table=True):
     id: Optional[UUID] = Field(default_factory=uuid4, primary_key=True)
-    name: str
-    quantity: int
-    category: Optional[str] = None
+    name: str = Field(index=True)
+    quantity: int = Field(default=0)
+    category: InventoryCategory
+    user_id: UUID = Field(foreign_key="user.id")
+    store_id: UUID = Field(foreign_key="store.id")
+    price: float = Field(default=0.0)
+    notes: Optional[str] = None
     created_at: datetime = Field(default_factory=datetime.utcnow)
     updated_at: datetime = Field(default_factory=datetime.utcnow)
-    notes: Optional[str] = None
-    user_id: UUID = Field(foreign_key="user.id")
     # user: "User" = Relationship(back_populates="inventory")
+
+    def to_dict(self):
+        return {
+            "id": self.id,
+            "name": self.name,
+            "quantity": self.quantity,
+            "category": self.category,
+            "user_id": self.user_id,
+            "store_id": self.store_id,
+            "price": self.price,
+            "notes": self.notes,
+            "created_at": self.created_at,
+            "updated_at": self.updated_at
+        }

models/entity/store_entity.py

@@ -28,7 +28,7 @@ def __str__(self):
     def __hash__(self):
         return hash(self.id)
 
-    def is_active(self):
+    def active(self):
         return self.is_active
 
     def is_inactive(self):