костыль на время работы get_group_by_id(#48)

Author: grigoriev-semyon

calendar_backend/methods/list_calendar.py

@@ -25,7 +25,7 @@ async def get_user_calendar(group_id: int, session: Session, start_date: date_,
     logger.debug(f"Getting user calendar (iCal) for group {group_id}")
     group = Group.get(group_id, session=session)
     user_calendar = Calendar()
-    timetable = await utils.get_group_lessons_in_daterange(group, start_date, end_date, session=session)
+    timetable = await utils.get_group_lessons_in_daterange(group, start_date, end_date)
     for lesson in timetable:
         teacher = (
             str([f"{row.first_name} {row.middle_name} {row.last_name}" for row in lesson.lecturer])

calendar_backend/methods/utils.py

@@ -35,35 +35,30 @@ async def get_lessons_by_group_from_date(group: Group, date: datetime.date) -> l
 
 
 async def get_group_lessons_in_daterange(
-    group: Group, date_start: datetime.date, date_end: datetime.date, session: Session
+    group: Group, date_start: datetime.date, date_end: datetime.date
 ) -> list[Event]:
     events_list = []
-    events = Event.get_all(session=session).filter(Event.group_id == group.id).all()
-    for lesson in events:
+    for lesson in group.events:
         if lesson.start_ts.date() >= date_start and lesson.end_ts.date() < date_end:
             events_list.append(lesson)
     return events_list
 
 
 async def get_room_lessons_in_daterange(
-    room: Room, date_start: datetime.date, date_end: datetime.date, session: Session
+    room: Room, date_start: datetime.date, date_end: datetime.date
 ) -> list[Event]:
     events_list = []
-    events_ids = EventsRooms.get_all(session=session).filter(EventsRooms.room_id == room.id).all()
-    events = [Event.get(row, session=session) for row in events_ids]
-    for lesson in events:
+    for lesson in room.events:
         if lesson.start_ts.date() >= date_start and lesson.end_ts.date() < date_end:
             events_list.append(lesson)
     return events_list
 
 
 async def get_lecturer_lessons_in_daterange(
-    lecturer: Lecturer, date_start: datetime.date, date_end: datetime.date, session: Session
+    lecturer: Lecturer, date_start: datetime.date, date_end: datetime.date
 ) -> list[Event]:
     events_list = []
-    events_ids = EventsLecturers.get_all(session=session).filter(EventsRooms.room_id == lecturer.id).all()
-    events = [Event.get(row, session=session) for row in events_ids]
-    for lesson in events:
+    for lesson in lecturer.events:
         if lesson.start_ts.date() >= date_start and lesson.end_ts.date() < date_end:
             events_list.append(lesson)
     return events_list

calendar_backend/routes/group.py

@@ -8,7 +8,7 @@
 from calendar_backend.settings import get_settings
 from calendar_backend.methods import utils, auth
 from calendar_backend.routes.models import GroupEvents, GroupGet, GroupPost, GroupPatch, GetListGroup
-from calendar_backend.models import Group
+from calendar_backend.models import Group, Event
 
 group_router = APIRouter(prefix="/timetable/group", tags=["Group"])
 settings = get_settings()
@@ -20,11 +20,12 @@ async def http_get_group_by_id(
     id: int, start: datetime.date | None = None, end: datetime.date | None = None
 ) -> GroupEvents:
     group = Group.get(id, session=db.session)
-    result = GroupEvents.from_orm(group)
     if start and end:
-        result.events = await utils.get_group_lessons_in_daterange(group, start, end, db.session)
-        return GroupEvents.from_orm(result)
-    return GroupGet.from_orm(result)
+        result = GroupGet.from_orm(group).dict()
+        result["events"] = Event.get_all(session=db.session).filter(Event.start_ts >= start, Event.end_ts < end, Event.group_id == id).all()
+    else:
+        result = GroupGet.from_orm(group)
+    return result
 
 
 @group_router.get("/", response_model=GetListGroup)

calendar_backend/routes/lecturer.py

@@ -7,6 +7,7 @@
 
 from calendar_backend.exceptions import ObjectNotFound
 from calendar_backend.methods import utils, auth
+from calendar_backend.methods.utils import get_lecturer_lessons_in_daterange
 from calendar_backend.models.db import CommentLecturer as DbCommentLecturer
 from calendar_backend.models.db import Lecturer
 from calendar_backend.models.db import Photo as DbPhoto
@@ -36,11 +37,13 @@ async def http_get_lecturer_by_id(
 ) -> LecturerEvents | LecturerGet:
     lecturer = Lecturer.get(id, session=db.session)
     lecturer.avatar_link = lecturer.avatar.link if lecturer.avatar else None
-    result = LecturerEvents.from_orm(lecturer)
     if start and end:
-        result.events = await utils.get_lecturer_lessons_in_daterange(lecturer, start, end, db.session)
-        return LecturerEvents.from_orm(result)
-    return LecturerGet.from_orm(result)
+        result = LecturerGet.from_orm(lecturer).dict()
+        events = await get_lecturer_lessons_in_daterange(lecturer, start, end)
+        result["events"] = events
+    else:
+        result = LecturerGet.from_orm(lecturer)
+    return result
 
 
 @lecturer_router.get("/", response_model=GetListLecturer)

calendar_backend/routes/room.py

@@ -5,10 +5,11 @@
 from fastapi import APIRouter, HTTPException, Depends
 from fastapi_sqlalchemy import db
 
+from calendar_backend.methods.utils import get_room_lessons_in_daterange
 from calendar_backend.settings import get_settings
 from calendar_backend.methods import utils, auth
 from calendar_backend.routes.models import RoomEvents, GetListRoom, RoomPost, RoomPatch, RoomGet
-from calendar_backend.models import Room
+from calendar_backend.models import Room, EventsRooms, Event
 
 room_router = APIRouter(prefix="/timetable/room", tags=["Room"])
 settings = get_settings()
@@ -20,11 +21,13 @@ async def http_get_room_by_id(
     id: int, start: datetime.date | None = None, end: datetime.date | None = None
 ) -> RoomEvents | RoomGet:
     room = Room.get(id, session=db.session)
-    result = RoomEvents.from_orm(room)
     if start and end:
-        result.events = await utils.get_room_lessons_in_daterange(room, start, end, db.session)
-        return RoomEvents.from_orm(result)
-    return RoomGet.from_orm(result)
+        result = RoomGet.from_orm(room).dict()
+        events = await get_room_lessons_in_daterange(room, start, end)
+        result["events"] = events
+    else:
+        result = RoomGet.from_orm(room)
+    return result
 
 
 @room_router.get("/", response_model=GetListRoom)