Add new final source code folder

Author: acsany

fastapi-url-shortener/source_code_final/requirements.txt

@@ -1,6 +1,6 @@
-anyio==3.5.0
-asgiref==3.5.0
-click==8.0.4
+anyio==3.6.0
+asgiref==3.5.1
+click==8.1.3
 decorator==5.1.1
 fastapi==0.75.0
 h11==0.13.0
@@ -11,6 +11,6 @@ six==1.16.0
 sniffio==1.2.0
 SQLAlchemy==1.4.32
 starlette==0.17.1
-typing_extensions==4.1.1
+typing_extensions==4.2.0
 uvicorn==0.17.6
 validators==0.18.2

fastapi-url-shortener/source_code_final/shortener_app/config.py

@@ -12,7 +12,7 @@ class Config:
         env_file = ".env"
 
 
-@lru_cache()
+@lru_cache
 def get_settings() -> Settings:
     settings = Settings()
     print(f"Loading settings for: {settings.env_name}")

fastapi-url-shortener/source_code_final/shortener_app/crud.py

@@ -1,19 +1,11 @@
 from sqlalchemy.orm import Session
 
-from . import utils, models, schemas
-
-
-def get_db_url_by_key(db: Session, url_key: str) -> models.URL:
-    return (
-        db.query(models.URL)
-        .filter(models.URL.key == url_key, models.URL.is_active)
-        .first()
-    )
+from . import keygen, models, schemas
 
 
 def create_db_url(db: Session, url: schemas.URLBase) -> models.URL:
-    key = utils.generate_unique_key(db)
-    secret_key = f"{key}_{utils.create_random_key(length=8)}"
+    key = keygen.create_unique_random_key(db)
+    secret_key = f"{key}_{keygen.create_random_key(length=8)}"
     db_url = models.URL(
         target_url=url.target_url, key=key, secret_key=secret_key
     )
@@ -23,6 +15,14 @@ def create_db_url(db: Session, url: schemas.URLBase) -> models.URL:
     return db_url
 
 
+def get_db_url_by_key(db: Session, url_key: str) -> models.URL:
+    return (
+        db.query(models.URL)
+        .filter(models.URL.key == url_key, models.URL.is_active)
+        .first()
+    )
+
+
 def get_db_url_by_secret_key(db: Session, secret_key: str) -> models.URL:
     return (
         db.query(models.URL)
@@ -38,9 +38,7 @@ def update_db_clicks(db: Session, db_url: schemas.URL) -> models.URL:
     return db_url
 
 
-def deactivate_db_url_by_secret_key(
-    db: Session, secret_key: str
-) -> models.URL:
+def deactivate_db_url_by_secret_key(db: Session, secret_key: str) -> models.URL:
     db_url = get_db_url_by_secret_key(db, secret_key)
     if db_url:
         db_url.is_active = False

fastapi-url-shortener/source_code_final/shortener_app/database.py

@@ -4,9 +4,10 @@
 
 from .config import get_settings
 
-
 engine = create_engine(
     get_settings().db_url, connect_args={"check_same_thread": False}
 )
-SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
+SessionLocal = sessionmaker(
+    autocommit=False, autoflush=False, bind=engine
+)
 Base = declarative_base()

…source_code_final/shortener_app/utils.py …ource_code_final/shortener_app/keygen.pyfastapi-url-shortener/source_code_final/shortener_app/utils.py renamed to fastapi-url-shortener/source_code_final/shortener_app/keygen.py fastapi-url-shortener/source_code_final/shortener_app/utils.py renamed to fastapi-url-shortener/source_code_final/shortener_app/keygen.py

@@ -11,7 +11,7 @@ def create_random_key(length: int = 5) -> str:
     return "".join(secrets.choice(chars) for _ in range(length))
 
 
-def generate_unique_key(db: Session) -> str:
+def create_unique_random_key(db: Session) -> str:
     key = create_random_key()
     while crud.get_db_url_by_key(db, key):
         key = create_random_key()

fastapi-url-shortener/source_code_final/shortener_app/main.py

@@ -9,7 +9,6 @@
 from .database import SessionLocal, engine
 from .config import get_settings
 
-
 app = FastAPI()
 models.Base.metadata.create_all(bind=engine)
 
@@ -22,15 +21,6 @@ def get_db():
         db.close()
 
 
-def raise_bad_request(message):
-    raise HTTPException(status_code=400, detail=message)
-
-
-def raise_not_found(request):
-    message = f"URL '{request.url}' doesn't exist"
-    raise HTTPException(status_code=404, detail=message)
-
-
 def get_admin_info(db_url: models.URL) -> schemas.URLInfo:
     base_url = URL(get_settings().base_url)
     admin_endpoint = app.url_path_for(
@@ -41,12 +31,21 @@ def get_admin_info(db_url: models.URL) -> schemas.URLInfo:
     return db_url
 
 
+def raise_bad_request(message):
+    raise HTTPException(status_code=400, detail=message)
+
+
+def raise_not_found(request):
+    message = f"URL '{request.url}' doesn't exist"
+    raise HTTPException(status_code=404, detail=message)
+
+
 @app.get("/")
 def read_root():
-    return "Welcome to the URL Shortener API :)"
+    return "Welcome to the URL shortener API :)"
 
 
-@app.post("/url/", response_model=schemas.URLInfo)
+@app.post("/url", response_model=schemas.URLInfo)
 def create_url(url: schemas.URLBase, db: Session = Depends(get_db)):
     if not validators.url(url.target_url):
         raise_bad_request(message="Your provided URL is not valid")
@@ -84,12 +83,8 @@ def get_url_info(
 def delete_url(
     secret_key: str, request: Request, db: Session = Depends(get_db)
 ):
-    if db_url := crud.deactivate_db_url_by_secret_key(
-        db, secret_key=secret_key
-    ):
-        message = (
-            f"Successfully deleted shortened URL for '{db_url.target_url}'"
-        )
+    if db_url := crud.deactivate_db_url_by_secret_key(db, secret_key=secret_key):
+        message = f"Successfully deleted shortened URL for '{db_url.target_url}'"
         return {"detail": message}
     else:
         raise_not_found(request)