Bulk insert and delete events (#72)

grigoriev-semyon · web-flow · commit c7401eb140fd · 2022-11-27T21:16:53.000+03:00
diff --git a/calendar_backend/models/db.py b/calendar_backend/models/db.py
@@ -168,8 +168,6 @@ class Photo(BaseDbModel):
     )
 
 
-
-
 class CommentLecturer(BaseDbModel):
     lecturer_id = sqlalchemy.Column(sqlalchemy.Integer, sqlalchemy.ForeignKey("lecturer.id"))
     author_name = sqlalchemy.Column(sqlalchemy.String, nullable=False)
diff --git a/calendar_backend/routes/base.py b/calendar_backend/routes/base.py
@@ -100,7 +100,7 @@ async def dispatch(self, request: Request, call_next: RequestResponseEndpoint) -
     DBSessionMiddleware,
     db_url=settings.DB_DSN,
     session_args={"autocommit": True},
-    engine_args={"pool_pre_ping": True}
+    engine_args={"pool_pre_ping": True},
 )
 app.add_middleware(
     CORSMiddleware,
diff --git a/calendar_backend/routes/event/event.py b/calendar_backend/routes/event/event.py
@@ -5,10 +5,12 @@
 from fastapi import APIRouter, Depends, Query
 from fastapi.responses import FileResponse
 from fastapi_sqlalchemy import db
+from pydantic import parse_obj_as
 
 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.event import (
     EventGet,
     EventPatch,
@@ -101,11 +103,38 @@ async def create_event(event: EventPost, _: auth.User = Depends(auth.get_current
     )
 
 
+@event_router.post("/bulk", response_model=list[EventGet])
+async def create_events(events: list[EventPost], _: auth.User = Depends(auth.get_current_user)) -> list[EventGet]:
+    result = []
+    for event in events:
+        event_dict = event.dict()
+        rooms = [Room.get(room_id, session=db.session) for room_id in event_dict.pop("room_id", [])]
+        lecturers = [Lecturer.get(lecturer_id, session=db.session) for lecturer_id in event_dict.pop("lecturer_id", [])]
+        group = Group.get(event.group_id, session=db.session)
+        result.append(
+            Event.create(
+                **event_dict,
+                room=rooms,
+                lecturer=lecturers,
+                group=group,
+                session=db.session,
+            )
+        )
+    return parse_obj_as(list[EventGet], result)
+
+
 @event_router.patch("/{id}", response_model=EventGet)
 async def patch_event(id: int, event_inp: EventPatch, _: auth.User = Depends(auth.get_current_user)) -> EventGet:
     return EventGet.from_orm(Event.update(id, session=db.session, **event_inp.dict(exclude_unset=True)))
 
 
+@event_router.delete("/bulk", response_model=None)
+async def delete_events(start: date, end: date, _: auth.User = Depends(auth.get_current_user)) -> None:
+    db.session.query(Event).filter(Event.start_ts >= start, Event.end_ts < end).update(
+        values={"is_deleted": True}
+    )
+
+
 @event_router.delete("/{id}", response_model=None)
 async def delete_event(id: int, _: auth.User = Depends(auth.get_current_user)) -> None:
     Event.delete(id, session=db.session)
diff --git a/calendar_backend/routes/room/room.py b/calendar_backend/routes/room/room.py
@@ -37,20 +37,23 @@ async def get_rooms(query: str = "", limit: int = 10, offset: int = 0) -> GetLis
 
 @room_router.post("/", response_model=RoomGet)
 async def create_room(room: RoomPost, _: auth.User = Depends(auth.get_current_user)) -> RoomGet:
-    if bool(Room.get_all(session=db.session).filter(
-        Room.name == room.name, Room.building == room.building
-    ).one_or_none()):
+    if bool(
+        Room.get_all(session=db.session).filter(Room.name == room.name, Room.building == room.building).one_or_none()
+    ):
         raise HTTPException(status_code=423, detail="Already exists")
     return RoomGet.from_orm(Room.create(**room.dict(exclude_unset=True), session=db.session))
 
 
 @room_router.patch("/{id}", response_model=RoomGet)
-async def patch_room(id: int, room: RoomPatch, _: auth.User = Depends(auth.get_current_user)) -> RoomGet:
-    if bool(query := Room.get_all(session=db.session).filter(
-        Room.name == room.name, Room.building == room.building
-    ).one_or_none()) and query.id != id:
+async def patch_room(id: int, room_inp: RoomPatch, _: auth.User = Depends(auth.get_current_user)) -> RoomGet:
+    room = (
+        Room.get_all(session=db.session)
+        .filter(Room.name == room_inp.name, Room.building == room_inp.building)
+        .one_or_none()
+    )
+    if room and room.id != id:
         raise HTTPException(status_code=423, detail="Already exists")
-    return RoomGet.from_orm(Room.update(id, **room.dict(exclude_unset=True), session=db.session))
+    return RoomGet.from_orm(Room.update(id, **room_inp.dict(exclude_unset=True), session=db.session))
 
 
 @room_router.delete("/{id}", response_model=None)
diff --git a/migrations/versions/b0d96bbca3cd_add_review.py b/migrations/versions/b0d96bbca3cd_add_review.py
@@ -9,9 +9,30 @@
 
 
 def upgrade():
-    op.add_column('comment_event', sa.Column('approve_status', sa.Enum('APPROVED', 'DECLINED', 'PENDING', name='approvestatuses', native_enum=False), nullable=False))
-    op.add_column('comment_lecturer', sa.Column('approve_status', sa.Enum('APPROVED', 'DECLINED', 'PENDING', name='approvestatuses', native_enum=False), nullable=False))
-    op.add_column('photo', sa.Column('approve_status', sa.Enum('APPROVED', 'DECLINED', 'PENDING', name='approvestatuses', native_enum=False), nullable=False))
+    op.add_column(
+        'comment_event',
+        sa.Column(
+            'approve_status',
+            sa.Enum('APPROVED', 'DECLINED', 'PENDING', name='approvestatuses', native_enum=False),
+            nullable=False,
+        ),
+    )
+    op.add_column(
+        'comment_lecturer',
+        sa.Column(
+            'approve_status',
+            sa.Enum('APPROVED', 'DECLINED', 'PENDING', name='approvestatuses', native_enum=False),
+            nullable=False,
+        ),
+    )
+    op.add_column(
+        'photo',
+        sa.Column(
+            'approve_status',
+            sa.Enum('APPROVED', 'DECLINED', 'PENDING', name='approvestatuses', native_enum=False),
+            nullable=False,
+        ),
+    )
 
 
 def downgrade():
diff --git a/migrations/versions/d6f98271bc6b_no_datatype_directions.py b/migrations/versions/d6f98271bc6b_no_datatype_directions.py
@@ -18,6 +18,7 @@
 directions_native = sa.Enum('North', 'South', name="Directions")
 directions = sa.Enum('North', 'South', native_enum=False)
 
+
 def upgrade():
     # FIXME: Не надо бы с прода удалять столбцы не скопировав данные
     op.drop_column("room", "direction")
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -121,3 +121,74 @@ def event_path(client_auth: TestClient, dbsession: Session, lecturer_path, room_
     response_model = dbsession.query(Event).get(id_)
     dbsession.delete(response_model)
     dbsession.commit()
+
+
+@pytest.fixture()
+def room_factory(dbsession: Session):
+    ids_ = []
+
+    def _room_factory(client_auth: TestClient):
+        RESOURCE = "/timetable/room/"
+        request_obj = {
+            "name": datetime.now().isoformat(),
+            "direction": "North",
+        }
+        response = client_auth.post(RESOURCE, json=request_obj)
+        assert response.status_code == status.HTTP_200_OK, response.json()
+        nonlocal ids_
+        ids_.append(yielding := response.json()["id"])
+        return RESOURCE + str(yielding)
+
+    yield _room_factory
+    for id in ids_:
+        response_model: Room = dbsession.query(Room).get(id)
+        dbsession.delete(response_model)
+        dbsession.commit()
+
+
+@pytest.fixture()
+def lecturer_factory(dbsession: Session):
+    ids_ = []
+
+    def _lecturer_factory(client_auth: TestClient):
+        RESOURCE = "/timetable/lecturer/"
+        request_obj = {
+            "first_name": "Петр",
+            "middle_name": "Васильевич",
+            "last_name": "Тритий",
+            "description": "Очень умный",
+        }
+        response = client_auth.post(RESOURCE, json=request_obj)
+        assert response.status_code == status.HTTP_200_OK, response.json()
+        nonlocal ids_
+        ids_.append(yielding := response.json()["id"])
+        return RESOURCE + str(yielding)
+
+    yield _lecturer_factory
+    for id in ids_:
+        response_model: Lecturer = dbsession.query(Lecturer).get(id)
+        dbsession.delete(response_model)
+        dbsession.commit()
+
+
+@pytest.fixture()
+def group_factory(dbsession: Session):
+    ids_ = []
+
+    def _group_factory(client_auth: TestClient):
+        RESOURCE = "/timetable/group/"
+        request_obj = {
+            "name": "",
+            "number": datetime.now().isoformat(),
+        }
+        response = client_auth.post(RESOURCE, json=request_obj)
+        assert response.status_code == status.HTTP_200_OK, response.json()
+        nonlocal ids_
+        ids_.append(yielding := response.json()["id"])
+        return RESOURCE + str(yielding)
+
+    yield _group_factory
+    for id in ids_:
+        response_model: Group = dbsession.query(Group).get(id)
+        dbsession.delete(response_model)
+        dbsession.commit()
diff --git a/tests/event/event.py b/tests/event/event.py
@@ -36,6 +36,65 @@ def test_create(client_auth: TestClient, dbsession: Session, room_path, group_pa
     assert response_model.group_id == request_obj["group_id"]
 
 
+def test_create_many(client_auth: TestClient, dbsession: Session, room_factory, group_factory, lecturer_factory):
+    room_path1 = room_factory(client_auth)
+    group_path1 = group_factory(client_auth)
+    lecturer_path1 = lecturer_factory(client_auth)
+    room_path2 = room_factory(client_auth)
+    group_path2 = group_factory(client_auth)
+    lecturer_path2 = lecturer_factory(client_auth)
+    room_id1 = int(room_path1.split("/")[-1])
+    group_id1 = int(group_path1.split("/")[-1])
+    lecturer_id1 = int(lecturer_path1.split("/")[-1])
+    room_id2 = int(room_path2.split("/")[-1])
+    group_id2 = int(group_path2.split("/")[-1])
+    lecturer_id2 = int(lecturer_path2.split("/")[-1])
+    request_obj = [
+        {
+            "name": "string",
+            "room_id": [room_id1],
+            "group_id": group_id1,
+            "lecturer_id": [lecturer_id1],
+            "start_ts": "2022-08-26T22:32:38.575Z",
+            "end_ts": "2022-08-26T22:32:38.575Z",
+        },
+        {
+            "name": "string",
+            "room_id": [room_id2],
+            "group_id": group_id2,
+            "lecturer_id": [lecturer_id2],
+            "start_ts": "2022-08-26T22:32:38.575Z",
+            "end_ts": "2022-08-26T22:32:38.575Z",
+        },
+    ]
+    response = client_auth.post(f"{RESOURCE}bulk", json=request_obj)
+    assert response.status_code == status.HTTP_200_OK, response.json()
+    response_obj = response.json()
+    assert response_obj[0]["name"] == request_obj[0]["name"]
+    assert response_obj[0]["room"][0]["id"] == room_id1
+    assert response_obj[0]["group"]["id"] == request_obj[0]["group_id"]
+    assert response_obj[0]["lecturer"][0]["id"] == lecturer_id1
+    assert response_obj[0]["start_ts"][:20] == request_obj[0]["start_ts"][:20]
+    assert response_obj[0]["end_ts"][:20] == request_obj[0]["end_ts"][:20]
+    response_model: Event = dbsession.query(Event).get(response_obj[0]["id"])
+    assert response_model.name == request_obj[0]["name"]
+    assert [row.id for row in response_model.room] == request_obj[0]["room_id"]
+    assert [row.id for row in response_model.lecturer] == request_obj[0]["lecturer_id"]
+    assert response_model.group_id == request_obj[0]["group_id"]
+
+    assert response_obj[1]["name"] == request_obj[1]["name"]
+    assert response_obj[1]["room"][0]["id"] == room_id2
+    assert response_obj[1]["group"]["id"] == request_obj[1]["group_id"]
+    assert response_obj[1]["lecturer"][0]["id"] == lecturer_id2
+    assert response_obj[1]["start_ts"][:20] == request_obj[1]["start_ts"][:20]
+    assert response_obj[1]["end_ts"][:20] == request_obj[1]["end_ts"][:20]
+    response_model: Event = dbsession.query(Event).get(response_obj[1]["id"])
+    assert response_model.name == request_obj[1]["name"]
+    assert [row.id for row in response_model.room] == request_obj[1]["room_id"]
+    assert [row.id for row in response_model.lecturer] == request_obj[1]["lecturer_id"]
+    assert response_model.group_id == request_obj[1]["group_id"]
+
+
 def test_delete(client_auth: TestClient, dbsession: Session, room_path, lecturer_path, group_path):
     room_id = int(room_path.split("/")[-1])
     group_id = int(group_path.split("/")[-1])
@@ -137,7 +196,7 @@ 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",
     }
-    client_auth.patch(RESOURCE + f"{id_}/", json=request_obj_2)
+    client_auth.patch(RESOURCE + f"{id_}", json=request_obj_2)
     response = client_auth.get(RESOURCE + f"{id_}/")
     assert response.status_code == status.HTTP_200_OK, response.json()
     response_obj = response.json()
@@ -175,3 +234,49 @@ def test_update_all(client_auth: TestClient, dbsession: Session):
     dbsession.delete(lecturer)
     dbsession.delete(group)
     dbsession.commit()
+
+
+def test_delete_from_to(client_auth: TestClient, dbsession: Session, room_factory, group_factory, lecturer_factory):
+    room_path1 = room_factory(client_auth)
+    group_path1 = group_factory(client_auth)
+    lecturer_path1 = lecturer_factory(client_auth)
+    room_path2 = room_factory(client_auth)
+    group_path2 = group_factory(client_auth)
+    lecturer_path2 = lecturer_factory(client_auth)
+    room_id1 = int(room_path1.split("/")[-1])
+    group_id1 = int(group_path1.split("/")[-1])
+    lecturer_id1 = int(lecturer_path1.split("/")[-1])
+    room_id2 = int(room_path2.split("/")[-1])
+    group_id2 = int(group_path2.split("/")[-1])
+    lecturer_id2 = int(lecturer_path2.split("/")[-1])
+    request_obj = [
+        {
+            "name": "string",
+            "room_id": [room_id1],
+            "group_id": group_id1,
+            "lecturer_id": [lecturer_id1],
+            "start_ts": "2022-08-26T22:32:38.575Z",
+            "end_ts": "2022-08-26T22:32:38.575Z",
+        },
+        {
+            "name": "string",
+            "room_id": [room_id2],
+            "group_id": group_id2,
+            "lecturer_id": [lecturer_id2],
+            "start_ts": "2022-08-26T22:32:38.575Z",
+            "end_ts": "2022-08-26T22:32:38.575Z",
+        },
+    ]
+    response = client_auth.post(f"{RESOURCE}bulk", json=request_obj)
+    created = response.json()
+    assert response.status_code == status.HTTP_200_OK, response.json()
+    response = client_auth.delete(f"{RESOURCE}bulk", params={"start": "2022-08-26", "end": "2022-08-27"})
+    assert response.status_code == 200
+    response = client_auth.get(f"{RESOURCE}{created[0]['id']}")
+    assert response.status_code == 404
+    response = client_auth.get(f"{RESOURCE}{created[1]['id']}")
+    assert response.status_code == 404
+    obj1 = dbsession.query(Event).filter(Event.id == created[0]["id"]).one()
+    obj2 = dbsession.query(Event).filter(Event.id == created[1]["id"]).one()
+    for row in (obj1, obj2):
+        dbsession.delete(row)

Original file line number	Diff line number	Diff line change
`@@ -168,8 +168,6 @@ class Photo(BaseDbModel):`
`168`	`168`	`)`
`169`	`169`
`170`	`170`
`171`		`-`
`172`		`-`
`173`	`171`	`class CommentLecturer(BaseDbModel):`
`174`	`172`	`lecturer_id = sqlalchemy.Column(sqlalchemy.Integer, sqlalchemy.ForeignKey("lecturer.id"))`
`175`	`173`	`author_name = sqlalchemy.Column(sqlalchemy.String, nullable=False)`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ async def dispatch(self, request: Request, call_next: RequestResponseEndpoint) -`
`100`	`100`	`DBSessionMiddleware,`
`101`	`101`	`db_url=settings.DB_DSN,`
`102`	`102`	`session_args={"autocommit": True},`
`103`		`- engine_args={"pool_pre_ping": True}`
	`103`	`+ engine_args={"pool_pre_ping": True},`
`104`	`104`	`)`
`105`	`105`	`app.add_middleware(`
`106`	`106`	`CORSMiddleware,`