dev to main

Dev to main

Author: ryanpolasky

app.py

@@ -12,15 +12,11 @@
 
 from config import settings
 from utils.exceptions import AppException
-from routes import auth, survey, matches, cron, profiles
+from routes import auth, survey, matches, cron, profiles, admin, verification
 
 
 def create_app() -> FastAPI:
-    app = FastAPI(
-        title="MeteorMate API",
-        version="1.0.0",
-        root_path="/api"
-    )
+    app = FastAPI(title="MeteorMate API", version="1.0.0", root_path="/api")
 
     # Logging
     logger = logging.getLogger("meteormate")
@@ -78,6 +74,8 @@ async def app_exception_handler(request: Request, exc: AppException):
     app.include_router(matches.router, prefix="/matches", tags=["matches"])
     app.include_router(cron.router, prefix="/cron", tags=["cron"])
     app.include_router(profiles.router, prefix="/profiles", tags=["user_profiles"])
+    app.include_router(admin.router, prefix="/admin", tags=["admin"])
+    app.include_router(verification.router, prefix="/verification", tags=["verification"])
 
     @app.get("")
     async def root_no_slash():

config.py

@@ -9,9 +9,7 @@
 class Settings:
     DATABASE_URL: str = config("DATABASE_URL")
 
-    FIREBASE_CREDENTIALS = json.loads(
-        config("FIREBASE_CREDENTIALS", default="{}")
-    )
+    FIREBASE_CREDENTIALS = json.loads(config("FIREBASE_CREDENTIALS", default="{}"))
     FIREBASE_STORAGE_BUCKET: str = config("FIREBASE_STORAGE_BUCKET", default="")
 
     ALLOWED_ORIGINS: List[str] = ["*"]  # todo - change this to meteormate.com when site is live
@@ -30,12 +28,6 @@ class Settings:
     # cron config (i.e. admin token for cron jobs to perform administrative duties)
     CRON_SECRET: str = config("CRON_SECRET", default="")
 
-    # admin bearer key for testing
-    ADMIN_BEARER: str = config("ADMIN_BEARER", default="")
-
-    # admin user uid for testing
-    ADMIN_UID: str = config("ADMIN_UID", default="")
-
     # validation config
     FIRST_NAME_MIN_LEN: int = 2
     FIRST_NAME_MAX_LEN: int = 50

database.py

@@ -31,7 +31,7 @@ def to_db(v):
     SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
 except Exception as e:
-    logger.critical(f"Failed to initialize database engine: {str(e)}")
+    logger.critical(f"Failed to initialize database engine: {str(e)}", exc_info=settings.DEBUG)
     raise
 
 ORMBase = declarative_base()
@@ -73,15 +73,22 @@ def commit_or_raise(
         orig = e.orig
 
         if isinstance(orig, ForeignKeyViolation):
-            route_logger.exception(
-                f"{action} failed: foreign key violation on {resource} (User: {uid})"
+            route_logger.error(
+                f"{action} failed: foreign key violation on {resource} (User: {uid})",
+                exc_info=settings.DEBUG,
             )
             raise NotFound(resource)
 
-        route_logger.exception(f"{action} failed: integrity conflict on {resource} (User: {uid})")
+        route_logger.error(
+            f"{action} failed: integrity conflict on {resource} (User: {uid})",
+            exc_info=settings.DEBUG
+        )
         raise Conflict(f"{resource} conflicts with existing data")
 
     except SQLAlchemyError:
         db.rollback()
-        route_logger.exception(f"{action} failed: unexpected DB error on {resource} (User: {uid})")
+        route_logger.error(
+            f"{action} failed: unexpected DB error on {resource} (User: {uid})",
+            exc_info=settings.DEBUG
+        )
         raise InternalServerError(f"Internal server error while {action} {resource}")

models/admin.py

@@ -0,0 +1,22 @@
+from datetime import datetime
+from sqlalchemy import DateTime, Text, func
+from sqlalchemy.orm import mapped_column, Mapped
+from database import ORMBase
+
+
+class Banlist(ORMBase):
+    __tablename__ = "banlist"
+
+    net_id: Mapped[str] = mapped_column(Text, nullable=False, primary_key=True)
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), nullable=False, server_default=func.now()
+    )
+
+
+class Admins(ORMBase):
+    __tablename__ = "admins"
+
+    net_id: Mapped[str] = mapped_column(Text, nullable=False, primary_key=True)
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), nullable=False, server_default=func.now()
+    )

models/downscale.py

@@ -0,0 +1,102 @@
+import sys
+import os
+import tkinter as tk
+from tkinter import filedialog
+from PIL import Image
+
+NORMAL_MAX_BYTES = 10 * 1024 * 1024
+AGGRESSIVE_MAX_BYTES = 5 * 1024 * 1024
+OUTPUT_DIR = os.path.dirname(os.path.abspath(__file__))
+
+
+def get_file_size(path):
+    return os.path.getsize(path)
+
+
+def downscale_image(input_path, max_bytes):
+    if not os.path.isfile(input_path):
+        print(f"File not found: {input_path}")
+        return None
+
+    file_size = get_file_size(input_path)
+    filename = os.path.basename(input_path)
+    name, ext = os.path.splitext(filename)
+    output_ext = ext.lower() if ext.lower() in (".jpg", ".jpeg", ".png", ".webp") else ".jpg"
+    output_path = os.path.join(OUTPUT_DIR, f"{name}_downscaled{output_ext}")
+
+    img = Image.open(input_path)
+
+    if img.mode == "RGBA" and output_ext in (".jpg", ".jpeg"):
+        img = img.convert("RGB")
+    elif img.mode not in ("RGB", "RGBA"):
+        img = img.convert("RGB")
+
+    if file_size <= max_bytes:
+        img.save(output_path, quality=95)
+        print(f"Image already under limit. Saved to: {output_path}")
+        return output_path
+
+    quality = 95
+    scale = 1.0
+
+    img.save(output_path, quality=quality, optimize=True)
+
+    while get_file_size(output_path) > max_bytes and quality > 20:
+        quality -= 5
+        img.save(output_path, quality=quality, optimize=True)
+
+    if get_file_size(output_path) <= max_bytes:
+        print(f"Downscaled (quality={quality}): {output_path}")
+        return output_path
+
+    while get_file_size(output_path) > max_bytes and scale > 0.1:
+        scale -= 0.1
+        new_width = int(img.width * scale)
+        new_height = int(img.height * scale)
+        resized = img.resize((new_width, new_height), Image.LANCZOS)
+        resized.save(output_path, quality=quality, optimize=True)
+
+    print(f"Downscaled (quality={quality}, scale={scale:.0%}): {output_path}")
+    return output_path
+
+
+def pick_images():
+    root = tk.Tk()
+    root.withdraw()
+    root.attributes('-topmost', True)
+    root.update()
+    paths = filedialog.askopenfilenames(
+        title="Select images to downscale",
+        filetypes=[
+            ("Image files", "*.jpg *.jpeg *.png *.webp *.bmp *.tiff"),
+            ("All files", "*.*"),
+        ],
+    )
+    root.destroy()
+    return paths
+
+
+def pick_mode():
+    print("Select downscale mode:")
+    print("  1) Normal     - 10MB or less")
+    print("  2) Aggressive -  5MB or less")
+    choice = input("Enter 1 or 2: ").strip()
+    if choice == "2":
+        return AGGRESSIVE_MAX_BYTES
+    return NORMAL_MAX_BYTES
+
+
+if __name__ == "__main__":
+    max_bytes = pick_mode()
+
+    if len(sys.argv) >= 2:
+        files = sys.argv[1:]
+    else:
+        files = pick_images()
+
+    if not files:
+        print("No images selected.")
+        sys.exit(0)
+
+    for path in files:
+        downscale_image(path, max_bytes)

models/user.py

@@ -5,7 +5,7 @@
 from typing import Optional, Literal
 
 from pydantic import BaseModel, EmailStr
-from sqlalchemy import Column, Boolean, DateTime, Text, func, Enum
+from sqlalchemy import Column, Boolean, DateTime, Text, func, Enum as SQLEnum
 from sqlalchemy.orm import relationship
 
 from database import ORMBase
@@ -26,13 +26,21 @@ class User(ORMBase):
 
     # behind-the-scenes stuff
     is_active = Column(Boolean, nullable=False, server_default='true', default=True)
-    pending_deletion = Column(Boolean, nullable=False, server_default='false', default=True)
+    pending_deletion = Column(Boolean, nullable=False, server_default='false', default=False)
+    is_banned = Column(Boolean, nullable=False, server_default='false', default=False)
 
     created_at = Column(DateTime(timezone=True), nullable=False, server_default=func.now())
     updated_at = Column(
         DateTime(timezone=True), nullable=False, server_default=func.now(), onupdate=func.now()
     )
-    inactivity_notification_stage = Column(Enum(InactivityStage), nullable=True)
+    inactivity_notification_stage = Column(
+        SQLEnum(
+            InactivityStage,
+            values_callable=lambda enum_cls: [e.value for e in enum_cls],
+            name="inactivitystage",
+        ),
+        nullable=True,
+    )
     last_inactivity_notification_sent_at = Column(DateTime, nullable=True)
 
     survey = relationship(
@@ -41,20 +49,3 @@ class User(ORMBase):
     profile = relationship(
         "UserProfile", back_populates="user", uselist=False, cascade="all, delete-orphan"
     )
-
-
-class UserRequestVerify(BaseModel):
-    email: EmailStr
-    uid: Optional[str] = None
-    purpose: Literal["verify", "reset"] = "verify"
-
-
-class UserCompleteVerify(BaseModel):
-    email: EmailStr
-    code: str
-
-
-class UserResetPassword(BaseModel):
-    email: EmailStr
-    code: str
-    new_password: str

models/user_profile.py

@@ -1,7 +1,8 @@
 # Created by Ryan Polasky | 9/20/25
 # ACM MeteorMate | All Rights Reserved
 
-from sqlalchemy import ARRAY, Column, DateTime, Text, ForeignKey, func, Numeric
+import enum
+from sqlalchemy import ARRAY, Column, Text, ForeignKey, func, Numeric, Enum as SQLEnum, Boolean, text, Date, DateTime
 from sqlalchemy.dialects.postgresql import ENUM as PGEnum
 from sqlalchemy.orm import relationship
 from sqlalchemy.ext.mutable import MutableList
@@ -37,13 +38,19 @@ class UserProfile(ORMBase):
     major = Column(Text)
     classification = Column(CLASSIFICATION_ENUM)
     bio = Column(Text)
-    profile_picture_url = Column(MutableList.as_mutable(ARRAY(Text)), default=[])
+    profile_picture_url = Column(MutableList.as_mutable(ARRAY(Text)), default=list)
 
     # moved from user table
     first_name = Column(Text)
     last_name = Column(Text)
     age = Column(Numeric)
 
+    dob = Column(Date(), nullable=False)
+
+    # notification preferences
+    match_notification = Column(Boolean, server_default=text("true"), nullable=False)
+    promotional_notification = Column(Boolean, server_default=text("false"), nullable=False)
+
     # behind-the-scenes stuff
     created_at = Column(DateTime(timezone=True), server_default=func.now(), nullable=False)
     updated_at = Column(