better error handling for database

Author: chetanr25

.github/workflows/backend-ci-cd.yml

@@ -156,16 +156,33 @@ jobs:
             # Pull latest image
             docker pull ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
 
-            # Stop and remove old container (ignore errors if not running)
+            # Create docker network if it doesn't exist
+            docker network create college-network 2>/dev/null || true
+
+            # Start PostgreSQL if not running
+            docker run -d \
+              --name postgres-db \
+              --network college-network \
+              --restart unless-stopped \
+              -e POSTGRES_DB=collegefinder \
+              -e POSTGRES_USER=postgres \
+              -e POSTGRES_PASSWORD=postgres \
+              -v pgdata:/var/lib/postgresql/data \
+              -p 5432:5432 \
+              postgres:16-alpine 2>/dev/null || echo "PostgreSQL already running"
+
+            # Stop and remove old backend container (ignore errors if not running)
             docker stop ${{ env.CONTAINER_NAME }} 2>/dev/null || true
             docker remove ${{ env.CONTAINER_NAME }} 2>/dev/null || true
 
-            # Start new container
+            # Start new backend container
             docker run -d \
               --name ${{ env.CONTAINER_NAME }} \
-              --network host \
+              --network college-network \
               --restart unless-stopped \
               --env-file ${{ env.DEPLOY_DIR }}/.env \
+              -e POSTGRES_URL=postgresql+asyncpg://postgres:postgres@postgres-db:5432/collegefinder \
+              -p 8080:8005 \
               ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
 
             # Remove dangling images to free disk space

apps/backend/app/__init__.py

@@ -21,18 +21,41 @@ async def lifespan(app: FastAPI):
     from pathlib import Path
 
     backend_dir = Path(__file__).parent.parent  # /app in container
-    result = subprocess.run(
-        [sys.executable, "-m", "alembic", "upgrade", "head"],
-        capture_output=True, text=True, cwd=str(backend_dir)
-    )
-    if result.returncode != 0:
-        print(f"[ALEMBIC] Migration warning: {result.stderr}")
-    else:
-        print(f"[ALEMBIC] {result.stdout.strip() or 'Migrations up to date'}")
-
-    await init_db()  # create_all for any tables not covered by migrations
+    
+    # Try to run migrations, but don't fail if tables already exist
+    try:
+        result = subprocess.run(
+            [sys.executable, "-m", "alembic", "upgrade", "head"],
+            capture_output=True, text=True, cwd=str(backend_dir)
+        )
+        if result.returncode != 0:
+            # Check if it's just a "tables already exist" error
+            if "already exists" in result.stderr:
+                print(f"[ALEMBIC] Tables already exist, marking migrations as applied...")
+                # Mark the current migration as applied without running it
+                subprocess.run(
+                    [sys.executable, "-m", "alembic", "stamp", "head"],
+                    capture_output=True, text=True, cwd=str(backend_dir)
+                )
+                print(f"[ALEMBIC] Migrations marked as applied")
+            else:
+                print(f"[ALEMBIC] Migration warning: {result.stderr}")
+        else:
+            print(f"[ALEMBIC] {result.stdout.strip() or 'Migrations up to date'}")
+    except Exception as e:
+        print(f"[ALEMBIC] Migration error (continuing anyway): {e}")
+
+    try:
+        await init_db()  # create_all for any tables not covered by migrations
+    except Exception as e:
+        print(f"[DB] Database initialization error: {e}")
+    
     yield
-    await close_db()
+    
+    try:
+        await close_db()
+    except Exception as e:
+        print(f"[DB] Database cleanup error: {e}")
 
 
 def create_app() -> FastAPI:

apps/backend/main.py

@@ -6,6 +6,9 @@
 
 load_dotenv(find_dotenv())
 
+# Import the FastAPI app for uvicorn to find
+from app import app
+
 if __name__ == "__main__":
     import uvicorn
     uvicorn.run("main:app", port=8005, reload=True)