Cosmetic fix

Author: CaseAsLimbo

calendar_backend/routes/event/event.py

@@ -1,7 +1,7 @@
 import logging
 from datetime import date, timedelta
-from typing import Literal
 from itertools import zip_longest
+from typing import Literal
 
 from auth_lib.fastapi import UnionAuth
 from fastapi import APIRouter, Depends, Query, status
@@ -11,7 +11,7 @@
 
 from calendar_backend.exceptions import NotEnoughCriteria, ObjectNotFound
 from calendar_backend.methods import list_calendar
-from calendar_backend.models import Event, Group, Lecturer, Room, EventsRooms, EventsGroups, EventsLecturers
+from calendar_backend.models import Event, EventsGroups, EventsLecturers, EventsRooms, Group, Lecturer, Room
 from calendar_backend.routes.models import EventGet
 from calendar_backend.routes.models.event import (
     EventPatch,
@@ -200,7 +200,6 @@ async def patch_event_by_name(
 async def patch_event(
     id: int, event_inp: EventPatch, _=Depends(UnionAuth(scopes=["timetable.event.update"]))
 ) -> EventGet:
-
     # проверяем, что событие с таким id существует
     Events = db.session.query(Event).filter(Event.id == id).one_or_none()
     if not Events:
@@ -211,14 +210,16 @@ async def patch_event(
     all_rooms = [room.id for room in db.session.query(Room).all()]
     all_groups = [group.id for group in db.session.query(Group).all()]
     all_lecturers = [lecturer.id for lecturer in db.session.query(Lecturer).all()]
-    # проверяем cуществование заданных в body (room_, group_, lecturer_)*id 
-    for r, g, l in zip_longest(event_upd_data.get("room_id"), event_upd_data.get("group_id"), event_upd_data.get("lecturer_id"), fillvalue=None):
+    # проверяем cуществование заданных в body (room_, group_, lecturer_)*id
+    for r, g, l in zip_longest(
+        event_upd_data.get("room_id"), event_upd_data.get("group_id"), event_upd_data.get("lecturer_id"), fillvalue=None
+    ):
         if r not in all_rooms:
-            raise ObjectNotFound(type=type(Room), ids=r)   
+            raise ObjectNotFound(type=type(Room), ids=r)
         if g not in all_groups:
-            raise ObjectNotFound(type=type(Group), ids=g)   
+            raise ObjectNotFound(type=type(Group), ids=g)
         if l not in all_lecturers:
-            raise ObjectNotFound(type=type(Lecturer), ids=l)   
+            raise ObjectNotFound(type=type(Lecturer), ids=l)
 
     def add_new_remove_old_ids(dbsession, event_id, artefact: str, event_instance, negotiator_instance) -> None:
         """Вспомогательная фукнция описывающая удаление старых и добавление новых (room_, group_, lecturer_)*id - артефактов"""
@@ -227,16 +228,20 @@ def add_new_remove_old_ids(dbsession, event_id, artefact: str, event_instance, n
         # получаем множетсво страрых артефактов
         old_artefacts = event_artefacts - set(event_upd_data.get(f"{artefact}_id"))
         # получаем множество новых артефактов
-        new_artefacts =  set(event_upd_data.get(f"{artefact}_id")) - event_artefacts
+        new_artefacts = set(event_upd_data.get(f"{artefact}_id")) - event_artefacts
         # получаем артефакты к удалению(уникальные старые)
         to_remove = old_artefacts - new_artefacts
         # получаем артефакты к созданию(уникальные новые)
         to_add = new_artefacts - old_artefacts
 
         if to_remove:
-            dbsession.query(negotiator_instance).filter(negotiator_instance.event_id==event_id, getattr(negotiator_instance, f"{artefact}_id").in_(to_remove)).delete()
+            dbsession.query(negotiator_instance).filter(
+                negotiator_instance.event_id == event_id, getattr(negotiator_instance, f"{artefact}_id").in_(to_remove)
+            ).delete()
         if to_add:
-            dbsession.bulk_insert_mappings(negotiator_instance, [{"event_id" : f"{event_id}", f"{artefact}_id" : id_to_add} for id_to_add in to_add])
+            dbsession.bulk_insert_mappings(
+                negotiator_instance, [{"event_id": f"{event_id}", f"{artefact}_id": id_to_add} for id_to_add in to_add]
+            )
 
     add_new_remove_old_ids(db.session, id, "room", Events, EventsRooms)
     add_new_remove_old_ids(db.session, id, "group", Events, EventsGroups)

tests/conftest.py

@@ -1,21 +1,19 @@
 from datetime import datetime
+from pathlib import Path
 
 import pytest
+from alembic import command
+from alembic.config import Config as AlembicConfig
 from fastapi.testclient import TestClient
 from pytest_mock import MockerFixture
 from sqlalchemy import create_engine
 from sqlalchemy.orm import Session, sessionmaker
 from starlette import status
+from testcontainers.postgres import PostgresContainer
 
 from calendar_backend.models.base import DeclarativeBase
 from calendar_backend.models.db import Event, Group, Lecturer, Room
 from calendar_backend.routes import app
-from calendar_backend.settings import get_settings
-from _pytest.monkeypatch import MonkeyPatch
-from alembic import command
-from alembic.config import Config as AlembicConfig
-from pathlib import Path
-from testcontainers.postgres import PostgresContainer
 
 
 class PostgresConfig:
@@ -35,7 +33,6 @@ def get_url(cls) -> str:
         return f"postgresql://{cls.username}@{cls.host}:{cls.external_port}/postgres"
 
 
-
 @pytest.fixture(scope="session")
 def db_container():
     """Фикстура настройки БД для тестов в Docker-контейнере."""

tests/event/event.py

@@ -198,7 +198,6 @@ def test_delete(client_auth: TestClient, dbsession: Session, room_path, lecturer
 
 
 def test_update_all(client_auth: TestClient, dbsession: Session):
-    import pytest
     # Create
     room = Room(name="5-07" + datetime.datetime.utcnow().isoformat(), direction="North")
     lecturer = Lecturer(first_name="s", middle_name="s", last_name="s")
@@ -215,7 +214,6 @@ def test_update_all(client_auth: TestClient, dbsession: Session):
         "start_ts": "2022-08-26T22:32:38.575Z",
         "end_ts": "2022-08-26T22:32:38.575Z",
     }
-    pytest.set_trace()
     response = client_auth.post(RESOURCE, json=request_obj)
     assert response.status_code == status.HTTP_200_OK, response.json()
     response_obj = response.json()
@@ -253,7 +251,6 @@ def test_update_all(client_auth: TestClient, dbsession: Session):
         "end_ts": "2022-08-26T22:32:38.575Z",
     }
     response = client_auth.patch(urljoin(RESOURCE, str(id_)), json=request_obj_2)
-    pytest.set_trace()
     assert response.status_code == 200
     response = client_auth.get(urljoin(RESOURCE, str(id_)))
     assert response.status_code == status.HTTP_200_OK, response.json()