Dels (#75)

Author: grigoriev-semyon

calendar_backend/google_engine/event_from_db.py

@@ -6,7 +6,7 @@
 from calendar_backend.settings import get_settings
 from calendar_backend.methods.utils import get_lessons_by_group_from_date
 from calendar_backend.models import Event, Group
-from .event import create_google_calendar_event, Event
+from .event import create_google_calendar_event
 
 settings = get_settings()
 logger = logging.getLogger(__name__)
@@ -19,7 +19,7 @@ async def create_google_events_from_db(group_id: int, session: Session) -> list[
     """
     group, _ = Group.get(group_id, session=session)
     group_lessons: list[Event] = await get_lessons_by_group_from_date(group, datetime.date.today())
-    list_of_lessons: list[Event] = []
+    list_of_lessons = []
     time_zone = "+03:00"
     logger.debug(f"Getting list of subjects for {group}...")
     for lesson in group_lessons:

calendar_backend/google_engine/service.py

@@ -4,7 +4,6 @@
 import googleapiclient.discovery
 from sqlalchemy.exc import NoResultFound
 from googleapiclient.discovery import build
-from google.oauth2.credentials import Credentials
 from calendar_backend.models import Credentials
 from calendar_backend.settings import get_settings
 from fastapi_sqlalchemy import db

calendar_backend/methods/utils.py

@@ -69,17 +69,6 @@ async def get_lecturer_lessons_in_daterange(
     return events_list
 
 
-async def create_group_list(session: Session) -> list:
-    groups: list[Group] = session.query(Group).filter().all()
-    return [f"{row.number}, {row.name}" if row.name else f"{row.number}" for row in groups]
-
-
-async def check_group_existing(session: Session, group_num: str) -> bool:
-    if session.query(Group).filter(Group.number == group_num).one_or_none():
-        return True
-    return False
-
-
 async def upload_lecturer_photo(lecturer_id: int, session: Session, file: UploadFile = File(...)) -> Photo:
     lecturer = Lecturer.get(lecturer_id, session=session)
     random_string = ''.join(random.choice(string.ascii_letters) for _ in range(32))

calendar_backend/models/base.py

@@ -3,10 +3,10 @@
 import re
 from enum import Enum
 
-from sqlalchemy import Column, Integer, and_, not_
+from sqlalchemy import Column, Integer, not_
 from sqlalchemy.exc import NoResultFound
 from sqlalchemy.ext.declarative import as_declarative, declared_attr
-from sqlalchemy.orm import Query, RelationshipProperty, Session
+from sqlalchemy.orm import Query, Session
 
 from calendar_backend.exceptions import ObjectNotFound
 

calendar_backend/routes/base.py

@@ -60,7 +60,7 @@ async def not_found_error(request: starlette.requests.Request, exc: ObjectNotFou
 
 
 @app.exception_handler(ForbiddenAction)
-async def not_found_error(request: starlette.requests.Request, exc: ForbiddenAction):
+async def forbidden_action(request: starlette.requests.Request, exc: ForbiddenAction):
     return JSONResponse({"error": exc.args[0], "request": request.path_params}, status_code=403)
 
 

calendar_backend/routes/event/event.py

@@ -10,9 +10,8 @@
 from calendar_backend.exceptions import NotEnoughCriteria
 from calendar_backend.methods import auth, list_calendar
 from calendar_backend.models import Room, Lecturer, Event, EventsLecturers, EventsRooms, Group
-from calendar_backend.routes.models.base import Base
+from calendar_backend.routes.models import EventGet
 from calendar_backend.routes.models.event import (
-    EventGet,
     EventPatch,
     EventPost,
     GetListEvent,
@@ -31,7 +30,7 @@ async def get_event_by_id(id: int) -> EventGet:
 
 async def _get_timetable(start: date, end: date, group_id, lecturer_id, room_id, detail, limit, offset):
     if bool(group_id) + bool(lecturer_id) + bool(room_id) != 1:
-        raise NotEnoughCriteria(f"Exactly one argument group_id, lecturer_id or room_id required")
+        raise NotEnoughCriteria("Exactly one argument group_id, lecturer_id or room_id required")
     events = Event.get_all(session=db.session).filter(
         Event.start_ts >= start,
         Event.end_ts < end,

calendar_backend/routes/gcal.py

@@ -15,11 +15,10 @@
 from googleapiclient.discovery import build, UnknownApiNameOrVersion
 from pydantic.types import Json
 
-from calendar_backend.methods import utils
-from calendar_backend.settings import get_settings
 from calendar_backend.google_engine import create_calendar_with_timetable
 from calendar_backend.google_engine import get_calendar_service_from_token
-from calendar_backend.models import Credentials
+from calendar_backend.models import Credentials, Group
+from calendar_backend.settings import get_settings
 
 gcal = APIRouter(tags=["Utils: Google"])
 settings = get_settings()
@@ -40,7 +39,8 @@ def get_flow(state=""):
 
 @gcal.get("/")
 async def home(request: Request):
-    groups = await utils.create_group_list(db.session)
+    groups = [f"{row.number}, {row.name}" if row.name else f"{row.number}"
+              for row in db.session.query(Group).filter().all()]
     return templates.TemplateResponse(
         "index.html",
         {"request": request, "groups": groups},
@@ -53,7 +53,7 @@ async def get_user_flow(state: str):
         user_flow = get_flow(state)
         return RedirectResponse(user_flow.authorization_url()[0])
     else:
-        logger.info(f"Missing google service credentials")
+        logger.info("Missing google service credentials")
         return HTTPException(502, "Connection to google failed")
 
 
@@ -64,7 +64,8 @@ async def get_credentials(
     scope: str,
     state: str,
 ):
-    groups = await utils.create_group_list(db.session)
+    groups = [f"{row.number}, {row.name}" if row.name else f"{row.number}"
+              for row in db.session.query(Group).filter().all()]
     scope = scope.split(unquote("%20"))
     group = state
     flow = get_flow()

calendar_backend/routes/group/group.py

@@ -3,7 +3,7 @@
 from fastapi import APIRouter, HTTPException, Depends
 from fastapi_sqlalchemy import db
 
-from calendar_backend.methods import utils, auth
+from calendar_backend.methods import auth
 from calendar_backend.models import Group
 from calendar_backend.routes.models import GroupGet, GroupPost, GroupPatch, GetListGroup
 from calendar_backend.settings import get_settings
@@ -37,7 +37,7 @@ async def get_groups(query: str = "", limit: int = 10, offset: int = 0) -> GetLi
 
 @group_router.post("/", response_model=GroupGet)
 async def create_group(group: GroupPost, _: auth.User = Depends(auth.get_current_user)) -> GroupGet:
-    if await utils.check_group_existing(db.session, group.number):
+    if db.session.query(Group).filter(Group.number == group.number).one_or_none():
         raise HTTPException(status_code=423, detail="Already exists")
     return GroupGet.from_orm(Group.create(**group.dict(), session=db.session))
 
@@ -49,8 +49,8 @@ async def patch_group(
     _: auth.User = Depends(auth.get_current_user),
 ) -> GroupGet:
     if (
-        bool(query := Group.get_all(session=db.session).filter(Group.number == group_inp.number).one_or_none())
-        and query.id != id
+        bool(query := Group.get_all(session=db.session).filter(Group.number == group_inp.number).one_or_none()) and
+            query.id != id
     ):
         raise HTTPException(status_code=423, detail="Already exists")
     return GroupGet.from_orm(Group.update(id, **group_inp.dict(exclude_unset=True), session=db.session))

calendar_backend/routes/models/__init__.py

@@ -1,6 +1,5 @@
 from .base import LecturerGet, CommentLecturer, CommentEventGet, EventGet, GroupGet, RoomGet
 from .lecturer import (
-    LecturerGet,
     LecturerPost,
     LecturerPatch,
     LecturerPhotos,
@@ -13,5 +12,5 @@
     Action,
 )
 from .room import RoomPost, RoomPatch, RoomEvents, GetListRoom
-from .event import EventPost, EventPatch, Event, GetListEvent, CommentEventGet, EventComments
+from .event import EventPost, EventPatch, Event, GetListEvent, EventComments
 from .group import GroupPost, GroupPatch, GroupEvents, GetListGroup

calendar_backend/routes/models/event.py

@@ -1,6 +1,6 @@
 import datetime
 
-from .base import Base, RoomGet, GroupGet, CommentEventGet, LecturerGet, EventGet
+from .base import Base, RoomGet, GroupGet, CommentEventGet, LecturerGet
 
 
 class EventPatch(Base):