refactor: main.py

Author: makara4code

backend/app/main.py

@@ -1,21 +1,10 @@
-from pathlib import Path
-
-from fastapi import FastAPI, Request
-from fastapi.responses import RedirectResponse
+from fastapi import FastAPI
 from fastapi.routing import APIRoute
-from fastapi.templating import Jinja2Templates
-from sqlmodel import Session
 from starlette.middleware.cors import CORSMiddleware
 
 from app.api.router import api_router
 from app.core.config import settings
-from app.core.db import engine
-from app.modules.shortener.service import ShortUrlService
-
-
-# Setup Jinja2 templates
-templates_dir = Path(__file__).parent / "templates"
-templates = Jinja2Templates(directory=str(templates_dir))
+from app.modules.shortener.redirect import redirect_router
 
 
 def custom_generate_unique_id(route: APIRoute) -> str:
@@ -39,58 +28,4 @@ def custom_generate_unique_id(route: APIRoute) -> str:
     )
 
 app.include_router(api_router, prefix=settings.API_V1_STR)
-
-
-@app.get("/s/{short_code}", tags=["redirect"], response_model=None)
-def redirect_to_url(request: Request, short_code: str):
-    """
-    Redirect to the original URL based on the short code.
-    This endpoint is public and doesn't require authentication.
-    """
-    # Cache control headers to prevent browser caching
-    no_cache_headers = {
-        "Cache-Control": "no-store, no-cache, must-revalidate, max-age=0",
-        "Pragma": "no-cache",
-        "Expires": "0",
-    }
-
-    with Session(engine) as session:
-        service = ShortUrlService(session)
-        short_url = service.get_short_url_by_code(short_code=short_code)
-
-        if not short_url:
-            return templates.TemplateResponse(
-                request=request,
-                name="error.html",
-                context={
-                    "title": "Link Not Found",
-                    "message": "The short URL you're looking for doesn't exist. It may have been deleted or never created.",
-                    "status_code": 404,
-                    "homepage_url": settings.FRONTEND_HOST,
-                },
-                status_code=404,
-                headers=no_cache_headers,
-            )
-
-        if not short_url.is_active:
-            return templates.TemplateResponse(
-                request=request,
-                name="error.html",
-                context={
-                    "title": "Link Deactivated",
-                    "message": "This short URL has been deactivated by its owner and is no longer available.",
-                    "status_code": 410,
-                    "homepage_url": settings.FRONTEND_HOST,
-                },
-                status_code=410,
-                headers=no_cache_headers,
-            )
-
-        # Increment click count
-        service.increment_click_count(short_url=short_url)
-
-        return RedirectResponse(
-            url=short_url.original_url,
-            status_code=307,
-            headers=no_cache_headers,
-        )
+app.include_router(redirect_router)

backend/app/modules/shortener/redirect.py

@@ -0,0 +1,71 @@
+from pathlib import Path
+
+from fastapi import APIRouter, Request
+from fastapi.responses import RedirectResponse
+from fastapi.templating import Jinja2Templates
+from sqlmodel import Session
+
+from app.core.config import settings
+from app.core.db import engine
+from app.modules.shortener.service import ShortUrlService
+
+# Setup Jinja2 templates
+templates_dir = Path(__file__).parent.parent.parent / "templates"
+templates = Jinja2Templates(directory=str(templates_dir))
+
+redirect_router = APIRouter(tags=["redirect"])
+
+
+@redirect_router.get("/s/{short_code}", response_model=None)
+def redirect_to_url(request: Request, short_code: str):
+    """
+    Redirect to the original URL based on the short code.
+    This endpoint is public and doesn't require authentication.
+    """
+    # Cache control headers to prevent browser caching
+    no_cache_headers = {
+        "Cache-Control": "no-store, no-cache, must-revalidate, max-age=0",
+        "Pragma": "no-cache",
+        "Expires": "0",
+    }
+
+    with Session(engine) as session:
+        service = ShortUrlService(session)
+        short_url = service.get_short_url_by_code(short_code=short_code)
+
+        if not short_url:
+            return templates.TemplateResponse(
+                request=request,
+                name="error.html",
+                context={
+                    "title": "Link Not Found",
+                    "message": "The short URL you're looking for doesn't exist. It may have been deleted or never created.",
+                    "status_code": 404,
+                    "homepage_url": settings.FRONTEND_HOST,
+                },
+                status_code=404,
+                headers=no_cache_headers,
+            )
+
+        if not short_url.is_active:
+            return templates.TemplateResponse(
+                request=request,
+                name="error.html",
+                context={
+                    "title": "Link Deactivated",
+                    "message": "This short URL has been deactivated by its owner and is no longer available.",
+                    "status_code": 410,
+                    "homepage_url": settings.FRONTEND_HOST,
+                },
+                status_code=410,
+                headers=no_cache_headers,
+            )
+
+        # Increment click count
+        service.increment_click_count(short_url=short_url)
+
+        return RedirectResponse(
+            url=short_url.original_url,
+            status_code=307,
+            headers=no_cache_headers,
+        )

docker-compose.override.yml

@@ -95,7 +95,7 @@ services:
   frontend:
     restart: "no"
     ports:
-      - "5173:80"
+      - "3000:80"
     build:
       context: ./frontend
       args: