run ruff linter

sunbagel · sunbagel · commit 5a9ea776d1ca · 2025-06-15T15:23:13.000-07:00
diff --git a/backend/app/models/Match.py b/backend/app/models/Match.py
@@ -1,4 +1,3 @@
-import enum
 
 from sqlalchemy import Column, DateTime, ForeignKey, Integer
 from sqlalchemy.dialects.postgresql import UUID
diff --git a/backend/app/models/User.py b/backend/app/models/User.py
@@ -7,7 +7,6 @@
 from .Base import Base
 from .Match import Match
 
-from .Match import Match
 
 class User(Base):
     __tablename__ = "users"
diff --git a/backend/app/routes/availability.py b/backend/app/routes/availability.py
@@ -1,19 +1,20 @@
 from uuid import UUID
+
 from fastapi import APIRouter, Depends, HTTPException, Query
 from sqlalchemy.orm import Session
 
 from app.middleware.auth import has_roles
-from app.utilities.db_utils import get_db
 from app.schemas.availability import (
-    AvailabilityEntity, 
-    CreateAvailabilityRequest, 
-    CreateAvailabilityResponse, 
-    DeleteAvailabilityRequest, 
-    DeleteAvailabilityResponse, 
-    GetAvailabilityRequest
+    AvailabilityEntity,
+    CreateAvailabilityRequest,
+    CreateAvailabilityResponse,
+    DeleteAvailabilityRequest,
+    DeleteAvailabilityResponse,
+    GetAvailabilityRequest,
 )
-from app.services.implementations.availability_service import AvailabilityService
 from app.schemas.user import UserRole
+from app.services.implementations.availability_service import AvailabilityService
+from app.utilities.db_utils import get_db
 
 router = APIRouter(
     prefix="/availability",
@@ -39,24 +40,22 @@ async def get_availability(
         print(e)
         raise HTTPException(status_code=500, detail=str(e))
 
-
-
 @router.post("/", response_model=CreateAvailabilityResponse)
 async def create_availability(
     availability: CreateAvailabilityRequest,
     availability_service: AvailabilityService = Depends(get_availability_service),
     authorized: bool = has_roles([UserRole.ADMIN, UserRole.VOLUNTEER]),
 ):
     try:
-        created_availability = await availability_service.create_availability(availability)
+        created = await availability_service.create_availability(availability)
         # returns user id
-        return created_availability
+        return created
     except HTTPException as http_ex:
         raise http_ex
     except Exception as e:
         print(e)
         raise HTTPException(status_code=500, detail=str(e))
-    
+
 
 @router.delete("/", response_model=DeleteAvailabilityResponse)
 async def delete_availability(
@@ -65,10 +64,10 @@ async def delete_availability(
     authorized: bool = has_roles([UserRole.ADMIN, UserRole.VOLUNTEER]),
 ):
     try:
-        deleted_availability = await availability_service.delete_availability(availability)
-        return deleted_availability
+        deleted = await availability_service.delete_availability(availability)
+        return deleted
     except HTTPException as http_ex:
         raise http_ex
     except Exception as e:
         print(e)
-        raise HTTPException(status_code=500, detail=str(e)) 
+        raise HTTPException(status_code=500, detail=str(e))
diff --git a/backend/app/routes/match.py b/backend/app/routes/match.py
@@ -1,9 +1,9 @@
 from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.orm import Session
 
-from app.utilities.db_utils import get_db
-from app.services.implementations.match_service import MatchService
 from app.schemas.match import SubmitMatchRequest, SubmitMatchResponse
+from app.services.implementations.match_service import MatchService
+from app.utilities.db_utils import get_db
 
 router = APIRouter(prefix="/matches", tags=["matches"])
 
@@ -25,4 +25,3 @@ async def confirm_time(
     except Exception as e:
         print(e)
         raise HTTPException(status_code=500, detail=str(e))
-    
diff --git a/backend/app/routes/suggested_times.py b/backend/app/routes/suggested_times.py
@@ -1,24 +1,19 @@
+
 from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.orm import Session
 
-from app.schemas.time_block import TimeBlockBase
-from app.schemas.suggested_times import SuggestedTimeCreateRequest, SuggestedTimeEntity
-from app.services.implementations.suggested_times_service import SuggestedTimesService
-from app.utilities.db_utils import get_db
-
-from typing import List
-
-
+from app.middleware.auth import has_roles
 from app.schemas.suggested_times import (
     SuggestedTimeCreateRequest,
-    SuggestedTimeGetRequest,
-    SuggestedTimeDeleteRequest,
     SuggestedTimeCreateResponse,
+    SuggestedTimeDeleteRequest,
+    SuggestedTimeDeleteResponse,
+    SuggestedTimeGetRequest,
     SuggestedTimeGetResponse,
-    SuggestedTimeDeleteResponse
 )
-from app.middleware.auth import has_roles
 from app.schemas.user import UserRole
+from app.services.implementations.suggested_times_service import SuggestedTimesService
+from app.utilities.db_utils import get_db
 
 router = APIRouter(
     prefix="/suggested-times",
@@ -31,12 +26,12 @@ def get_suggested_times_service(db: Session = Depends(get_db)):
 @router.post("/", response_model=SuggestedTimeCreateResponse)
 async def create_suggested_times(
     suggested_time: SuggestedTimeCreateRequest,
-    suggested_time_service: SuggestedTimesService = Depends(get_suggested_times_service),
+    time_service: SuggestedTimesService = Depends(get_suggested_times_service),
     authorized: bool = has_roles([UserRole.ADMIN, UserRole.PARTICIPANT]),
 ):
     try:
-        created_suggested_time = await suggested_time_service.create_suggested_time(suggested_time)
-        return created_suggested_time
+        created = await time_service.create_suggested_time(suggested_time)
+        return created
     except HTTPException as http_ex:
         raise http_ex
     except Exception as e:
@@ -46,12 +41,12 @@ async def create_suggested_times(
 @router.get("/", response_model=SuggestedTimeGetResponse)
 async def get_suggested_times(
     match_id: int,
-    suggested_time_service: SuggestedTimesService = Depends(get_suggested_times_service),
+    time_service: SuggestedTimesService = Depends(get_suggested_times_service),
     authorized: bool = has_roles([UserRole.ADMIN, UserRole.VOLUNTEER]),
 ):
     try:
         req = SuggestedTimeGetRequest(match_id=match_id)
-        suggested_times = suggested_time_service.get_suggested_time_by_match_id(req)
+        suggested_times = time_service.get_suggested_time_by_match_id(req)
         return suggested_times
     except HTTPException as http_ex:
         raise http_ex
@@ -62,13 +57,13 @@ async def get_suggested_times(
 @router.delete("/", response_model=SuggestedTimeDeleteResponse)
 async def delete_suggested_times(
     match_id: int,
-    suggested_time_service: SuggestedTimesService = Depends(get_suggested_times_service),
+    time_service: SuggestedTimesService = Depends(get_suggested_times_service),
     authorized: bool = has_roles([UserRole.ADMIN, UserRole.VOLUNTEER]),
 ):
     try:
         req = SuggestedTimeDeleteRequest(match_id=match_id)
-        deleted_suggested_time = await suggested_time_service.delete_suggested_times_by_match_id(req)
-        return deleted_suggested_time
+        deleted = await time_service.delete_suggested_times_by_match_id(req)
+        return deleted
     except HTTPException as http_ex:
         raise http_ex
     except Exception as e:
diff --git a/backend/app/schemas/availability.py b/backend/app/schemas/availability.py
@@ -1,5 +1,3 @@
-from datetime import datetime, timedelta
-from enum import Enum
 from typing import List
 from uuid import UUID
 
diff --git a/backend/app/schemas/match.py b/backend/app/schemas/match.py
@@ -2,6 +2,7 @@
 
 from app.schemas.time_block import TimeBlockEntity
 
+
 class SubmitMatchRequest(BaseModel):
     match_id: int
     time_block_id: int
diff --git a/backend/app/schemas/suggested_times.py b/backend/app/schemas/suggested_times.py
@@ -1,12 +1,10 @@
-from datetime import datetime, timedelta
-from enum import Enum
-from typing import List, Optional
-from uuid import UUID
+from typing import List
 
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel
 
 from app.schemas.time_block import TimeBlockEntity, TimeBlockId, TimeRange
 
+
 class SuggestedTimeCreateRequest(BaseModel):
   match_id: int
   suggested_new_times: List[TimeRange]
@@ -32,4 +30,4 @@ class SuggestedTimeGetResponse(BaseModel):
 class SuggestedTimeEntity(BaseModel):
   id: int
   match_id: int
-  timeblock_id: TimeBlockId
+  timeblock_id: TimeBlockId
diff --git a/backend/app/schemas/time_block.py b/backend/app/schemas/time_block.py
@@ -1,7 +1,7 @@
-from datetime import datetime, timedelta
-from uuid import UUID
+from datetime import datetime
+
+from pydantic import BaseModel, ConfigDict, model_validator
 
-from pydantic import BaseModel, ConfigDict, ValidationInfo, field_validator, model_validator
 
 class TimeRange(BaseModel):
     start_time: datetime
diff --git a/backend/app/server.py b/backend/app/server.py
@@ -8,9 +8,10 @@
 
 from . import models
 from .middleware.auth_middleware import AuthMiddleware
-from .routes import auth, send_email, test, user, suggested_times, availability, match
+from .routes import auth, availability, match, suggested_times, test, user
 from .utilities.constants import LOGGER_NAME
 from .utilities.firebase_init import initialize_firebase
+
 # from .utilities.ses.ses_init import ensure_ses_templates
 
 load_dotenv()
diff --git a/backend/app/services/implementations/availability_service.py b/backend/app/services/implementations/availability_service.py
@@ -1,18 +1,17 @@
 import logging
-from sqlalchemy.orm import joinedload
-from datetime import datetime, timedelta
+from datetime import timedelta
 
 from fastapi import HTTPException
 from sqlalchemy.orm import Session
 
-from app.models import User, TimeBlock, available_times
+from app.models import TimeBlock, User, available_times
 from app.schemas.availability import (
+    AvailabilityEntity,
     CreateAvailabilityRequest,
     CreateAvailabilityResponse,
     DeleteAvailabilityRequest,
     DeleteAvailabilityResponse,
     GetAvailabilityRequest,
-    AvailabilityEntity
 )
 
 
@@ -33,29 +32,30 @@ async def get_availability(self, req: GetAvailabilityRequest) -> AvailabilityEnt
                 "available_times": user.availability
             })
             return validated_data
-            
+
         except Exception as e:
             self.logger.error(f"Error getting availability: {str(e)}")
             raise HTTPException(status_code=500, detail=str(e))
 
     async def create_availability(self, availability: CreateAvailabilityRequest) -> CreateAvailabilityResponse:
         """
-        Takes a user_id and a range of desired times. Creates 30 minute time blocks spaced 30 minutes apart for the user's Availability.
+        Takes a user_id and a range of desired times. 
+        Creates 30 minute time blocks spaced 30 minutes apart for the user's Availability.
         Existing TimeBlocks in add will be silently ignored.
         """
         added = 0
         try:
             user_id = availability.user_id
             user = self.db.query(User).filter_by(id=user_id).one()
-            # get user's existing times and create a set            
+            # get user's existing times and create a set
             existing_start_times = {tb.start_time for tb in user.availability}
 
             for time_range in availability.available_times:
                 # time format looks like: 2025-03-17 09:30:00
                 # modify based on the format
                 start_time = time_range.start_time
                 end_time = time_range.end_time
-                
+
                 # create timeblocks (0.5 hr) with 30 min spacing
                 current_start_time = start_time
                 while current_start_time < end_time:
@@ -66,7 +66,7 @@ async def create_availability(self, availability: CreateAvailabilityRequest) ->
                         time_block = TimeBlock(start_time=current_start_time)
                         user.availability.append(time_block)
                         added += 1
-                    
+
                     # update current time by 30 minutes for the next block
                     current_start_time += timedelta(hours=0.5)
 
@@ -113,7 +113,7 @@ async def delete_availability(self, req: DeleteAvailabilityRequest) -> DeleteAva
                         self.db.delete(block)
                         deleted += 1
 
-                    
+
                     curr_start += timedelta(hours=0.5)
 
             self.db.flush()
diff --git a/backend/app/services/implementations/match_service.py b/backend/app/services/implementations/match_service.py
@@ -1,10 +1,10 @@
 import logging
+
 from fastapi import HTTPException
 from sqlalchemy.orm import Session
 
-from app.models import Match, TimeBlock, MatchStatus
+from app.models import Match, MatchStatus, TimeBlock
 from app.schemas.match import SubmitMatchRequest, SubmitMatchResponse
-from app.schemas.time_block import TimeBlockEntity
 
 
 class MatchService:
diff --git a/backend/app/services/implementations/suggested_times_service.py b/backend/app/services/implementations/suggested_times_service.py
@@ -1,22 +1,20 @@
 import logging
-from datetime import datetime, timedelta
+from datetime import timedelta
 
 from fastapi import HTTPException
 from sqlalchemy.orm import Session
 
-from app.models import Match, TimeBlock, SuggestedTime
-from app.schemas.time_block import (
-  TimeRange
-)
+from app.models import Match, TimeBlock
 from app.schemas.suggested_times import (
-    SuggestedTimeCreateRequest,
-    SuggestedTimeGetRequest,
-    SuggestedTimeDeleteRequest,
-    SuggestedTimeDeleteResponse,
-    SuggestedTimeCreateResponse,
-    SuggestedTimeGetResponse
+  SuggestedTimeCreateRequest,
+  SuggestedTimeCreateResponse,
+  SuggestedTimeDeleteRequest,
+  SuggestedTimeDeleteResponse,
+  SuggestedTimeGetRequest,
+  SuggestedTimeGetResponse,
 )
 
+
 class SuggestedTimesService:
   def __init__(self, db: Session):
     self.db = db
diff --git a/backend/migrations/versions/062c84c8ff35_change_to_timezone_aware_timeblocks.py b/backend/migrations/versions/062c84c8ff35_change_to_timezone_aware_timeblocks.py
@@ -7,8 +7,8 @@
 """
 from typing import Sequence, Union
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
diff --git a/backend/migrations/versions/d6ee93e07a70_add_match_matchstatus_suggestedtime_.py b/backend/migrations/versions/d6ee93e07a70_add_match_matchstatus_suggestedtime_.py
@@ -7,8 +7,8 @@
 """
 from typing import Sequence, Union
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
diff --git a/backend/migrations/versions/fef3717e0fc2_merge_timeblocks_and_auth_migration_.py b/backend/migrations/versions/fef3717e0fc2_merge_timeblocks_and_auth_migration_.py
@@ -7,10 +7,6 @@
 """
 from typing import Sequence, Union
 
-from alembic import op
-import sqlalchemy as sa
-
-
 # revision identifiers, used by Alembic.
 revision: str = 'fef3717e0fc2'
 down_revision: Union[str, None] = ('062c84c8ff35', '8bfb115acac1')

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import enum`
`2`	`1`
`3`	`2`	`from sqlalchemy import Column, DateTime, ForeignKey, Integer`
`4`	`3`	`from sqlalchemy.dialects.postgresql import UUID`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from datetime import datetime, timedelta`
`2`		`-from enum import Enum`
`3`	`1`	`from typing import List`
`4`	`2`	`from uuid import UUID`
`5`	`3`