fixed linting issues

This commit is contained in:
c-d-p
2025-04-23 00:57:31 +02:00
parent be00f021ba
commit d5d0a24403
36 changed files with 28 additions and 56 deletions

View File

@@ -5,7 +5,6 @@ from datetime import datetime
from typing import List, Optional
from modules.auth.dependencies import get_current_user
from core.database import get_db
from core.exceptions import not_found_exception
from modules.auth.models import User
from modules.calendar.schemas import CalendarEventCreate, CalendarEventUpdate, CalendarEventResponse
from modules.calendar.service import create_calendar_event, get_calendar_event_by_id, get_calendar_events, update_calendar_event, delete_calendar_event

View File

@@ -46,9 +46,9 @@ def get_calendar_events(db: Session, user_id: int, start: datetime | None, end:
query = query.filter(
or_(
# Case 1: Event has duration and overlaps
(CalendarEvent.end != None) & (CalendarEvent.start < end) & (CalendarEvent.end > start),
(CalendarEvent.end is not None) & (CalendarEvent.start < end) & (CalendarEvent.end > start),
# Case 2: Event is a point event within the range
(CalendarEvent.end == None) & (CalendarEvent.start >= start) & (CalendarEvent.start < end)
(CalendarEvent.end is None) & (CalendarEvent.start >= start) & (CalendarEvent.start < end)
)
)
# If only start is provided, filter events starting on or after start
@@ -63,9 +63,9 @@ def get_calendar_events(db: Session, user_id: int, start: datetime | None, end:
query = query.filter(
or_(
# Event ends before the specified end time
(CalendarEvent.end != None) & (CalendarEvent.end <= end),
(CalendarEvent.end is not None) & (CalendarEvent.end <= end),
# Point event occurs before the specified end time
(CalendarEvent.end == None) & (CalendarEvent.start < end)
(CalendarEvent.end is None) & (CalendarEvent.start < end)
)
)
# Alternative interpretation for "ending before end": include events that *start* before end