Fix/issue170

.gitignore

@@ -127,3 +127,6 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+# uv pocket manager
+uv.lock

rating_api/models/db.py

@@ -50,6 +50,9 @@ class Lecturer(BaseDbModel):
     avatar_link: Mapped[str] = mapped_column(String, nullable=True, comment="Ссылка на аву препода")
     timetable_id: Mapped[int]
     comments: Mapped[list[Comment]] = relationship("Comment", back_populates="lecturer")
+    lecturer_user_comments: Mapped[list[LecturerUserComment]] = relationship(
+        "LecturerUserComment", back_populates="lecturer", cascade="all, delete-orphan"
+    )
     mark_weighted: Mapped[float] = mapped_column(
         Float,
         nullable=False,
@@ -288,6 +291,7 @@ class LecturerUserComment(BaseDbModel):
     id: Mapped[int] = mapped_column(Integer, primary_key=True)
     user_id: Mapped[int] = mapped_column(Integer, nullable=False)
     lecturer_id: Mapped[int] = mapped_column(Integer, ForeignKey("lecturer.id"))
+    lecturer: Mapped[Lecturer] = relationship("Lecturer", back_populates="lecturer_user_comments")
     create_ts: Mapped[datetime.datetime] = mapped_column(
         DateTime, default=datetime.datetime.now(datetime.timezone.utc), nullable=False
     )

tests/conftest.py

@@ -92,16 +92,46 @@ def dbsession(db_container):
 
 
 @pytest.fixture
-def client(mocker):
-    user_mock = mocker.patch('auth_lib.fastapi.UnionAuth.__call__')
-    user_mock.return_value = {
-        "session_scopes": [{"id": 0, "name": "string", "comment": "string"}],
-        "user_scopes": [{"id": 0, "name": "string", "comment": "string"}],
-        "indirect_groups": [{"id": 0, "name": "string", "parent_id": 0}],
-        "groups": [{"id": 0, "name": "string", "parent_id": 0}],
+def authlib_user():
+    """
+    Данные о пользователе, возвращаемые сервисом auth.
+    """
+    return {
+        "auth_methods": ["email", "github_auth"],
+        "session_scopes": [
+            {"id": 145, "name": "auth.session.create"},
+            {"id": 146, "name": "auth.session.update"},
+            {"id": 165, "name": "auth.user.selfdelete"},
+        ],
+        "user_scopes": [
+            {"id": 145, "name": "auth.session.create"},
+            {"id": 146, "name": "auth.session.update"},
+            {"id": 165, "name": "auth.user.selfdelete"},
+        ],
+        "indirect_groups": [99],
+        "groups": [99],
         "id": 0,
-        "email": "string",
+        "email": "aslimbo2001@gmail.com",
+        "userdata": [
+            {"category": "Личная информация", "param": "Полное имя", "value": "Тестовый Тест"},
+        ],
     }
+
+
+@pytest.fixture()
+def authlib_mock(mocker):
+    auth_mock = mocker.patch("auth_lib.fastapi.UnionAuth.__call__")
+    return auth_mock
+
+
+@pytest.fixture()
+def user_mock(authlib_mock, authlib_user):
+    authlib_mock.return_value = authlib_user
+    return authlib_mock
+
+
+@pytest.fixture
+def client(mocker, user_mock):
     client = TestClient(app)
     return client
 
@@ -214,11 +244,9 @@ def lecturers(dbsession):
         Lecturer(id=4, first_name='test_fname3', last_name='test_lname3', middle_name='test_mname3', timetable_id=9903)
     )
     lecturers[-1].is_deleted = True
-    for lecturer in lecturers:
-        dbsession.add(lecturer)
+    dbsession.add_all(lecturers)
     dbsession.commit()
     yield lecturers
-
     for lecturer in lecturers:
         for row in lecturer.comments:
             dbsession.delete(row)

tests/test_routes/test_comment.py

@@ -2,6 +2,7 @@
 import logging
 
 import pytest
+from auth_lib.fastapi import UnionAuth
 from starlette import status
 
 from rating_api.models import Comment, CommentReaction, LecturerUserComment, Reaction, ReviewStatus
@@ -177,6 +178,16 @@
 def test_create_comment(client, dbsession, lecturers, body, lecturer_n, response_status):
     params = {"lecturer_id": lecturers[lecturer_n].id}
     post_response = client.post(url, json=body, params=params)
+
+    # Проверка корректности переданных в userdata "param"
+    user = UnionAuth.__call__(post_response)
+    acceptable_params = ["Полное имя", "Фото", "Имя пользователя GitHub", "Номер Телефона"]
+    real_params = [i["param"] for i in user.get("userdata")]
+    for param in real_params:
+        assert (
+            param in acceptable_params
+        ), f"Не допустимый параметр: \"{i}\"! Список допустимых параметров: {acceptable_params}"
+
     assert post_response.status_code == response_status
     if response_status == status.HTTP_200_OK:
         comment = Comment.query(session=dbsession).filter(Comment.uuid == post_response.json()["uuid"]).one_or_none()