Merge branch 'main-preview' into automatic-scraping

Author: ramonechen

app/db_models/course_seats.py

@@ -1,4 +1,4 @@
-from sqlalchemy.dialects.mysql import ENUM, SMALLINT, TINYINT, VARCHAR
+from sqlalchemy.dialects.mysql import ENUM, SMALLINT, VARCHAR
 from sqlmodel import Field, SQLModel
 
 _SEM_ENUM = ["Fall", "Spring", "Summer"]
@@ -9,5 +9,5 @@ class Course_Seats(SQLModel, table=True):
     semester: str = Field(primary_key=True, sa_type=ENUM(*_SEM_ENUM))
     dept: str = Field(primary_key=True, sa_type=VARCHAR(4))
     code_num: str = Field(primary_key=True, sa_type=VARCHAR(4))
-    seats_filled: int = Field(sa_type=TINYINT)
-    seats_total: int = Field(sa_type=TINYINT)
+    seats_filled: int = Field(sa_type=SMALLINT)
+    seats_total: int = Field(sa_type=SMALLINT)

app/routers/course.py

@@ -2,6 +2,7 @@
 
 from fastapi import APIRouter
 from sqlmodel import and_, desc, distinct, func, or_, select
+from sqlmodel import and_, desc, distinct, func, or_, select
 from sqlmodel.sql.expression import Select, SelectOfScalar
 
 from app import SessionDep
@@ -141,8 +142,9 @@ def search_course(
     dept_filters = deptFilters.split(",") if deptFilters else None
     attr_filters = attrFilters.split(",") if attrFilters else None
     sem_filters = semFilters.split(",") if semFilters else None
-    if not (searchPrompt or dept_filters or attr_filters or sem_filters):
-        return []
+    if not (dept_filters or attr_filters or sem_filters):
+        if not searchPrompt or len(searchPrompt) < 3:
+            return []
     regex_code = ".*"
     regex_full = ".*"
     regex_start = ".*"
@@ -161,7 +163,7 @@ def search_course(
     if sem_filters and len(sem_filters) > 0:
         sem_filters.sort()
         sem_filter_regex = ".*".join(sem_filters)
-    if searchPrompt and len(searchPrompt) > 0:
+    if searchPrompt and len(searchPrompt) > 2:
         reg_start_or_space = "(^|.* )"
         # Full code match
         regex_code = f"^{searchPrompt}$"